diff --git a/.env.example b/.env.example
index 4dee3b33441..13114b8b076 100644
--- a/.env.example
+++ b/.env.example
@@ -26,6 +26,13 @@ DB_DATABASE=database_database
 DB_USERNAME=database_username
 DB_PASSWORD=database_user_password
 
+# Storage system to use
+# By default files are stored on the local filesystem, with images being placed in
+# public web space so they can be efficiently served directly by the web-server.
+# For other options with different security levels & considerations, refer to:
+# https://www.bookstackapp.com/docs/admin/upload-config/
+STORAGE_TYPE=local
+
 # Mail system to use
 # Can be 'smtp' or 'sendmail'
 MAIL_DRIVER=smtp
diff --git a/.env.example.complete b/.env.example.complete
index 18e7bd00d9c..6c773f601f1 100644
--- a/.env.example.complete
+++ b/.env.example.complete
@@ -351,10 +351,25 @@ EXPORT_PDF_COMMAND_TIMEOUT=15
 # Only used if 'ALLOW_UNTRUSTED_SERVER_FETCHING=true' which disables security protections.
 WKHTMLTOPDF=false
 
-# Allow <script> tags in page content
+# Allow JavaScript, and other potentiall dangerous content in page content.
+# This also removes CSP-level JavaScript control.
 # Note, if set to 'true' the page editor may still escape scripts.
+# DEPRECATED: Use 'APP_CONTENT_FILTERING' instead as detailed below. Activiting this option
+# effectively sets APP_CONTENT_FILTERING='' (No filtering)
 ALLOW_CONTENT_SCRIPTS=false
 
+# Control the behaviour of content filtering, primarily used for page content.
+# This setting is a string of characters which represent different available filters:
+# - j - Filter out JavaScript and unknown binary data based content
+# - h - Filter out unexpected, and potentially dangerous, HTML elements
+# - f - Filter out unexpected form elements
+# - a - Run content through a more complex allowlist filter
+# This defaults to using all filters, unless ALLOW_CONTENT_SCRIPTS is set to true in which case no filters are used.
+# Note: These filters are a best-attempt and may not be 100% effective. They are typically a layer used in addition to other security measures.
+# Note: The default value will always be the most-strict, so it's advised to leave this unset in your own configuration
+# to ensure you are always using the full range of filters.
+APP_CONTENT_FILTERING="jfha"
+
 # Indicate if robots/crawlers should crawl your instance.
 # Can be 'true', 'false' or 'null'.
 # The behaviour of the default 'null' option will depend on the 'app-public' admin setting.
@@ -380,6 +395,19 @@ ALLOWED_IFRAME_HOSTS=null
 # Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
 ALLOWED_IFRAME_SOURCES="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"
 
+# A list of sources/hostnames that can be loaded as CSS styles within BookStack.
+# Space separated if multiple. BookStack host domain is auto-inferred.
+# Defaults to a permissive set if not provided.
+# Example: ALLOWED_STYLE_SOURCES="https://fonts.googleapis.com"
+ALLOWED_STYLE_SOURCES=null
+
+# A list of sources/hostnames that can be loaded as image content within BookStack.
+# Space separated if multiple. BookStack host domain is auto-inferred, in addition to
+# data and blob images, due to their use for various functionality.
+# Defaults to a permissive set if not provided.
+# Example: ALLOWED_IMAGE_SOURCES="https://images.example.com"
+ALLOWED_IMAGE_SOURCES=null
+
 # A list of the sources/hostnames that can be reached by application SSR calls.
 # This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
 # Host-specific functionality (usually controlled via other options) like auth
diff --git a/.forgejo/CODE_OF_CONDUCT.md b/.forgejo/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..7a02656725d
--- /dev/null
+++ b/.forgejo/CODE_OF_CONDUCT.md
@@ -0,0 +1,2 @@
+Please find our community rules on our website here:
+https://www.bookstackapp.com/about/community-rules/
\ No newline at end of file
diff --git a/.forgejo/FUNDING.yml b/.forgejo/FUNDING.yml
new file mode 100644
index 00000000000..5c50c3f691c
--- /dev/null
+++ b/.forgejo/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [ssddanbrown]
+ko_fi: ssddanbrown
diff --git a/.github/ISSUE_TEMPLATE/api_request.yml b/.forgejo/ISSUE_TEMPLATE/api_request.yml
similarity index 94%
rename from .github/ISSUE_TEMPLATE/api_request.yml
rename to .forgejo/ISSUE_TEMPLATE/api_request.yml
index def952c52e8..c68d262580b 100644
--- a/.github/ISSUE_TEMPLATE/api_request.yml
+++ b/.forgejo/ISSUE_TEMPLATE/api_request.yml
@@ -1,6 +1,6 @@
 name: New API Endpoint or API Ability
 description: Request a new endpoint or API feature be added
-labels: [":nut_and_bolt: API Request"]
+labels: ["Type/API Request"]
 body:
   - type: textarea
     id: feature
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.forgejo/ISSUE_TEMPLATE/bug_report.yml
similarity index 98%
rename from .github/ISSUE_TEMPLATE/bug_report.yml
rename to .forgejo/ISSUE_TEMPLATE/bug_report.yml
index d301826c9c6..9e4173cc798 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.forgejo/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a report to help us fix bugs & issues in existing supported functionality
-labels: [":bug: Bug"]
+labels: ["Type/Bug Report"]
 body:
   - type: markdown
     attributes:
diff --git a/.forgejo/ISSUE_TEMPLATE/config.yml b/.forgejo/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..a72fb1ef4cb
--- /dev/null
+++ b/.forgejo/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,13 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Forum Support
+    url: https://community.bookstackapp.com
+    about: Get support by talking with the BookStack team & community.
+
+  - name: Debugging & Common Issues
+    url: https://www.bookstackapp.com/docs/admin/debugging/
+    about: Find details on how to debug issues and view common issues with their resolutions.
+
+  - name: Official Support Plans
+    url: https://www.bookstackapp.com/support/
+    about: View our official support plans that offer assured support for business.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.forgejo/ISSUE_TEMPLATE/feature_request.yml
similarity index 72%
rename from .github/ISSUE_TEMPLATE/feature_request.yml
rename to .forgejo/ISSUE_TEMPLATE/feature_request.yml
index 0ebb8e72f29..0d799d0a78a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.forgejo/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Request a new feature or idea to be added to BookStack
-labels: [":hammer: Feature Request"]
+labels: ["Type/Feature Request"]
 body:
   - type: textarea
     id: description
@@ -33,7 +33,7 @@ body:
     attributes:
       label: Have you searched for an existing open/closed issue?
       description: |
-        To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/BookStackApp/BookStack/issues?q=is%3Aissue) for any existing issues that cover the fundamental benefit/goal of your request.
+        To help us keep these issues under control, please ensure you have first [searched our issue list](https://codeberg.org/bookstack/bookstack/issues) for any existing issues that cover the fundamental benefit/goal of your request.
       options:
         - label: I have searched for existing issues and none cover my fundamental request
           required: true
@@ -56,3 +56,13 @@ body:
       description: Add any other context or screenshots about the feature request here.
     validations:
       required: false
+  - type: checkboxes
+    id: ai-thoughts
+    attributes:
+      label: Have you used generative AI/LLMs to create any thoughts in this request?
+      description: |
+        We ask that no machine generated thoughts or ideas are provided, to avoid us spending time considering the ideas
+        of a machine instead of a human. Further guidance on this can be found [in the BookStack community rules](https://www.bookstackapp.com/about/community-rules/#use-of-llmsai).
+      options:
+        - label: This request only contains the thoughts & ideas of a human
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/language_request.yml b/.forgejo/ISSUE_TEMPLATE/language_request.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/language_request.yml
rename to .forgejo/ISSUE_TEMPLATE/language_request.yml
index fad9ef1e83f..b86fb08e84f 100644
--- a/.github/ISSUE_TEMPLATE/language_request.yml
+++ b/.forgejo/ISSUE_TEMPLATE/language_request.yml
@@ -1,6 +1,6 @@
 name: Language Request
 description: Request a new language to be added to Crowdin for you to translate
-labels: [":earth_africa: Translations"]
+labels: ["Focus: Translations"]
 assignees:
   - ssddanbrown
 body:
diff --git a/.github/ISSUE_TEMPLATE/support_request.yml b/.forgejo/ISSUE_TEMPLATE/support_request.yml
similarity index 89%
rename from .github/ISSUE_TEMPLATE/support_request.yml
rename to .forgejo/ISSUE_TEMPLATE/support_request.yml
index ae808a0b600..fde4aad7141 100644
--- a/.github/ISSUE_TEMPLATE/support_request.yml
+++ b/.forgejo/ISSUE_TEMPLATE/support_request.yml
@@ -1,6 +1,6 @@
 name: Support Request
 description: Request support for a specific problem you have not been able to solve yourself
-labels: [":dog2: Support"]
+labels: ["Type/Support"]
 body:
   - type: checkboxes
     id: useddocs
@@ -15,11 +15,11 @@ body:
   - type: checkboxes
     id: searchissue
     attributes:
-      label: Searched GitHub Issues
+      label: Searched Existing Issues
       description: |
-        I have searched for the issue and potential resolutions within the [project's GitHub issue list](https://github.com/BookStackApp/BookStack/issues)
+        I have searched for the issue and potential resolutions within the [project's issue list](https://codeberg.org/bookstack/bookstack/issues)
       options:
-        - label: I have searched GitHub for the issue.
+        - label: I have searched for the issue.
           required: true
   - type: textarea
     id: scenario
diff --git a/.github/ISSUE_TEMPLATE/z_blank_request.yml b/.forgejo/ISSUE_TEMPLATE/z_blank_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/z_blank_request.yml
rename to .forgejo/ISSUE_TEMPLATE/z_blank_request.yml
diff --git a/.forgejo/SECURITY.md b/.forgejo/SECURITY.md
new file mode 100644
index 00000000000..d97c02fd9a6
--- /dev/null
+++ b/.forgejo/SECURITY.md
@@ -0,0 +1,54 @@
+# Security Policy
+
+## Supported Versions
+
+Only the [latest version](https://codeberg.org/bookstack/bookstack/releases) of BookStack is supported.
+We generally don't support older versions of BookStack due to maintenance effort and
+since we aim to provide a fairly stable upgrade path for new versions.
+
+## Security Notifications
+
+If you'd like to be notified of new potential security concerns, you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
+
+## Reporting a Vulnerability
+
+If you've found an issue that likely has no impact on existing users (for example, an issue only in the development branch)
+feel free to raise it via a standard Codeberg bug report issue.
+
+If the issue could have a security impact on BookStack instances, 
+please directly contact the lead maintainer, Dan Brown, via email using the [details found here](https://www.bookstackapp.com/links/contact/).
+
+When contacting us, please note any names (and optionally any profile/company/website links) that you'd like to be used in
+any attribution within our release notes and content.
+
+Please be patient while the vulnerability is being reviewed. Deploying the fix to address the vulnerability
+can often take a little time due to the amount of preparation required to ensure the vulnerability has
+been covered and to create the content required to adequately notify the user-base.
+
+Thank you for keeping BookStack instances safe!
+
+### CVE Creation
+
+We're generally happy for (and prefer) researchers to raise CVEs for issues they've discovered.
+We ask that you first confirm with us to ensure the vulnerability is valid and that it hasn't yet been discovered
+and reported by someone else. 
+
+We can raise CVEs ourselves, but we would only go to the effort for security issues with a significant level of risk to users.
+We typically won't pursue CVEs if there's a lesser level of risk.
+
+### Our Announcement Channels
+
+When security issues meet a reasonable level of risk to users, they will be assigned to be addressed via a BookStack "Security Release". When made available, these releases will be announced via our [security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates), as a post on [our blog](https://www.bookstackapp.com/blog/), and security notices will be added to our [updates documentation page](https://www.bookstackapp.com/docs/admin/updates/#version-specific-instructions). These releases will also be typically announced in some of our social communities. 
+
+To meet the "reasonable level of risk" for a security release, the issue(s) will typically need to pose a risk to instance/user data and security. Security *improvements* (for example, hardening against denial of service attacks) typically won't trigger a security release by themselves, and may be released as a standard patch release.
+
+CVEs may also be created for security issues, but this is not assured. We only seek CVEs for high-risk issues, although we're very liberal in allowing security researchers to report lesser issues also.
+
+### CRA Reporting
+
+In line with the [Cyber Resilience Act](https://digital-strategy.ec.europa.eu/en/library/cyber-resilience-act), we aim to meet certain levels of reporting requirements by reporting the following to the relevant ENISA established single reporting platform:
+
+- Actively exploited vulnerabilities contained in BookStack, when made aware of such exploit use.
+- Severe incidents having an impact on the security of the product (for example, compromised BookStack infrastructure).
+
+
diff --git a/.forgejo/pull_request_template.md b/.forgejo/pull_request_template.md
new file mode 100644
index 00000000000..70f1058748c
--- /dev/null
+++ b/.forgejo/pull_request_template.md
@@ -0,0 +1,11 @@
+## Details
+
+<!-- Write details of your pull request in here -->
+<!-- Include references to any relevant issues/discussions -->
+
+## Checklist
+
+<!-- Put an 'x' in between the brackets below to confirm these elements -->
+
+- [ ] I have read the [BookStack community rules](https://www.bookstackapp.com/about/community-rules/).
+- [ ] This PR does not feature significant use of LLM/AI generation as per the community rules above.
diff --git a/.github/workflows/analyse-php.yml b/.forgejo/workflows/analyse-php.yml
similarity index 58%
rename from .github/workflows/analyse-php.yml
rename to .forgejo/workflows/analyse-php.yml
index 647835aeb2f..d90c7a28522 100644
--- a/.github/workflows/analyse-php.yml
+++ b/.forgejo/workflows/analyse-php.yml
@@ -1,6 +1,7 @@
 name: analyse-php
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.php'
@@ -11,15 +12,17 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
     steps:
-    - uses: actions/checkout@v4
+    - uses: https://code.forgejo.org/actions/checkout@v6
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: https://github.com/shivammathur/setup-php@v2
       with:
-        php-version: 8.3
-        extensions: gd, mbstring, json, curl, xml, mysql, ldap
+        php-version: 8.6
+        extensions: gd, mbstring, curl, xml, dom, mysql, ldap
 
     - name: Get Composer Cache Directory
       id: composer-cache
@@ -27,14 +30,16 @@ jobs:
         echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v4
+      uses: https://code.forgejo.org/actions/cache@v5
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-8.3
+        key: ${{ runner.os }}-composer-8.6
         restore-keys: ${{ runner.os }}-composer-
 
     - name: Install composer dependencies
       run: composer install --prefer-dist --no-interaction --ansi
+      env:
+        COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GH_TOKEN }}"}}'
 
     - name: Run static analysis check
       run: composer check-static
diff --git a/.github/workflows/lint-js.yml b/.forgejo/workflows/lint-js.yml
similarity index 67%
rename from .github/workflows/lint-js.yml
rename to .forgejo/workflows/lint-js.yml
index 9aceea2a26c..5cacec67aab 100644
--- a/.github/workflows/lint-js.yml
+++ b/.forgejo/workflows/lint-js.yml
@@ -1,6 +1,7 @@
 name: lint-js
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.js'
@@ -13,9 +14,11 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
     steps:
-    - uses: actions/checkout@v4
+    - uses: https://code.forgejo.org/actions/checkout@v6
 
     - name: Install NPM deps
       run: npm ci
diff --git a/.github/workflows/lint-php.yml b/.forgejo/workflows/lint-php.yml
similarity index 55%
rename from .github/workflows/lint-php.yml
rename to .forgejo/workflows/lint-php.yml
index cb9dedcb25a..c8b8d9d7be9 100644
--- a/.github/workflows/lint-php.yml
+++ b/.forgejo/workflows/lint-php.yml
@@ -1,6 +1,7 @@
 name: lint-php
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.php'
@@ -11,14 +12,16 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
     steps:
-    - uses: actions/checkout@v4
+    - uses: https://code.forgejo.org/actions/checkout@v6
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: https://github.com/shivammathur/setup-php@v2
       with:
-        php-version: 8.3
+        php-version: 8.6
         tools: phpcs
 
     - name: Run formatting check
diff --git a/.forgejo/workflows/sync-translations.yml b/.forgejo/workflows/sync-translations.yml
new file mode 100644
index 00000000000..9501c15e133
--- /dev/null
+++ b/.forgejo/workflows/sync-translations.yml
@@ -0,0 +1,34 @@
+name: Crowdin Action
+
+on:
+  push:
+    branches: [ development ]
+    paths:
+      - 'lang/**.php'
+  schedule:
+    - cron: '30 4 * * *'
+  workflow_dispatch:
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
+
+    steps:
+      - name: Checkout
+        uses: https://code.forgejo.org/actions/checkout@v6
+
+      - name: crowdin action
+        uses: https://github.com/crowdin/github-action@v2
+        with:
+          crowdin_branch_name: development
+          upload_sources: true
+          upload_translations: false
+          download_translations: true
+          localization_branch_name: l10n_development
+          create_pull_request: false
+          github_base_url: codeberg.org
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/test-js.yml b/.forgejo/workflows/test-js.yml
similarity index 68%
rename from .github/workflows/test-js.yml
rename to .forgejo/workflows/test-js.yml
index 13f9a8a9819..d3e8467fe09 100644
--- a/.github/workflows/test-js.yml
+++ b/.forgejo/workflows/test-js.yml
@@ -1,6 +1,7 @@
 name: test-js
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.js'
@@ -15,9 +16,11 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
     steps:
-    - uses: actions/checkout@v4
+    - uses: https://code.forgejo.org/actions/checkout@v6
 
     - name: Install NPM deps
       run: npm ci
@@ -26,4 +29,4 @@ jobs:
       run: npm run ts:lint
 
     - name: Run JavaScript tests
-      run: npm run test
\ No newline at end of file
+      run: npm run test:ci
\ No newline at end of file
diff --git a/.forgejo/workflows/test-migrations.yml b/.forgejo/workflows/test-migrations.yml
new file mode 100644
index 00000000000..5804c76d959
--- /dev/null
+++ b/.forgejo/workflows/test-migrations.yml
@@ -0,0 +1,81 @@
+name: test-migrations
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '**.php'
+      - 'composer.*'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'composer.*'
+
+jobs:
+  build:
+    if: ${{ github.ref != 'refs/heads/l10n_development' }}
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
+    strategy:
+      matrix:
+        php: ['8.3', '8.4', '8.5', '8.6']
+    services:
+      mysql:
+        image: docker.io/library/mariadb:12.2.2-noble
+        options: --tmpfs /var/lib/mysql:rw
+        cmd:
+          - --innodb-flush-log-at-trx-commit=0
+          - --innodb-flush-method=O_DIRECT
+          - --innodb-doublewrite=0
+          - --innodb-buffer-pool-size=256M
+          - --skip-log-bin
+          - --sync-binlog=0
+        env:
+          MARIADB_USER: bookstack-test
+          MARIADB_PASSWORD: bookstack-test
+          MARIADB_DATABASE: bookstack-test
+          MARIADB_ROOT_PASSWORD: password
+    steps:
+      - uses: https://code.forgejo.org/actions/checkout@v6
+
+      - name: Setup PHP
+        uses: https://github.com/shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: gd, mbstring, curl, xml, dom, mysql, ldap
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer packages
+        uses: https://code.forgejo.org/actions/cache@v5
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        run: composer install --prefer-dist --no-interaction --ansi
+        env:
+          COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GH_TOKEN }}"}}'
+
+      - name: Start migration test
+        env:
+          TEST_DATABASE_URL: 'mysql://bookstack-test:bookstack-test@mysql/bookstack-test'
+        run: |
+          php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
+
+      - name: Start migration:rollback test
+        env:
+          TEST_DATABASE_URL: 'mysql://bookstack-test:bookstack-test@mysql/bookstack-test'
+        run: |
+          php${{ matrix.php }} artisan migrate:rollback --force -n --database=mysql_testing
+
+      - name: Start migration rerun test
+        env:
+          TEST_DATABASE_URL: 'mysql://bookstack-test:bookstack-test@mysql/bookstack-test'
+        run: |
+          php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
diff --git a/.github/workflows/test-php.yml b/.forgejo/workflows/test-php.yml
similarity index 53%
rename from .github/workflows/test-php.yml
rename to .forgejo/workflows/test-php.yml
index 64132f673a4..d257742fa93 100644
--- a/.github/workflows/test-php.yml
+++ b/.forgejo/workflows/test-php.yml
@@ -1,6 +1,7 @@
 name: test-php
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - '**.php'
@@ -13,18 +14,38 @@ on:
 jobs:
   build:
     if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
+    runs-on: docker
+    container:
+      image: docker.io/setupphp/node:noble
     strategy:
       matrix:
-        php: ['8.2', '8.3', '8.4']
+        php: ['8.3', '8.4', '8.5', '8.6']
+    env:
+      phpextensions: gd, mbstring, curl, xml, dom, mysql, ldap, gmp
+      phpextensioncachekey: cache-v1
     steps:
-    - uses: actions/checkout@v4
+    - uses: https://code.forgejo.org/actions/checkout@v6
+
+    - name: Setup cache environment
+      id: extcache
+      uses: https://github.com/shivammathur/cache-extensions@v1
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: ${{ env.phpextensions }}
+        key: ${{ env.phpextensioncachekey }}
+
+    - name: Cache extensions
+      uses: https://code.forgejo.org/actions/cache@v5
+      with:
+        path: ${{ steps.extcache.outputs.dir }}
+        key: ${{ steps.extcache.outputs.key }}
+        restore-keys: ${{ steps.extcache.outputs.key }}
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: https://github.com/shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        extensions: gd, mbstring, json, curl, xml, mysql, ldap, gmp
+        extensions: ${{ env.phpextensions }}
 
     - name: Get Composer Cache Directory
       id: composer-cache
@@ -32,30 +53,36 @@ jobs:
         echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v4
+      uses: https://code.forgejo.org/actions/cache@v5
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ matrix.php }}
         restore-keys: ${{ runner.os }}-composer-
 
-    - name: Start Database
+    - name: Install composer dependencies
+      run: composer install --prefer-dist --no-interaction --ansi
+      env:
+        COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.GH_TOKEN }}"}}'
+
+    - name: Start MySQL
       run: |
         sudo systemctl start mysql
 
-    - name: Setup Database
+    - name: Create database & user
       run: |
         mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;'
         mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';"
         mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
         mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
 
-    - name: Install composer dependencies
-      run: composer install --prefer-dist --no-interaction --ansi
-
     - name: Migrate and seed the database
+      env:
+        TEST_DATABASE_URL: 'mysql://bookstack-test:bookstack-test@localhost/bookstack-test'
       run: |
         php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
         php${{ matrix.php }} artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
 
     - name: Run PHP tests
+      env:
+        TEST_DATABASE_URL: 'mysql://bookstack-test:bookstack-test@localhost/bookstack-test'
       run: php${{ matrix.php }} ./vendor/bin/phpunit
diff --git a/.forgejo/workflows/update-snyk.yml b/.forgejo/workflows/update-snyk.yml
new file mode 100644
index 00000000000..89ce68ae3a4
--- /dev/null
+++ b/.forgejo/workflows/update-snyk.yml
@@ -0,0 +1,33 @@
+name: update-snyk
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'composer*'
+      - 'package*'
+    branches:
+      - 'development'
+      - 'release'
+
+jobs:
+  update:
+    runs-on: docker
+    container:
+      image: docker.io/library/node:24-trixie
+    steps:
+    - uses: https://code.forgejo.org/actions/checkout@v6
+
+    - name: Update Snyk for monitoring - Composer
+      uses: https://github.com/snyk/actions/node@master
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        args: snyk monitor --file=composer.lock --project-name=bookstack-${{forgejo.ref_name}}-composer
+
+    - name: Update Snyk for monitoring - NPM
+      uses: https://github.com/snyk/actions/node@master
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        args: snyk monitor --file=package-lock.json --project-name=bookstack-${{forgejo.ref_name}}-npm
\ No newline at end of file
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 2c6317af654..7a02656725d 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -1,84 +1,2 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-education, socio-economic status, nationality, personal appearance, race,
-religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-### Project Maintainer Standards
-
-Project maintainers should generally follow these additional standards:
-
-* Avoid using a negative or harsh tone in communication, Even if the other party
-is being negative themselves.
-* When providing criticism, try to make it constructive to lead the other person
-down the correct path.
-* Keep the [project definition](https://github.com/BookStackApp/BookStack#project-definition)
-in mind when deciding what's in scope of the Project.
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior. In addition, Project
-maintainers are responsible for following the standards themselves.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at the email address shown on [the profile here](https://github.com/ssddanbrown). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
+Please find our community rules on our website here:
+https://www.bookstackapp.com/about/community-rules/
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 019667388eb..0cd657d7a50 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Discord Chat Support
-    url: https://discord.gg/ztkBqR2
-    about: Realtime support & chat with the BookStack community and the team.
+  - name: Open Issues Here Instead
+    url: https://codeberg.org/bookstack/bookstack/issues
+    about: This project has migrated to Codeberg, please open issues there instead.
 
   - name: Debugging & Common Issues
     url: https://www.bookstackapp.com/docs/admin/debugging/
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
deleted file mode 100644
index 12e5fe04c6d..00000000000
--- a/.github/SECURITY.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the [latest version](https://github.com/BookStackApp/BookStack/releases) of BookStack is supported.
-We generally don't support older versions of BookStack due to maintenance effort and
-since we aim to provide a fairly stable upgrade path for new versions.
-
-## Security Notifications
-
-If you'd like to be notified of new potential security concerns you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
-
-## Reporting a Vulnerability
-
-If you've found an issue that likely has no impact to existing users (For example, in a development-only branch)
-feel free to raise it via a standard GitHub bug report issue.
-
-If the issue could have a security impact to BookStack instances, 
-please directly contact the lead maintainer [@ssddanbrown](https://github.com/ssddanbrown). 
-You will need to log in to be able to see the email address on the [GitHub profile page](https://github.com/ssddanbrown).
-Alternatively you can send a DM via Mastodon to [@danb@fosstodon.org](https://fosstodon.org/@danb).
-
-Please be patient while the vulnerability is being reviewed. Deploying the fix to address the vulnerability
-can often take a little time due to the amount of preparation required, to ensure the vulnerability has
-been covered, and to create the content required to adequately notify the user-base.
-
-Thank you for keeping BookStack instances safe!
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000000..c185f3280b6
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,10 @@
+**Warning:**
+
+This project has migrated to Codeberg:
+https://codeberg.org/bookstack/bookstack
+
+Please open pull requests here instead.
+
+ANY PULL REQUESTS OPENED HERE WILL BE CLOSED WITHOUT COMMENT OR MERGE.
+
+---
\ No newline at end of file
diff --git a/.github/translators.txt b/.github/translators.txt
index 63cf29e35ff..6455b234abc 100644
--- a/.github/translators.txt
+++ b/.github/translators.txt
@@ -177,7 +177,7 @@ Alexander Predl (Harveyhase68) :: German
 Rem (Rem9000) :: Dutch
 Michał Stelmach (stelmach-web) :: Polish
 arniom :: French
-REMOVED_USER :: French; Dutch; Portuguese, Brazilian; Portuguese; Turkish; 
+REMOVED_USER :: French; German; Dutch; Portuguese, Brazilian; Portuguese; Turkish; Danish; 
 林祖年 (contagion) :: Chinese Traditional
 Siamak Guodarzi (siamakgoudarzi88) :: Persian
 Lis Maestrelo (lismtrl) :: Portuguese, Brazilian
@@ -222,7 +222,7 @@ SmokingCrop :: Dutch
 Maciej Lebiest (Szwendacz) :: Polish
 DiscordDigital :: German; German Informal
 Gábor Marton (dodver) :: Hungarian
-Jasell :: Swedish
+Jakob Åsell (Jasell) :: Swedish
 Ghost_chu (ghostchu) :: Chinese Simplified
 Ravid Shachar (ravidshachar) :: Hebrew
 Helga Guchshenskaya (guchshenskaya) :: Russian
@@ -444,7 +444,7 @@ Irjan Olsen (Irch) :: Norwegian Bokmal
 Aleksandar Jovanovic (jovanoviczaleksandar) :: Serbian (Cyrillic)
 Red (RedVortex) :: Hebrew
 xgrug :: Chinese Simplified
-HrCalmar :: Danish
+Calle Calmar (HrCalmar) :: Danish
 Avishay Rapp (AvishayRapp) :: Hebrew
 matthias4217 :: French
 Berke BOYLU2 (berkeboylu2) :: Turkish
@@ -509,3 +509,52 @@ iamwhoiamwhoami :: Swedish
 Grogui :: French
 MrCharlesIII :: Arabic
 David Olsen (dawin) :: Danish
+ltnzr :: French
+Frank Holler (holler.frank) :: German; German Informal
+Korab Arifi (korabidev) :: Albanian
+Petr Husák (petrhusak) :: Czech
+Bernardo Maia (bernardo.bmaia2) :: Portuguese, Brazilian
+Amr (amr3k) :: Arabic
+Tahsin Ahmed (tahsinahmed2012) :: Bengali
+bojan_che :: Serbian (Cyrillic)
+setiawan setiawan (culture.setiawan) :: Indonesian
+Donald Mac Kenzie (kiuman) :: Norwegian Bokmal
+Gabriel Silver (GabrielBSilver) :: Hebrew
+Tomas Darius Davainis (Tomasdd) :: Lithuanian
+CriedHero :: Chinese Simplified
+Henrik (henrik2105) :: Norwegian Bokmal
+FoW (fofwisdom) :: Korean
+serinf-lauza :: French
+Diyan Nikolaev (nikolaev.diyan) :: Bulgarian
+Shadluk Avan (quldosh) :: Uzbek
+Marci (MartonPoto) :: Hungarian
+Michał Sadurski (wheeskeey) :: Polish
+JanDziaslo :: Polish
+Charllys Fernandes (CharllysFernandes) :: Portuguese, Brazilian
+Ilgiz Zigangirov (inov8) :: Russian
+Max Israelsson (Blezie) :: Swedish
+Skiddybison5924 (chris-devel0per) :: German Informal; German
+Veyilla Nightwhisper (Veyilla) :: German
+João Barbosa (hypeedd) :: Portuguese
+Abcdefg Hijklmn (collatek) :: Korean
+Suthep Yonphimai (tomztt) :: Thai
+MrClock (MrClock8163) :: Hungarian
+Elena0875 :: Russian
+FelixFrizzy :: German
+Pedro de Mattia (pdmtt) :: Portuguese, Brazilian
+lonestan :: Russian
+Paul Kernstock (kernstock) :: German
+brtbr :: German; German Informal
+Ricardo Covelo (covelo12) :: Portuguese
+Bojan Maksimovic (PolarniMeda) :: Serbian (Cyrillic)
+Dian Prawira (wiradian84) :: Indonesian
+Tim (timakai) :: Dutch; German; German Informal; French; Romanian; Catalan; Czech; Danish; Finnish; Hungarian; Italian; Japanese; Korean; Polish; Russian; Ukrainian; Chinese Simplified; Chinese Traditional; Portuguese, Brazilian; Persian; Spanish, Argentina; Croatian; Norwegian Nynorsk; Estonian; Uzbek; Norwegian Bokmal
+dadda123 :: Swedish
+Julien Muggli (JulienMuggli) :: French
+nomoreshow :: Turkish
+Qasem Talaee (qasem_talaee) :: Persian
+ddeicide :: Bulgarian
+Luca (luca90043) :: German
+AlwaleedAlwabel (Nick390) :: Arabic
+kpfurtak :: Polish
+Jonatan Nyberg (NickWick) :: Swedish
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
deleted file mode 100644
index 23e58a772c2..00000000000
--- a/.github/workflows/test-migrations.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: test-migrations
-
-on:
-  push:
-    paths:
-      - '**.php'
-      - 'composer.*'
-  pull_request:
-    paths:
-      - '**.php'
-      - 'composer.*'
-
-jobs:
-  build:
-    if: ${{ github.ref != 'refs/heads/l10n_development' }}
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        php: ['8.2', '8.3', '8.4']
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: gd, mbstring, json, curl, xml, mysql, ldap
-
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache composer packages
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Start MySQL
-        run: |
-          sudo systemctl start mysql
-
-      - name: Create database & user
-        run: |
-          mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS `bookstack-test`;'
-          mysql -uroot -proot -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED WITH mysql_native_password BY 'bookstack-test';"
-          mysql -uroot -proot -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';"
-          mysql -uroot -proot -e 'FLUSH PRIVILEGES;'
-
-      - name: Install composer dependencies
-        run: composer install --prefer-dist --no-interaction --ansi
-
-      - name: Start migration test
-        run: |
-          php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
-
-      - name: Start migration:rollback test
-        run: |
-          php${{ matrix.php }} artisan migrate:rollback --force -n --database=mysql_testing
-
-      - name: Start migration rerun test
-        run: |
-          php${{ matrix.php }} artisan migrate --force -n --database=mysql_testing
diff --git a/.gitignore b/.gitignore
index b545d161f13..06a8723c5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /node_modules
 /.vscode
 /composer
+/composer.phar
 /coverage
 Homestead.yaml
 .env
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..495a6af9983
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,2 @@
+ignore-scripts=true
+audit=true
diff --git a/LICENSE b/LICENSE
index 9b94d9be3f3..d7961a61319 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2025, Dan Brown and the BookStack project contributors.
+Copyright (c) 2015-2026, Dan Brown and the BookStack project contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/app/Access/Controllers/ForgotPasswordController.php b/app/Access/Controllers/ForgotPasswordController.php
index 36dd977558b..e8127e6173a 100644
--- a/app/Access/Controllers/ForgotPasswordController.php
+++ b/app/Access/Controllers/ForgotPasswordController.php
@@ -45,11 +45,11 @@ public function sendResetLinkEmail(Request $request)
         );
 
         if ($response === Password::RESET_LINK_SENT) {
-            $this->logActivity(ActivityType::AUTH_PASSWORD_RESET, $request->get('email'));
+            $this->logActivity(ActivityType::AUTH_PASSWORD_RESET, $request->input('email'));
         }
 
         if (in_array($response, [Password::RESET_LINK_SENT, Password::INVALID_USER, Password::RESET_THROTTLED])) {
-            $message = trans('auth.reset_password_sent', ['email' => $request->get('email')]);
+            $message = trans('auth.reset_password_sent', ['email' => $request->input('email')]);
             $this->showSuccessNotification($message);
 
             return redirect('/password/email')->with('status', trans($response));
diff --git a/app/Access/Controllers/HandlesPartialLogins.php b/app/Access/Controllers/HandlesPartialLogins.php
index 47a63d19b0c..8afad2776d1 100644
--- a/app/Access/Controllers/HandlesPartialLogins.php
+++ b/app/Access/Controllers/HandlesPartialLogins.php
@@ -22,4 +22,10 @@ protected function currentOrLastAttemptedUser(): User
 
         return $user;
     }
+
+    protected function clearLastAttemptedUser(): void
+    {
+        $loginService = app()->make(LoginService::class);
+        $loginService->clearLastLoginAttempted();
+    }
 }
diff --git a/app/Access/Controllers/LoginController.php b/app/Access/Controllers/LoginController.php
index ce872ba88dc..fece3d88098 100644
--- a/app/Access/Controllers/LoginController.php
+++ b/app/Access/Controllers/LoginController.php
@@ -8,6 +8,7 @@
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
+use BookStack\Util\UrlComparison;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -32,12 +33,12 @@ public function getLogin(Request $request)
     {
         $socialDrivers = $this->socialDriverManager->getActive();
         $authMethod = config('auth.method');
-        $preventInitiation = $request->get('prevent_auto_init') === 'true';
+        $preventInitiation = $request->input('prevent_auto_init') === 'true';
 
         if ($request->has('email')) {
             session()->flashInput([
-                'email'    => $request->get('email'),
-                'password' => (config('app.env') === 'demo') ? $request->get('password', '') : '',
+                'email'    => $request->input('email'),
+                'password' => (config('app.env') === 'demo') ? $request->input('password', '') : '',
             ]);
         }
 
@@ -62,7 +63,7 @@ public function getLogin(Request $request)
     public function login(Request $request)
     {
         $this->validateLogin($request);
-        $username = $request->get($this->username());
+        $username = $request->input($this->username());
 
         // Check login throttling attempts to see if they've gone over the limit
         if ($this->hasTooManyLoginAttempts($request)) {
@@ -186,7 +187,8 @@ protected function updateIntendedFromPrevious(): void
     {
         // Store the previous location for redirect after login
         $previous = url()->previous('');
-        $isPreviousFromInstance = str_starts_with($previous, url('/'));
+        $comparison = new UrlComparison($previous, url('/'));
+        $isPreviousFromInstance = $comparison->originsMatch() && $comparison->pathsOverlap();
         if (!$previous || !setting('app-public') || !$isPreviousFromInstance) {
             return;
         }
diff --git a/app/Access/Controllers/MfaBackupCodesController.php b/app/Access/Controllers/MfaBackupCodesController.php
index 5c334674e7d..b81e790976f 100644
--- a/app/Access/Controllers/MfaBackupCodesController.php
+++ b/app/Access/Controllers/MfaBackupCodesController.php
@@ -6,6 +6,7 @@
 use BookStack\Access\Mfa\BackupCodeService;
 use BookStack\Access\Mfa\MfaSession;
 use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\Mfa\MfaVerificationLimiter;
 use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
@@ -19,6 +20,11 @@ class MfaBackupCodesController extends Controller
 
     protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-backup-codes';
 
+    public function __construct(
+        protected MfaVerificationLimiter $limiter,
+    ) {
+    }
+
     /**
      * Show a view that generates and displays backup codes.
      */
@@ -71,6 +77,12 @@ public function confirm()
     public function verify(Request $request, BackupCodeService $codeService, MfaSession $mfaSession, LoginService $loginService)
     {
         $user = $this->currentOrLastAttemptedUser();
+        $this->limiter->incrementAttempts($user, $request);
+        if ($this->limiter->hasHitLimit($user, $request)) {
+            $this->clearLastAttemptedUser();
+            $this->limiter->throwException();
+        }
+
         $codes = MfaValue::getValueForUser($user, MfaValue::METHOD_BACKUP_CODES) ?? '[]';
 
         $this->validate($request, [
@@ -84,11 +96,12 @@ function ($attribute, $value, $fail) use ($codeService, $codes) {
             ],
         ]);
 
-        $updatedCodes = $codeService->removeInputCodeFromSet($request->get('code'), $codes);
+        $updatedCodes = $codeService->removeInputCodeFromSet($request->input('code'), $codes);
         MfaValue::upsertWithValue($user, MfaValue::METHOD_BACKUP_CODES, $updatedCodes);
 
         $mfaSession->markVerifiedForUser($user);
         $loginService->reattemptLoginFor($user);
+        $this->limiter->decrementAttempts($user, $request);
 
         if ($codeService->countCodesInSet($updatedCodes) < 5) {
             $this->showWarningNotification(trans('auth.mfa_backup_codes_usage_limit_warning'));
diff --git a/app/Access/Controllers/MfaController.php b/app/Access/Controllers/MfaController.php
index c9100ef9120..181cfc0b84b 100644
--- a/app/Access/Controllers/MfaController.php
+++ b/app/Access/Controllers/MfaController.php
@@ -51,14 +51,14 @@ public function remove(string $method)
      */
     public function verify(Request $request)
     {
-        $desiredMethod = $request->get('method');
+        $desiredMethod = $request->input('method');
         $userMethods = $this->currentOrLastAttemptedUser()
             ->mfaValues()
             ->get(['id', 'method'])
             ->groupBy('method');
 
         // Basic search for the default option for a user.
-        // (Prioritises totp over backup codes)
+        // (Prioritises TOTP over backup codes)
         $method = $userMethods->has($desiredMethod) ? $desiredMethod : $userMethods->keys()->sort()->reverse()->first();
         $otherMethods = $userMethods->keys()->filter(function ($userMethod) use ($method) {
             return $method !== $userMethod;
diff --git a/app/Access/Controllers/MfaTotpController.php b/app/Access/Controllers/MfaTotpController.php
index 5202fedc04f..b8a33322857 100644
--- a/app/Access/Controllers/MfaTotpController.php
+++ b/app/Access/Controllers/MfaTotpController.php
@@ -5,6 +5,7 @@
 use BookStack\Access\LoginService;
 use BookStack\Access\Mfa\MfaSession;
 use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\Mfa\MfaVerificationLimiter;
 use BookStack\Access\Mfa\TotpService;
 use BookStack\Access\Mfa\TotpValidationRule;
 use BookStack\Activity\ActivityType;
@@ -20,7 +21,8 @@ class MfaTotpController extends Controller
     protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-totp-secret';
 
     public function __construct(
-        protected TotpService $totp
+        protected TotpService $totp,
+        protected MfaVerificationLimiter $limiter,
     ) {
     }
 
@@ -86,6 +88,12 @@ public function confirm(Request $request)
     public function verify(Request $request, LoginService $loginService, MfaSession $mfaSession)
     {
         $user = $this->currentOrLastAttemptedUser();
+        $this->limiter->incrementAttempts($user, $request);
+        if ($this->limiter->hasHitLimit($user, $request)) {
+            $this->clearLastAttemptedUser();
+            $this->limiter->throwException();
+        }
+
         $totpSecret = MfaValue::getValueForUser($user, MfaValue::METHOD_TOTP);
 
         $this->validate($request, [
@@ -98,6 +106,7 @@ public function verify(Request $request, LoginService $loginService, MfaSession
 
         $mfaSession->markVerifiedForUser($user);
         $loginService->reattemptLoginFor($user);
+        $this->limiter->decrementAttempts($user, $request);
 
         return redirect()->intended();
     }
diff --git a/app/Access/Controllers/OidcController.php b/app/Access/Controllers/OidcController.php
index 055d4c1403f..654ed692880 100644
--- a/app/Access/Controllers/OidcController.php
+++ b/app/Access/Controllers/OidcController.php
@@ -9,11 +9,9 @@
 
 class OidcController extends Controller
 {
-    protected OidcService $oidcService;
-
-    public function __construct(OidcService $oidcService)
-    {
-        $this->oidcService = $oidcService;
+    public function __construct(
+        protected OidcService $oidcService
+    ) {
         $this->middleware('guard:oidc');
     }
 
@@ -30,7 +28,7 @@ public function login()
             return redirect('/login');
         }
 
-        session()->flash('oidc_state', $loginDetails['state']);
+        session()->put('oidc_state', time() . ':' . $loginDetails['state']);
 
         return redirect($loginDetails['url']);
     }
@@ -41,10 +39,16 @@ public function login()
      */
     public function callback(Request $request)
     {
-        $storedState = session()->pull('oidc_state');
         $responseState = $request->query('state');
+        $splitState =  explode(':', session()->pull('oidc_state', ':'), 2);
+        if (count($splitState) !== 2) {
+            $splitState = [null, null];
+        }
+
+        [$storedStateTime, $storedState] = $splitState;
+        $threeMinutesAgo = time() - 3 * 60;
 
-        if ($storedState !== $responseState) {
+        if (!$storedState || $storedState !== $responseState || intval($storedStateTime) < $threeMinutesAgo) {
             $this->showErrorNotification(trans('errors.oidc_fail_authed', ['system' => config('oidc.name')]));
 
             return redirect('/login');
@@ -62,7 +66,7 @@ public function callback(Request $request)
     }
 
     /**
-     * Log the user out then start the OIDC RP-initiated logout process.
+     * Log the user out, then start the OIDC RP-initiated logout process.
      */
     public function logout()
     {
diff --git a/app/Access/Controllers/RegisterController.php b/app/Access/Controllers/RegisterController.php
index e9812aa5d06..f0261fba80d 100644
--- a/app/Access/Controllers/RegisterController.php
+++ b/app/Access/Controllers/RegisterController.php
@@ -48,8 +48,7 @@ public function getRegister()
     public function postRegister(Request $request)
     {
         $this->registrationService->ensureRegistrationAllowed();
-        $this->validator($request->all())->validate();
-        $userData = $request->all();
+        $userData = $this->validator($request->all())->validate();
 
         try {
             $user = $this->registrationService->registerUser($userData);
diff --git a/app/Access/Controllers/ResetPasswordController.php b/app/Access/Controllers/ResetPasswordController.php
index 3af65d17fb6..e81c98b288c 100644
--- a/app/Access/Controllers/ResetPasswordController.php
+++ b/app/Access/Controllers/ResetPasswordController.php
@@ -48,7 +48,7 @@ public function reset(Request $request)
 
         // Here we will attempt to reset the user's password. If it is successful we
         // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
+        // database. Otherwise, we will parse the error and return the response.
         $credentials = $request->only('email', 'password', 'password_confirmation', 'token');
         $response = Password::broker()->reset($credentials, function (User $user, string $password) {
             $user->password = Hash::make($password);
@@ -63,7 +63,7 @@ public function reset(Request $request)
         // redirect them back to where they came from with their error message.
         return $response === Password::PASSWORD_RESET
             ? $this->sendResetResponse()
-            : $this->sendResetFailedResponse($request, $response, $request->get('token'));
+            : $this->sendResetFailedResponse($request, $response, $request->input('token'));
     }
 
     /**
diff --git a/app/Access/Controllers/Saml2Controller.php b/app/Access/Controllers/Saml2Controller.php
index 6f802370e9c..39598b1435a 100644
--- a/app/Access/Controllers/Saml2Controller.php
+++ b/app/Access/Controllers/Saml2Controller.php
@@ -78,7 +78,7 @@ public function sls()
      */
     public function startAcs(Request $request)
     {
-        $samlResponse = $request->get('SAMLResponse', null);
+        $samlResponse = $request->input('SAMLResponse', null);
 
         if (empty($samlResponse)) {
             $this->showErrorNotification(trans('errors.saml_fail_authed', ['system' => config('saml2.name')]));
@@ -100,7 +100,7 @@ public function startAcs(Request $request)
      */
     public function processAcs(Request $request)
     {
-        $acsId = $request->get('id', null);
+        $acsId = $request->input('id', null);
         $cacheKey = 'saml2_acs:' . $acsId;
         $samlResponse = null;
 
diff --git a/app/Access/Controllers/SocialController.php b/app/Access/Controllers/SocialController.php
index 07f57062d01..5a090c7ca2a 100644
--- a/app/Access/Controllers/SocialController.php
+++ b/app/Access/Controllers/SocialController.php
@@ -67,7 +67,7 @@ public function callback(Request $request, string $socialDriver)
         if ($request->has('error') && $request->has('error_description')) {
             throw new SocialSignInException(trans('errors.social_login_bad_response', [
                 'socialAccount' => $socialDriver,
-                'error'         => $request->get('error_description'),
+                'error'         => $request->input('error_description'),
             ]), '/login');
         }
 
diff --git a/app/Access/Controllers/UserInviteController.php b/app/Access/Controllers/UserInviteController.php
index 9ee05b84fa9..091b68e5594 100644
--- a/app/Access/Controllers/UserInviteController.php
+++ b/app/Access/Controllers/UserInviteController.php
@@ -67,7 +67,7 @@ public function setPassword(Request $request, string $token)
         }
 
         $user = $this->userRepo->getById($userId);
-        $user->password = Hash::make($request->get('password'));
+        $user->password = Hash::make($request->input('password'));
         $user->email_confirmed = true;
         $user->save();
 
diff --git a/app/Access/EmailConfirmationService.php b/app/Access/EmailConfirmationService.php
index 1a5156d3e7a..e950c5504b7 100644
--- a/app/Access/EmailConfirmationService.php
+++ b/app/Access/EmailConfirmationService.php
@@ -5,6 +5,7 @@
 use BookStack\Access\Notifications\ConfirmEmailNotification;
 use BookStack\Exceptions\ConfirmationEmailException;
 use BookStack\Users\Models\User;
+use Exception;
 
 class EmailConfirmationService extends UserTokenService
 {
@@ -16,6 +17,7 @@ class EmailConfirmationService extends UserTokenService
      * Also removes any existing old ones.
      *
      * @throws ConfirmationEmailException
+     * @throws Exception
      */
     public function sendConfirmation(User $user): void
     {
diff --git a/app/Access/ExternalBaseUserProvider.php b/app/Access/ExternalBaseUserProvider.php
index 2165fd4591e..8d82d28c8eb 100644
--- a/app/Access/ExternalBaseUserProvider.php
+++ b/app/Access/ExternalBaseUserProvider.php
@@ -3,11 +3,17 @@
 namespace BookStack\Access;
 
 use BookStack\Users\Models\User;
+use BookStack\Users\UserRepo;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
 
 class ExternalBaseUserProvider implements UserProvider
 {
+    public function __construct(
+        protected UserRepo $userRepo,
+    ) {
+    }
+
     /**
      * Retrieve a user by their unique identifier.
      */
@@ -42,11 +48,9 @@ public function updateRememberToken(Authenticatable $user, $token)
     /**
      * Retrieve a user by the given credentials.
      */
-    public function retrieveByCredentials(array $credentials): ?Authenticatable
+    public function retrieveByCredentials(array $credentials): ?User
     {
-        return User::query()
-            ->where('external_auth_id', $credentials['external_auth_id'])
-            ->first();
+        return $this->userRepo->getByExternalAuthId($credentials['external_auth_id']);
     }
 
     /**
diff --git a/app/Access/Guards/ExternalBaseSessionGuard.php b/app/Access/Guards/ExternalBaseSessionGuard.php
index 91239599ba9..4d263e581f8 100644
--- a/app/Access/Guards/ExternalBaseSessionGuard.php
+++ b/app/Access/Guards/ExternalBaseSessionGuard.php
@@ -30,7 +30,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * The user we last attempted to retrieve.
      */
-    protected Authenticatable|null $lastAttempted;
+    protected Authenticatable|null $lastAttempted = null;
 
     /**
      * The session used by the guard.
@@ -50,8 +50,12 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * Create a new authentication guard.
      */
-    public function __construct(string $name, UserProvider $provider, Session $session, RegistrationService $registrationService)
-    {
+    public function __construct(
+        string $name,
+        UserProvider $provider,
+        Session $session,
+        RegistrationService $registrationService
+    ) {
         $this->name = $name;
         $this->session = $session;
         $this->provider = $provider;
@@ -203,7 +207,7 @@ protected function clearUserDataFromStorage(): void
     /**
      * Get the last user we attempted to authenticate.
      */
-    public function getLastAttempted(): Authenticatable
+    public function getLastAttempted(): Authenticatable|null
     {
         return $this->lastAttempted;
     }
diff --git a/app/Access/Guards/LdapSessionGuard.php b/app/Access/Guards/LdapSessionGuard.php
index 9455d530dfe..f3628c897d8 100644
--- a/app/Access/Guards/LdapSessionGuard.php
+++ b/app/Access/Guards/LdapSessionGuard.php
@@ -83,6 +83,10 @@ public function attempt(array $credentials = [], $remember = false): bool
             }
         }
 
+        if (!($user instanceof User)) {
+            throw new LoginAttemptException('Could not find or create a user for LDAP login.');
+        }
+
         // Sync LDAP groups if required
         if ($this->ldapService->shouldSyncGroups()) {
             $this->ldapService->syncGroups($user, $username);
diff --git a/app/Access/Ldap.php b/app/Access/Ldap.php
index d14f688218c..9eb01734a87 100644
--- a/app/Access/Ldap.php
+++ b/app/Access/Ldap.php
@@ -2,6 +2,9 @@
 
 namespace BookStack\Access;
 
+use LDAP\Connection;
+use LDAP\Result;
+
 /**
  * Class Ldap
  * An object-orientated thin abstraction wrapper for common PHP LDAP functions.
@@ -11,20 +14,16 @@ class Ldap
 {
     /**
      * Connect to an LDAP server.
-     *
-     * @return resource|\LDAP\Connection|false
      */
-    public function connect(string $hostName)
+    public function connect(string $hostName): Connection|false
     {
         return ldap_connect($hostName);
     }
 
     /**
      * Set the value of an LDAP option for the given connection.
-     *
-     * @param resource|\LDAP\Connection|null $ldapConnection
      */
-    public function setOption($ldapConnection, int $option, mixed $value): bool
+    public function setOption(Connection|null $ldapConnection, int $option, mixed $value): bool
     {
         return ldap_set_option($ldapConnection, $option, $value);
     }
@@ -32,29 +31,25 @@ public function setOption($ldapConnection, int $option, mixed $value): bool
     /**
      * Start TLS on the given LDAP connection.
      */
-    public function startTls($ldapConnection): bool
+    public function startTls(Connection $ldapConnection): bool
     {
         return ldap_start_tls($ldapConnection);
     }
 
     /**
      * Set the version number for the given LDAP connection.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
      */
-    public function setVersion($ldapConnection, int $version): bool
+    public function setVersion(Connection $ldapConnection, int $version): bool
     {
         return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
     }
 
     /**
-     * Search LDAP tree using the provided filter.
+     * Search the LDAP tree using the provided filter.
      *
-     * @param resource|\LDAP\Connection   $ldapConnection
-     *
-     * @return \LDAP\Result|array|false
+     * @return Result|Result[]|false
      */
-    public function search($ldapConnection, string $baseDn, string $filter, array $attributes = [])
+    public function search(Connection $ldapConnection, string $baseDn, string $filter, array $attributes = [])
     {
         return ldap_search($ldapConnection, $baseDn, $filter, $attributes);
     }
@@ -62,32 +57,34 @@ public function search($ldapConnection, string $baseDn, string $filter, array $a
     /**
      * Read an entry from the LDAP tree.
      *
-     * @param resource|\Ldap\Connection $ldapConnection
-     *
-     * @return \LDAP\Result|array|false
+     * @return Result|false
      */
-    public function read($ldapConnection, string $baseDn, string $filter, array $attributes = [])
+    protected function read(Connection $ldapConnection, string $baseDn, string $filter, array $attributes = [])
     {
         return ldap_read($ldapConnection, $baseDn, $filter, $attributes);
     }
 
     /**
      * Get entries from an LDAP search result.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
-     * @param resource|\LDAP\Result $ldapSearchResult
      */
-    public function getEntries($ldapConnection, $ldapSearchResult): array|false
+    protected function getEntries(Connection $ldapConnection, Result $ldapSearchResult): array|false
     {
         return ldap_get_entries($ldapConnection, $ldapSearchResult);
     }
 
+    /**
+     * Read from the LDAP system, and get the entries immediately.
+     */
+    public function readAndGetEntries(Connection $ldapConnection, string $baseDn, string $filter, array $attributes = []): array|false
+    {
+        $read = $this->read($ldapConnection, $baseDn, $filter, $attributes);
+        return $this->getEntries($ldapConnection, $read);
+    }
+
     /**
      * Search and get entries immediately.
-     *
-     * @param resource|\LDAP\Connection   $ldapConnection
      */
-    public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = []): array|false
+    public function searchAndGetEntries(Connection $ldapConnection, string $baseDn, string $filter, array $attributes = []): array|false
     {
         $search = $this->search($ldapConnection, $baseDn, $filter, $attributes);
 
@@ -95,11 +92,9 @@ public function searchAndGetEntries($ldapConnection, string $baseDn, string $fil
     }
 
     /**
-     * Bind to LDAP directory.
-     *
-     * @param resource|\LDAP\Connection $ldapConnection
+     * Bind to the LDAP directory.
      */
-    public function bind($ldapConnection, ?string $bindRdn = null, ?string $bindPassword = null): bool
+    public function bind(Connection $ldapConnection, ?string $bindRdn = null, ?string $bindPassword = null): bool
     {
         return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
     }
diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 0f456efc247..218bf1a0cfa 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -7,7 +7,9 @@
 use BookStack\Uploads\UserAvatars;
 use BookStack\Users\Models\User;
 use ErrorException;
+use Exception;
 use Illuminate\Support\Facades\Log;
+use LDAP\Connection;
 
 /**
  * Class LdapService
@@ -15,10 +17,7 @@
  */
 class LdapService
 {
-    /**
-     * @var resource|\LDAP\Connection
-     */
-    protected $ldapConnection;
+    protected Connection|null $ldapConnection = null;
 
     protected array $config;
     protected bool $enabled;
@@ -187,11 +186,9 @@ public function validateUserCredentials(?array $ldapUserDetails, string $passwor
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
      *
-     * @param resource|\LDAP\Connection $connection
-     *
      * @throws LdapException
      */
-    protected function bindSystemUser($connection): void
+    protected function bindSystemUser(Connection $connection): void
     {
         $ldapDn = $this->config['dn'];
         $ldapPass = $this->config['pass'];
@@ -213,10 +210,8 @@ protected function bindSystemUser($connection): void
      * Creates a new connection if one does not exist.
      *
      * @throws LdapException
-     *
-     * @return resource|\LDAP\Connection
      */
-    protected function getConnection()
+    protected function getConnection(): Connection
     {
         if ($this->ldapConnection !== null) {
             return $this->ldapConnection;
@@ -255,7 +250,7 @@ protected function getConnection()
         if ($this->config['start_tls']) {
             try {
                 $started = $this->ldap->startTls($ldapConnection);
-            } catch (\Exception $exception) {
+            } catch (Exception $exception) {
                 $error = $exception->getMessage() . ' :: ' . ldap_error($ldapConnection);
                 ldap_get_option($ldapConnection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detail);
                 Log::info("LDAP STARTTLS failure: {$error} {$detail}");
@@ -346,13 +341,15 @@ public function getUserGroups(string $userName): array
         }
 
         $userGroups = $this->extractGroupsFromSearchResponseEntry($user);
-        $allGroups = $this->getGroupsRecursive($userGroups, []);
+        $filteredGroups = $this->filterGroups($userGroups);
+        $allGroups = $this->getGroupsRecursive($filteredGroups, []);
         $formattedGroups = $this->extractGroupNamesFromLdapGroupDns($allGroups);
 
         if ($this->config['dump_user_groups']) {
             throw new JsonDebugException([
                 'details_from_ldap'            => $user,
                 'parsed_direct_user_groups'    => $userGroups,
+                'parsed_filtered_user_groups'  => $filteredGroups,
                 'parsed_recursive_user_groups' => $allGroups,
                 'parsed_resulting_group_names' => $formattedGroups,
             ]);
@@ -367,7 +364,7 @@ protected function extractGroupNamesFromLdapGroupDns(array $groupDNs): array
 
         foreach ($groupDNs as $groupDN) {
             $exploded = $this->ldap->explodeDn($groupDN, 1);
-            if ($exploded !== false && count($exploded) > 0) {
+            if ($exploded !== false && $exploded['count'] > 0) {
                 $names[] = $exploded[0];
             }
         }
@@ -390,7 +387,8 @@ protected function getGroupsRecursive(array $groupDNs, array $checked): array
             }
 
             $parentGroups = $this->getParentsOfGroup($groupDN);
-            $groupsToAdd = array_merge($groupsToAdd, $parentGroups);
+            $parentGroupsFiltered = $this->filterGroups($parentGroups);
+            $groupsToAdd = array_merge($groupsToAdd, $parentGroupsFiltered);
             $checked[] = $groupDN;
         }
 
@@ -403,6 +401,20 @@ protected function getGroupsRecursive(array $groupDNs, array $checked): array
         return $this->getGroupsRecursive($uniqueDNs, $checked);
     }
 
+    /**
+     * @param string[] $groupDNs
+     * @return string[]
+     */
+    protected function filterGroups(array $groupDNs): array
+    {
+        $filtered = array_filter($groupDNs, function (string $groupDN) {
+            $exploded = $this->ldap->explodeDn($groupDN, 1);
+            return $exploded !== false && $exploded['count'] > 0;
+        });
+
+        return array_values($filtered);
+    }
+
     /**
      * @throws LdapException
      */
@@ -414,8 +426,7 @@ protected function getParentsOfGroup(string $groupDN): array
 
         $followReferrals = $this->config['follow_referrals'] ? 1 : 0;
         $this->ldap->setOption($ldapConnection, LDAP_OPT_REFERRALS, $followReferrals);
-        $read = $this->ldap->read($ldapConnection, $groupDN, '(objectClass=*)', [$groupsAttr]);
-        $results = $this->ldap->getEntries($ldapConnection, $read);
+        $results = $this->ldap->readAndGetEntries($ldapConnection, $groupDN, '(objectClass=*)', [$groupsAttr]);
         if ($results['count'] === 0) {
             return [];
         }
@@ -471,7 +482,7 @@ public function saveAndAttachAvatar(User $user, array $ldapUserDetails): void
         try {
             $imageData = $ldapUserDetails['avatar'];
             $this->userAvatars->assignToUserFromExistingData($user, $imageData, 'jpg');
-        } catch (\Exception $exception) {
+        } catch (Exception) {
             Log::info("Failed to use avatar image from LDAP data for user id {$user->id}");
         }
     }
diff --git a/app/Access/LoginService.php b/app/Access/LoginService.php
index c81e955722c..46545f798b7 100644
--- a/app/Access/LoginService.php
+++ b/app/Access/LoginService.php
@@ -13,6 +13,8 @@
 use BookStack\Theming\ThemeEvents;
 use BookStack\Users\Models\User;
 use Exception;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Hash;
 
 class LoginService
 {
@@ -71,7 +73,7 @@ public function reattemptLoginFor(User $user): void
         }
 
         $lastLoginDetails = $this->getLastLoginAttemptDetails();
-        $this->login($user, $lastLoginDetails['method'], $lastLoginDetails['remember'] ?? false);
+        $this->login($user, $lastLoginDetails['method'], $lastLoginDetails['remember']);
     }
 
     /**
@@ -126,7 +128,7 @@ protected function setLastLoginAttemptedForUser(User $user, string $method, bool
     /**
      * Clear the last login attempted session value.
      */
-    protected function clearLastLoginAttempted(): void
+    public function clearLastLoginAttempted(): void
     {
         session()->remove(self::LAST_LOGIN_ATTEMPTED_SESSION_KEY);
     }
@@ -171,10 +173,24 @@ public function attempt(array $credentials, string $method, bool $remember = fal
             } catch (LoginAttemptInvalidUserException $e) {
                 // Catch and return false for non-login accounts
                 // so it looks like a normal invalid login.
-                return false;
+                $result = false;
             }
         }
 
+        // Perform a dummy hash check to balance out the time of a login with an existing known user
+        // with that of a user not in the system (which we don't perform a hash check for in the above).
+        /** @var Authenticatable|null $lastAttempted */
+        $lastAttempted = auth()->getLastAttempted();
+        if (!$result && $lastAttempted === null) {
+            Hash::check($credentials['password'], '$2y$04$A.H9icXH4/lxLd9DHuaYqO/GVBd0OKetxyY0txmNfTAlPLVnTBx3y');
+        }
+
+        // Add some noise to request times on failed login attempts
+        if (!$result) {
+            $sleepMs = random_int(0, 250);
+            usleep($sleepMs * 1000);
+        }
+
         return $result;
     }
 
diff --git a/app/Access/Mfa/MfaSession.php b/app/Access/Mfa/MfaSession.php
index 09b9e53b8ae..b1285341257 100644
--- a/app/Access/Mfa/MfaSession.php
+++ b/app/Access/Mfa/MfaSession.php
@@ -11,7 +11,6 @@ class MfaSession
      */
     public function isRequiredForUser(User $user): bool
     {
-        // TODO - Test both these cases
         return $user->mfaValues()->exists() || $this->userRoleEnforcesMfa($user);
     }
 
diff --git a/app/Access/Mfa/MfaValue.php b/app/Access/Mfa/MfaValue.php
index 64d20eb18f6..b0f08e82684 100644
--- a/app/Access/Mfa/MfaValue.php
+++ b/app/Access/Mfa/MfaValue.php
@@ -4,6 +4,7 @@
 
 use BookStack\Users\Models\User;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -16,6 +17,8 @@
  */
 class MfaValue extends Model
 {
+    use HasFactory;
+
     protected static $unguarded = true;
 
     const METHOD_TOTP = 'totp';
@@ -45,17 +48,16 @@ public static function upsertWithValue(User $user, string $method, string $value
     }
 
     /**
-     * Easily get the decrypted MFA value for the given user and method.
+     * Get the decrypted MFA value for the given user and method.
      */
     public static function getValueForUser(User $user, string $method): ?string
     {
-        /** @var MfaValue $mfaVal */
         $mfaVal = static::query()
             ->where('user_id', '=', $user->id)
             ->where('method', '=', $method)
             ->first();
 
-        return $mfaVal ? $mfaVal->getValue() : null;
+        return $mfaVal?->getValue();
     }
 
     /**
diff --git a/app/Access/Mfa/MfaVerificationLimiter.php b/app/Access/Mfa/MfaVerificationLimiter.php
new file mode 100644
index 00000000000..3ff0adad43d
--- /dev/null
+++ b/app/Access/Mfa/MfaVerificationLimiter.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace BookStack\Access\Mfa;
+
+use BookStack\Exceptions\NotifyException;
+use BookStack\Users\Models\User;
+use Illuminate\Cache\RateLimiter;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+/**
+ * A rate limit specifically for MFA verification.
+ * Limits across both the attempted user (on a tight limit) and the
+ * request IP (on a less strict limit).
+ */
+class MfaVerificationLimiter
+{
+    protected int $maxUserAttemptsPerMinute = 5;
+    protected int $maxIpAttemptsPerMinute = 60;
+
+    public function __construct(
+        protected RateLimiter $rateLimiter
+    ) {
+    }
+
+    public function throwException(): never
+    {
+        throw new NotifyException(
+            trans('auth.mfa_throttle', ['seconds' => 60]),
+            '/login',
+            Response::HTTP_TOO_MANY_REQUESTS
+        );
+    }
+
+    public function incrementAttempts(User $user, Request $request): void
+    {
+        $this->rateLimiter->hit($this->getUserKey($user));
+        $this->rateLimiter->hit($this->getRequestKey($request));
+    }
+
+    public function decrementAttempts(User $user, Request $request): void
+    {
+        $this->rateLimiter->decrement($this->getUserKey($user));
+        $this->rateLimiter->decrement($this->getRequestKey($request));
+    }
+
+    public function hasHitLimit(User $user, Request $request): bool
+    {
+        return $this->rateLimiter->tooManyAttempts($this->getUserKey($user), $this->maxUserAttemptsPerMinute + 1)
+            || $this->rateLimiter->tooManyAttempts($this->getRequestKey($request), $this->maxIpAttemptsPerMinute + 1);
+    }
+
+    protected function getUserKey(User $user): string
+    {
+        return "mfa-attempt::user::{$user->id}";
+    }
+
+    protected function getRequestKey(Request $request): string
+    {
+        return "mfa-attempt::request::{$request->ip()}";
+    }
+}
diff --git a/app/Access/Mfa/TotpService.php b/app/Access/Mfa/TotpService.php
index 1d1af451ac5..f13637a3f17 100644
--- a/app/Access/Mfa/TotpService.php
+++ b/app/Access/Mfa/TotpService.php
@@ -14,10 +14,9 @@
 
 class TotpService
 {
-    protected $google2fa;
-
-    public function __construct(Google2FA $google2fa)
-    {
+    public function __construct(
+        protected Google2FA $google2fa
+    ) {
         $this->google2fa = $google2fa;
         // Use SHA1 as a default, Personal testing of other options in 2021 found
         // many apps lack support for other algorithms yet still will scan
@@ -35,7 +34,7 @@ public function generateSecret(): string
     }
 
     /**
-     * Generate a TOTP URL from secret key.
+     * Generate a TOTP URL from a secret key.
      */
     public function generateUrl(string $secret, User $user): string
     {
diff --git a/app/Access/Oidc/OidcJwtSigningKey.php b/app/Access/Oidc/OidcJwtSigningKey.php
index 3dab3e44275..3edba12b36f 100644
--- a/app/Access/Oidc/OidcJwtSigningKey.php
+++ b/app/Access/Oidc/OidcJwtSigningKey.php
@@ -9,10 +9,7 @@
 
 class OidcJwtSigningKey
 {
-    /**
-     * @var PublicKey
-     */
-    protected $key;
+    protected PublicKey $key;
 
     /**
      * Can be created either from a JWK parameter array or local file path to load a certificate from.
@@ -20,15 +17,13 @@ class OidcJwtSigningKey
      * 'file:///var/www/cert.pem'
      * ['kty' => 'RSA', 'alg' => 'RS256', 'n' => 'abc123...'].
      *
-     * @param array|string $jwkOrKeyPath
-     *
      * @throws OidcInvalidKeyException
      */
-    public function __construct($jwkOrKeyPath)
+    public function __construct(array|string $jwkOrKeyPath)
     {
         if (is_array($jwkOrKeyPath)) {
             $this->loadFromJwkArray($jwkOrKeyPath);
-        } elseif (is_string($jwkOrKeyPath) && strpos($jwkOrKeyPath, 'file://') === 0) {
+        } elseif (str_starts_with($jwkOrKeyPath, 'file://')) {
             $this->loadFromPath($jwkOrKeyPath);
         } else {
             throw new OidcInvalidKeyException('Unexpected type of key value provided');
@@ -38,7 +33,7 @@ public function __construct($jwkOrKeyPath)
     /**
      * @throws OidcInvalidKeyException
      */
-    protected function loadFromPath(string $path)
+    protected function loadFromPath(string $path): void
     {
         try {
             $key = PublicKeyLoader::load(
@@ -58,7 +53,7 @@ protected function loadFromPath(string $path)
     /**
      * @throws OidcInvalidKeyException
      */
-    protected function loadFromJwkArray(array $jwk)
+    protected function loadFromJwkArray(array $jwk): void
     {
         // 'alg' is optional for a JWK, but we will still attempt to validate if
         // it exists otherwise presume it will be compatible.
@@ -82,7 +77,7 @@ protected function loadFromJwkArray(array $jwk)
             throw new OidcInvalidKeyException('A "n" parameter on the provided key is expected');
         }
 
-        $n = strtr($jwk['n'] ?? '', '-_', '+/');
+        $n = strtr($jwk['n'], '-_', '+/');
 
         try {
             $key = PublicKeyLoader::load([
diff --git a/app/Access/Oidc/OidcJwtWithClaims.php b/app/Access/Oidc/OidcJwtWithClaims.php
index 06c04d81eb7..9763ab15864 100644
--- a/app/Access/Oidc/OidcJwtWithClaims.php
+++ b/app/Access/Oidc/OidcJwtWithClaims.php
@@ -102,12 +102,12 @@ public function replaceClaims(array $claims): void
     protected function validateTokenStructure(): void
     {
         foreach (['header', 'payload'] as $prop) {
-            if (empty($this->$prop) || !is_array($this->$prop)) {
+            if (empty($this->$prop)) {
                 throw new OidcInvalidTokenException("Could not parse out a valid {$prop} within the provided token");
             }
         }
 
-        if (empty($this->signature) || !is_string($this->signature)) {
+        if (empty($this->signature)) {
             throw new OidcInvalidTokenException('Could not parse out a valid signature within the provided token');
         }
     }
@@ -131,8 +131,6 @@ protected function validateTokenSignature(): void
             }
         }, $this->keys);
 
-        $parsedKeys = array_filter($parsedKeys);
-
         $contentToSign = $this->tokenParts[0] . '.' . $this->tokenParts[1];
         /** @var OidcJwtSigningKey $parsedKey */
         foreach ($parsedKeys as $parsedKey) {
diff --git a/app/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
index d6f6ef156e4..19120e2d3c3 100644
--- a/app/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -49,6 +49,11 @@ public function login(): array
         $url = $provider->getAuthorizationUrl();
         session()->put('oidc_pkce_code', $provider->getPkceCode() ?? '');
 
+        $returnUrl = Theme::dispatch(ThemeEvents::OIDC_AUTH_PRE_REDIRECT, $url);
+        if (is_string($returnUrl)) {
+            $url = $returnUrl;
+        }
+
         return [
             'url'   => $url,
             'state' => $provider->getState(),
@@ -75,6 +80,7 @@ public function processAuthorizeResponse(?string $authorizationCode): User
         $provider->setPkceCode($pkceCode);
 
         // Try to exchange authorization code for access token
+        /** @var OidcAccessToken $accessToken */
         $accessToken = $provider->getAccessToken('authorization_code', [
             'code' => $authorizationCode,
         ]);
diff --git a/app/Access/Oidc/OidcUserDetails.php b/app/Access/Oidc/OidcUserDetails.php
index 7a422a58de2..b1736f97d31 100644
--- a/app/Access/Oidc/OidcUserDetails.php
+++ b/app/Access/Oidc/OidcUserDetails.php
@@ -39,7 +39,7 @@ public function populate(
     ): void {
         $this->externalId = $claims->getClaim($idClaim) ?? $this->externalId;
         $this->email = $claims->getClaim('email') ?? $this->email;
-        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?? $this->name;
+        $this->name = static::getUserDisplayName($displayNameClaims, $claims) ?: $this->name;
         $this->groups = static::getUserGroups($groupsClaim, $claims) ?? $this->groups;
         $this->picture = static::getPicture($claims) ?: $this->picture;
     }
diff --git a/app/Access/RegistrationService.php b/app/Access/RegistrationService.php
index 68992fbc65c..e3ae9b2025c 100644
--- a/app/Access/RegistrationService.php
+++ b/app/Access/RegistrationService.php
@@ -52,9 +52,7 @@ protected function registrationAllowed(): bool
      */
     public function findOrRegister(string $name, string $email, string $externalId): User
     {
-        $user = User::query()
-            ->where('external_auth_id', '=', $externalId)
-            ->first();
+        $user = $this->userRepo->getByExternalAuthId($externalId);
 
         if (is_null($user)) {
             $userData = [
@@ -83,7 +81,7 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
         // Email restriction
         $this->ensureEmailDomainAllowed($userEmail);
 
-        // Ensure user does not already exist
+        // Ensure the user does not already exist
         $alreadyUser = !is_null($this->userRepo->getByEmail($userEmail));
         if ($alreadyUser) {
             throw new UserRegistrationException(trans('errors.error_user_exists_different_creds', ['email' => $userEmail]), '/login');
@@ -99,7 +97,7 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
         $newUser = $this->userRepo->createWithoutActivity($userData, $emailConfirmed);
         $newUser->attachDefaultRole();
 
-        // Assign social account if given
+        // Assign a social account if given
         if ($socialAccount) {
             $newUser->socialAccounts()->save($socialAccount);
         }
@@ -107,7 +105,7 @@ public function registerUser(array $userData, ?SocialAccount $socialAccount = nu
         Activity::add(ActivityType::AUTH_REGISTER, $socialAccount ?? $newUser);
         Theme::dispatch(ThemeEvents::AUTH_REGISTER, $authSystem, $newUser);
 
-        // Start email confirmation flow if required
+        // Start the email confirmation flow if required
         if ($this->emailConfirmationService->confirmationRequired() && !$emailConfirmed) {
             $newUser->save();
 
diff --git a/app/Access/Saml2Service.php b/app/Access/Saml2Service.php
index 106a7a22906..5572d210401 100644
--- a/app/Access/Saml2Service.php
+++ b/app/Access/Saml2Service.php
@@ -266,7 +266,7 @@ protected function getExternalId(array $samlAttributes, string $defaultValue)
     /**
      * Extract the details of a user from a SAML response.
      *
-     * @return array{external_id: string, name: string, email: string, saml_id: string}
+     * @return array{external_id: string, name: string, email: string|null, saml_id: string}
      */
     protected function getUserDetails(string $samlID, $samlAttributes): array
     {
@@ -357,7 +357,7 @@ public function processLoginCallback(string $samlID, array $samlAttributes): Use
             ]);
         }
 
-        if ($userDetails['email'] === null) {
+        if (empty($userDetails['email'])) {
             throw new SamlException(trans('errors.saml_no_email_address'));
         }
 
diff --git a/app/Access/SocialAccount.php b/app/Access/SocialAccount.php
index b76dbb9ec85..f52f74cc48c 100644
--- a/app/Access/SocialAccount.php
+++ b/app/Access/SocialAccount.php
@@ -5,18 +5,23 @@
 use BookStack\Activity\Models\Loggable;
 use BookStack\App\Model;
 use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class SocialAccount.
- *
  * @property string $driver
  * @property User   $user
  */
 class SocialAccount extends Model implements Loggable
 {
-    protected $fillable = ['user_id', 'driver', 'driver_id', 'timestamps'];
+    use HasFactory;
 
-    public function user()
+    protected $fillable = ['user_id', 'driver', 'driver_id'];
+
+    /**
+     * @return BelongsTo<User, $this>
+     */
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
diff --git a/app/Access/SocialAuthService.php b/app/Access/SocialAuthService.php
index c3c20587db3..faaa9960157 100644
--- a/app/Access/SocialAuthService.php
+++ b/app/Access/SocialAuthService.php
@@ -55,8 +55,10 @@ public function startRegister(string $socialDriver): RedirectResponse
      */
     public function handleRegistrationCallback(string $socialDriver, SocialUser $socialUser): SocialUser
     {
+        $socialDriver = trim(strtolower($socialDriver));
+
         // Check social account has not already been used
-        if (SocialAccount::query()->where('driver_id', '=', $socialUser->getId())->exists()) {
+        if ($this->getSocialAccountById($socialDriver, $socialUser->getId())) {
             throw new UserRegistrationException(trans('errors.social_account_in_use', ['socialAccount' => $socialDriver]), '/login');
         }
 
@@ -69,6 +71,19 @@ public function handleRegistrationCallback(string $socialDriver, SocialUser $soc
         return $socialUser;
     }
 
+    /**
+     * Get an existing social account by its ID.
+     */
+    protected function getSocialAccountById(string $socialDriver, string $socialId): SocialAccount|null
+    {
+        $socialDriver = trim(strtolower($socialDriver));
+
+        return SocialAccount::query()
+            ->where('driver', '=', $socialDriver)
+            ->where('driver_id', '=', $socialId)
+            ->first();
+    }
+
     /**
      * Get the social user details via the social driver.
      *
@@ -93,7 +108,7 @@ public function handleLoginCallback(string $socialDriver, SocialUser $socialUser
         $socialId = $socialUser->getId();
 
         // Get any attached social accounts or users
-        $socialAccount = SocialAccount::query()->where('driver_id', '=', $socialId)->first();
+        $socialAccount = $this->getSocialAccountById($socialDriver, $socialId);
         $isLoggedIn = auth()->check();
         $currentUser = user();
         $titleCaseDriver = Str::title($socialDriver);
@@ -117,14 +132,14 @@ public function handleLoginCallback(string $socialDriver, SocialUser $socialUser
         }
 
         // When a user is logged in and the social account exists and is already linked to the current user.
-        if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id === $currentUser->id) {
+        if ($isLoggedIn && $socialAccount->user->id === $currentUser->id) {
             session()->flash('error', trans('errors.social_account_existing', ['socialAccount' => $titleCaseDriver]));
 
             return redirect('/my-account/auth#social_accounts');
         }
 
         // When a user is logged in, A social account exists but the users do not match.
-        if ($isLoggedIn && $socialAccount !== null && $socialAccount->user->id != $currentUser->id) {
+        if ($isLoggedIn && $socialAccount->user->id != $currentUser->id) {
             session()->flash('error', trans('errors.social_account_already_used_existing', ['socialAccount' => $titleCaseDriver]));
 
             return redirect('/my-account/auth#social_accounts');
@@ -153,7 +168,7 @@ public function drivers(): SocialDriverManager
     public function newSocialAccount(string $socialDriver, SocialUser $socialUser): SocialAccount
     {
         return new SocialAccount([
-            'driver'    => $socialDriver,
+            'driver'    => trim(strtolower($socialDriver)),
             'driver_id' => $socialUser->getId(),
             'avatar'    => $socialUser->getAvatar(),
         ]);
@@ -164,6 +179,7 @@ public function newSocialAccount(string $socialDriver, SocialUser $socialUser):
      */
     public function detachSocialAccount(string $socialDriver): void
     {
+        $socialDriver = trim(strtolower($socialDriver));
         user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
     }
 
diff --git a/app/Activity/ActivityQueries.php b/app/Activity/ActivityQueries.php
index d5b047937fb..a3383e80933 100644
--- a/app/Activity/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -11,6 +11,7 @@
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
@@ -27,6 +28,7 @@ public function __construct(
      */
     public function latest(int $count = 20, int $page = 0): array
     {
+        /** @var Collection<int, Activity> $activityList */
         $activityList = $this->permissions
             ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
@@ -83,6 +85,7 @@ public function entityActivity(Entity $entity, int $count = 20, int $page = 1):
      */
     public function userActivity(User $user, int $count = 20, int $page = 0): array
     {
+        /** @var Collection<int, Activity> $activityList */
         $activityList = $this->permissions
             ->restrictEntityRelationQuery(Activity::query(), 'activities', 'loggable_id', 'loggable_type')
             ->orderBy('created_at', 'desc')
diff --git a/app/Activity/ActivityType.php b/app/Activity/ActivityType.php
index a7f129f71d4..64532de175c 100644
--- a/app/Activity/ActivityType.php
+++ b/app/Activity/ActivityType.php
@@ -46,6 +46,7 @@ class ActivityType
     const USER_CREATE = 'user_create';
     const USER_UPDATE = 'user_update';
     const USER_DELETE = 'user_delete';
+    const USER_MFA_RESET = 'user_mfa_reset';
 
     const API_TOKEN_CREATE = 'api_token_create';
     const API_TOKEN_UPDATE = 'api_token_update';
diff --git a/app/Activity/CommentRepo.php b/app/Activity/CommentRepo.php
index 7005f8fcf83..1802e390585 100644
--- a/app/Activity/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -4,10 +4,11 @@
 
 use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\NotifyException;
-use BookStack\Exceptions\PrettyException;
 use BookStack\Facades\Activity as ActivityService;
 use BookStack\Util\HtmlDescriptionFilter;
+use Illuminate\Database\Eloquent\Builder;
 
 class CommentRepo
 {
@@ -19,11 +20,46 @@ public function getById(int $id): Comment
         return Comment::query()->findOrFail($id);
     }
 
+    /**
+     * Get a comment by ID, ensuring it is visible to the user based upon access to the page
+     * which the comment is attached to.
+     */
+    public function getVisibleById(int $id): Comment
+    {
+        return $this->getQueryForVisible()->findOrFail($id);
+    }
+
+    /**
+     * Start a query for comments visible to the user.
+     * @return Builder<Comment>
+     */
+    public function getQueryForVisible(): Builder
+    {
+        return Comment::query()->scopes('visible');
+    }
+
     /**
      * Create a new comment on an entity.
      */
     public function create(Entity $entity, string $html, ?int $parentId, string $contentRef): Comment
     {
+        // Prevent comments being added to draft pages
+        if ($entity instanceof Page && $entity->draft) {
+            throw new \Exception(trans('errors.cannot_add_comment_to_draft'));
+        }
+
+        // Validate parent ID
+        if ($parentId !== null) {
+            $parentCommentExists = Comment::query()
+                ->where('commentable_id', '=', $entity->id)
+                ->where('commentable_type', '=', $entity->getMorphClass())
+                ->where('local_id', '=', $parentId)
+                ->exists();
+            if (!$parentCommentExists) {
+                $parentId = null;
+            }
+        }
+
         $userId = user()->id;
         $comment = new Comment();
 
@@ -38,6 +74,7 @@ public function create(Entity $entity, string $html, ?int $parentId, string $con
         ActivityService::add(ActivityType::COMMENT_CREATE, $comment);
         ActivityService::add(ActivityType::COMMENTED_ON, $entity);
 
+        $comment->refresh()->unsetRelations();
         return $comment;
     }
 
@@ -59,7 +96,7 @@ public function update(Comment $comment, string $html): Comment
     /**
      * Archive an existing comment.
      */
-    public function archive(Comment $comment): Comment
+    public function archive(Comment $comment, bool $log = true): Comment
     {
         if ($comment->parent_id) {
             throw new NotifyException('Only top-level comments can be archived.', '/', 400);
@@ -68,7 +105,9 @@ public function archive(Comment $comment): Comment
         $comment->archived = true;
         $comment->save();
 
-        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+        if ($log) {
+            ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+        }
 
         return $comment;
     }
@@ -76,7 +115,7 @@ public function archive(Comment $comment): Comment
     /**
      * Un-archive an existing comment.
      */
-    public function unarchive(Comment $comment): Comment
+    public function unarchive(Comment $comment, bool $log = true): Comment
     {
         if ($comment->parent_id) {
             throw new NotifyException('Only top-level comments can be un-archived.', '/', 400);
@@ -85,7 +124,9 @@ public function unarchive(Comment $comment): Comment
         $comment->archived = false;
         $comment->save();
 
-        ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+        if ($log) {
+            ActivityService::add(ActivityType::COMMENT_UPDATE, $comment);
+        }
 
         return $comment;
     }
diff --git a/app/Activity/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.php
index c4f9b91edb8..ed1421c0d01 100644
--- a/app/Activity/Controllers/AuditLogController.php
+++ b/app/Activity/Controllers/AuditLogController.php
@@ -17,19 +17,19 @@ public function index(Request $request)
         $this->checkPermission(Permission::SettingsManage);
         $this->checkPermission(Permission::UsersManage);
 
-        $sort = $request->get('sort', 'activity_date');
-        $order = $request->get('order', 'desc');
+        $sort = $request->input('sort', 'activity_date');
+        $order = $request->input('order', 'desc');
         $listOptions = (new SimpleListOptions('', $sort, $order))->withSortOptions([
             'created_at' => trans('settings.audit_table_date'),
             'type' => trans('settings.audit_table_event'),
         ]);
 
         $filters = [
-            'event'     => $request->get('event', ''),
-            'date_from' => $request->get('date_from', ''),
-            'date_to'   => $request->get('date_to', ''),
-            'user'      => $request->get('user', ''),
-            'ip'        => $request->get('ip', ''),
+            'event'     => $request->input('event', ''),
+            'date_from' => $request->input('date_from', ''),
+            'date_to'   => $request->input('date_to', ''),
+            'user'      => $request->input('user', ''),
+            'ip'        => $request->input('ip', ''),
         ];
 
         $query = Activity::query()
diff --git a/app/Activity/Controllers/CommentApiController.php b/app/Activity/Controllers/CommentApiController.php
new file mode 100644
index 00000000000..6c60de9da52
--- /dev/null
+++ b/app/Activity/Controllers/CommentApiController.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BookStack\Activity\Controllers;
+
+use BookStack\Activity\CommentRepo;
+use BookStack\Activity\Models\Comment;
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\Http\ApiController;
+use BookStack\Permissions\Permission;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+/**
+ * The comment data model has a 'local_id' property, which is a unique integer ID
+ * scoped to the page which the comment is on. The 'parent_id' is used for replies
+ * and refers to the 'local_id' of the parent comment on the same page, not the main
+ * globally unique 'id'.
+ *
+ * If you want to get all comments for a page in a tree-like structure, as reflected in
+ * the UI, then that is provided on pages-read API responses.
+ */
+class CommentApiController extends ApiController
+{
+    protected array $rules = [
+        'create' => [
+            'page_id' => ['required', 'integer'],
+            'reply_to' => ['nullable', 'integer'],
+            'html' => ['required', 'string'],
+            'content_ref' => ['string'],
+        ],
+        'update' => [
+            'html' => ['string'],
+            'archived' => ['boolean'],
+        ]
+    ];
+
+    public function __construct(
+        protected CommentRepo $commentRepo,
+        protected PageQueries $pageQueries,
+    ) {
+    }
+
+    /**
+     * Get a listing of comments visible to the user.
+     */
+    public function list(): JsonResponse
+    {
+        $query = $this->commentRepo->getQueryForVisible();
+
+        return $this->apiListingResponse($query, [
+            'id', 'commentable_id', 'commentable_type', 'parent_id', 'local_id', 'content_ref', 'created_by', 'updated_by', 'created_at', 'updated_at'
+        ]);
+    }
+
+    /**
+     * Create a new comment on a page.
+     * If commenting as a reply to an existing comment, the 'reply_to' parameter
+     * should be provided, set to the 'local_id' of the comment being replied to.
+     */
+    public function create(Request $request): JsonResponse
+    {
+        $this->checkPermission(Permission::CommentCreateAll);
+
+        $input = $this->validate($request, $this->rules()['create']);
+        $page = $this->pageQueries->findVisibleByIdOrFail($input['page_id']);
+
+        $comment = $this->commentRepo->create(
+            $page,
+            $input['html'],
+            $input['reply_to'] ?? null,
+            $input['content_ref'] ?? '',
+        );
+
+        return response()->json($comment);
+    }
+
+    /**
+     * Read the details of a single comment, along with its direct replies.
+     */
+    public function read(string $id): JsonResponse
+    {
+        $comment = $this->commentRepo->getVisibleById(intval($id));
+        $comment->load('createdBy', 'updatedBy');
+
+        $replies = $this->commentRepo->getQueryForVisible()
+            ->where('parent_id', '=', $comment->local_id)
+            ->where('commentable_id', '=', $comment->commentable_id)
+            ->where('commentable_type', '=', $comment->commentable_type)
+            ->get();
+
+        /** @var Comment[] $toProcess */
+        $toProcess = [$comment, ...$replies];
+        foreach ($toProcess as $commentToProcess) {
+            $commentToProcess->setAttribute('html', $commentToProcess->safeHtml());
+            $commentToProcess->makeVisible('html');
+        }
+
+        $comment->setRelation('replies', $replies);
+
+        return response()->json($comment);
+    }
+
+
+    /**
+     * Update the content or archived status of an existing comment.
+     *
+     * Only provide a new archived status if needing to actively change the archive state.
+     * Only top-level comments (non-replies) can be archived or unarchived.
+     */
+    public function update(Request $request, string $id): JsonResponse
+    {
+        $comment = $this->commentRepo->getVisibleById(intval($id));
+        $this->checkOwnablePermission(Permission::CommentUpdate, $comment);
+
+        $input = $this->validate($request, $this->rules()['update']);
+        $hasHtml = isset($input['html']);
+
+        if (isset($input['archived'])) {
+            if ($input['archived']) {
+                $this->commentRepo->archive($comment, !$hasHtml);
+            } else {
+                $this->commentRepo->unarchive($comment, !$hasHtml);
+            }
+        }
+
+        if ($hasHtml) {
+            $comment = $this->commentRepo->update($comment, $input['html']);
+        }
+
+        return response()->json($comment);
+    }
+
+    /**
+     * Delete a single comment from the system.
+     */
+    public function delete(string $id): Response
+    {
+        $comment = $this->commentRepo->getVisibleById(intval($id));
+        $this->checkOwnablePermission(Permission::CommentDelete, $comment);
+
+        $this->commentRepo->delete($comment);
+
+        return response('', 204);
+    }
+}
diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index fd5463dff18..8474d9eb1c7 100644
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -22,7 +22,7 @@ public function __construct(
     /**
      * Save a new comment for a Page.
      *
-     * @throws ValidationException
+     * @throws ValidationException|\Exception
      */
     public function savePageComment(Request $request, int $pageId)
     {
@@ -37,11 +37,6 @@ public function savePageComment(Request $request, int $pageId)
             return response('Not found', 404);
         }
 
-        // Prevent adding comments to draft pages
-        if ($page->draft) {
-            return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);
-        }
-
         // Create a new comment.
         $this->checkPermission(Permission::CommentCreateAll);
         $contentRef = $input['content_ref'] ?? '';
@@ -64,8 +59,7 @@ public function update(Request $request, int $commentId)
             'html' => ['required', 'string'],
         ]);
 
-        $comment = $this->commentRepo->getById($commentId);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        $comment = $this->commentRepo->getVisibleById($commentId);
         $this->checkOwnablePermission(Permission::CommentUpdate, $comment);
 
         $comment = $this->commentRepo->update($comment, $input['html']);
@@ -81,8 +75,7 @@ public function update(Request $request, int $commentId)
      */
     public function archive(int $id)
     {
-        $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        $comment = $this->commentRepo->getVisibleById($id);
         if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
             $this->showPermissionError();
         }
@@ -101,8 +94,7 @@ public function archive(int $id)
      */
     public function unarchive(int $id)
     {
-        $comment = $this->commentRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $comment->entity);
+        $comment = $this->commentRepo->getVisibleById($id);
         if (!userCan(Permission::CommentUpdate, $comment) && !userCan(Permission::CommentDelete, $comment)) {
             $this->showPermissionError();
         }
@@ -121,7 +113,7 @@ public function unarchive(int $id)
      */
     public function destroy(int $id)
     {
-        $comment = $this->commentRepo->getById($id);
+        $comment = $this->commentRepo->getVisibleById($id);
         $this->checkOwnablePermission(Permission::CommentDelete, $comment);
 
         $this->commentRepo->delete($comment);
diff --git a/app/Activity/Controllers/FavouriteController.php b/app/Activity/Controllers/FavouriteController.php
index deeb4b0afb4..65bae276d28 100644
--- a/app/Activity/Controllers/FavouriteController.php
+++ b/app/Activity/Controllers/FavouriteController.php
@@ -20,7 +20,7 @@ public function __construct(
     public function index(Request $request, QueryTopFavourites $topFavourites)
     {
         $viewCount = 20;
-        $page = intval($request->get('page', 1));
+        $page = intval($request->input('page', 1));
         $favourites = $topFavourites->run($viewCount + 1, (($page - 1) * $viewCount));
 
         $hasMoreLink = ($favourites->count() > $viewCount) ? url('/favourites?page=' . ($page + 1)) : null;
diff --git a/app/Activity/Controllers/TagApiController.php b/app/Activity/Controllers/TagApiController.php
new file mode 100644
index 00000000000..f5c5e95d420
--- /dev/null
+++ b/app/Activity/Controllers/TagApiController.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BookStack\Activity\Controllers;
+
+use BookStack\Activity\TagRepo;
+use BookStack\Http\ApiController;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+/**
+ * Endpoints to query data about tags in the system.
+ * You'll only see results based on tags applied to content you have access to.
+ * There are no general create/update/delete endpoints here since tags do not exist
+ * by themselves, they are managed via the items they are assigned to.
+ */
+class TagApiController extends ApiController
+{
+    public function __construct(
+        protected TagRepo $tagRepo,
+    ) {
+    }
+
+    protected function rules(): array
+    {
+        return [
+            'listValues' => [
+                'name' => ['required', 'string'],
+            ],
+        ];
+    }
+
+    /**
+     * Get a list of tag names used in the system.
+     * Only the name field can be used in filters.
+     */
+    public function listNames(): JsonResponse
+    {
+        $tagQuery = $this->tagRepo
+            ->queryWithTotalsForApi('');
+
+        return $this->apiListingResponse($tagQuery, [
+            'name', 'values', 'usages', 'page_count', 'chapter_count', 'book_count', 'shelf_count',
+        ], [], [
+            'name'
+        ]);
+    }
+
+    /**
+     * Get a list of tag values, which have been set for the given tag name,
+     * which must be provided as a query parameter on the request.
+     * Only the value field can be used in filters.
+     */
+    public function listValues(Request $request): JsonResponse
+    {
+        $data = $this->validate($request, $this->rules()['listValues']);
+        $name = $data['name'];
+
+        $tagQuery = $this->tagRepo->queryWithTotalsForApi($name);
+
+        return $this->apiListingResponse($tagQuery, [
+            'name', 'value', 'usages', 'page_count', 'chapter_count', 'book_count', 'shelf_count',
+        ], [], [
+            'value',
+        ]);
+    }
+}
diff --git a/app/Activity/Controllers/TagController.php b/app/Activity/Controllers/TagController.php
index 0af8835ca77..b57c798254a 100644
--- a/app/Activity/Controllers/TagController.php
+++ b/app/Activity/Controllers/TagController.php
@@ -24,9 +24,9 @@ public function index(Request $request)
             'usages' => trans('entities.tags_usages'),
         ]);
 
-        $nameFilter = $request->get('name', '');
+        $nameFilter = $request->input('name', '');
         $tags = $this->tagRepo
-            ->queryWithTotals($listOptions, $nameFilter)
+            ->queryWithTotalsForList($listOptions, $nameFilter)
             ->paginate(50)
             ->appends(array_filter(array_merge($listOptions->getPaginationAppends(), [
                 'name'   => $nameFilter,
@@ -46,7 +46,7 @@ public function index(Request $request)
      */
     public function getNameSuggestions(Request $request)
     {
-        $searchTerm = $request->get('search', '');
+        $searchTerm = $request->input('search', '');
         $suggestions = $this->tagRepo->getNameSuggestions($searchTerm);
 
         return response()->json($suggestions);
@@ -57,8 +57,8 @@ public function getNameSuggestions(Request $request)
      */
     public function getValueSuggestions(Request $request)
     {
-        $searchTerm = $request->get('search', '');
-        $tagName = $request->get('name', '');
+        $searchTerm = $request->input('search', '');
+        $tagName = $request->input('name', '');
         $suggestions = $this->tagRepo->getValueSuggestions($searchTerm, $tagName);
 
         return response()->json($suggestions);
diff --git a/app/Activity/Models/Activity.php b/app/Activity/Models/Activity.php
index ac9fec5178b..898a6c93a09 100644
--- a/app/Activity/Models/Activity.php
+++ b/app/Activity/Models/Activity.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -24,6 +25,8 @@
  */
 class Activity extends Model
 {
+    use HasFactory;
+
     /**
      * Get the loggable model related to this activity.
      * Currently only used for entities (previously entity_[id/type] columns).
diff --git a/app/Activity/Models/Comment.php b/app/Activity/Models/Comment.php
index 0cb83d61e8d..b49eb456488 100644
--- a/app/Activity/Models/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -3,22 +3,27 @@
 namespace BookStack\Activity\Models;
 
 use BookStack\App\Model;
+use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\PermissionApplicator;
 use BookStack\Users\Models\HasCreatorAndUpdater;
 use BookStack\Users\Models\OwnableInterface;
-use BookStack\Users\Models\User;
 use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
+use BookStack\Util\HtmlToPlainText;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
  * @property int      $id
- * @property string   $text - Deprecated & now unused (#4821)
  * @property string   $html
  * @property int|null $parent_id  - Relates to local_id, not id
  * @property int      $local_id
- * @property string   $entity_type
- * @property int      $entity_id
+ * @property string   $commentable_type
+ * @property int      $commentable_id
  * @property string   $content_ref
  * @property bool     $archived
  */
@@ -28,13 +33,35 @@ class Comment extends Model implements Loggable, OwnableInterface
     use HasCreatorAndUpdater;
 
     protected $fillable = ['parent_id'];
+    protected $hidden = ['html'];
+
+    protected $casts = [
+        'archived' => 'boolean',
+    ];
 
     /**
      * Get the entity that this comment belongs to.
+     * It's only pages right now hence the typing below.
+     * Would need a deeper audit if that changes as many areas assume this is always a page.
+     * @return MorphTo<Page, $this>
      */
     public function entity(): MorphTo
     {
-        return $this->morphTo('entity');
+        // We specifically define null here to avoid the different name (commentable)
+        // being used by Laravel eager loading instead of the method name, which it was doing
+        // in some scenarios like when deserialized when going through the queue system.
+        // So we instead specify the type and id column names to use.
+        // Related to:
+        // https://github.com/laravel/framework/pull/24815
+        // https://github.com/laravel/framework/issues/27342
+        // https://github.com/laravel/framework/issues/47953
+        // (and probably more)
+
+        // Ultimately, we could just align the method name to 'commentable' but that would be a potential
+        // breaking change and not really worthwhile in a patch due to the risk of creating extra problems.
+        /** @var MorphTo<Page, $this> $relation */
+        $relation = $this->morphTo(null, 'commentable_type', 'commentable_id');
+        return $relation;
     }
 
     /**
@@ -44,8 +71,8 @@ public function entity(): MorphTo
     public function parent(): BelongsTo
     {
         return $this->belongsTo(Comment::class, 'parent_id', 'local_id', 'parent')
-            ->where('entity_type', '=', $this->entity_type)
-            ->where('entity_id', '=', $this->entity_id);
+            ->where('commentable_type', '=', $this->commentable_type)
+            ->where('commentable_id', '=', $this->commentable_id);
     }
 
     /**
@@ -58,11 +85,34 @@ public function isUpdated(): bool
 
     public function logDescriptor(): string
     {
-        return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->entity_type} (ID: {$this->entity_id})";
+        return "Comment #{$this->local_id} (ID: {$this->id}) for {$this->commentable_type} (ID: {$this->commentable_id})";
     }
 
     public function safeHtml(): string
     {
-        return HtmlContentFilter::removeScriptsFromHtmlString($this->html ?? '');
+        $filter = new HtmlContentFilter(new HtmlContentFilterConfig());
+        return $filter->filterString($this->html ?? '');
+    }
+
+    public function getPlainText(): string
+    {
+        $converter = new HtmlToPlainText();
+        return $converter->convert($this->html ?? '');
+    }
+
+    public function jointPermissions(): HasMany
+    {
+        return $this->hasMany(JointPermission::class, 'entity_id', 'commentable_id')
+            ->whereColumn('joint_permissions.entity_type', '=', 'comments.commentable_type');
+    }
+
+    /**
+     * Scope the query to just the comments visible to the user based upon the
+     * user visibility of what has been commented on.
+     */
+    public function scopeVisible(Builder $query): Builder
+    {
+        return app()->make(PermissionApplicator::class)
+            ->restrictEntityRelationQuery($query, 'comments', 'commentable_id', 'commentable_type');
     }
 }
diff --git a/app/Activity/Models/Favourite.php b/app/Activity/Models/Favourite.php
index 6f6079b0766..6b5e97deeee 100644
--- a/app/Activity/Models/Favourite.php
+++ b/app/Activity/Models/Favourite.php
@@ -4,11 +4,14 @@
 
 use BookStack\App\Model;
 use BookStack\Permissions\Models\JointPermission;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Favourite extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['user_id'];
 
     /**
diff --git a/app/Activity/Models/MentionHistory.php b/app/Activity/Models/MentionHistory.php
new file mode 100644
index 00000000000..7386a4d742b
--- /dev/null
+++ b/app/Activity/Models/MentionHistory.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BookStack\Activity\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property int $id
+ * @property string $mentionable_type
+ * @property int $mentionable_id
+ * @property int $from_user_id
+ * @property int $to_user_id
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
+class MentionHistory extends Model
+{
+    protected $table = 'mention_history';
+}
diff --git a/app/Activity/Models/Watch.php b/app/Activity/Models/Watch.php
index dfb72cc0a36..b088bd72458 100644
--- a/app/Activity/Models/Watch.php
+++ b/app/Activity/Models/Watch.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\WatchLevels;
 use BookStack\Permissions\Models\JointPermission;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -20,6 +21,8 @@
  */
 class Watch extends Model
 {
+    use HasFactory;
+
     protected $guarded = [];
 
     public function watchable(): MorphTo
diff --git a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
index bc6f2e22fc0..efa46b0d6ff 100644
--- a/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/BaseNotificationHandler.php
@@ -20,6 +20,7 @@ protected function sendNotificationToUserIds(string $notification, array $userId
     {
         $users = User::query()->whereIn('id', array_unique($userIds))->get();
 
+        /** @var User $user */
         foreach ($users as $user) {
             // Prevent sending to the user that initiated the activity
             if ($user->id === $initiator->id) {
diff --git a/app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php b/app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php
index bc12c85669f..daacfba5679 100644
--- a/app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php
@@ -27,7 +27,7 @@ public function handle(Activity $activity, Loggable|string $detail, User $user):
         $watcherIds = $watchers->getWatcherUserIds();
 
         // Page owner if user preferences allow
-        if (!$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
+        if ($page->owned_by && !$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
             $userNotificationPrefs = new UserNotificationPreferences($page->ownedBy);
             if ($userNotificationPrefs->notifyOnOwnPageComments()) {
                 $watcherIds[] = $page->owned_by;
@@ -36,7 +36,7 @@ public function handle(Activity $activity, Loggable|string $detail, User $user):
 
         // Parent comment creator if preferences allow
         $parentComment = $detail->parent()->first();
-        if ($parentComment && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
+        if ($parentComment && $parentComment->created_by && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
             $parentCommenterNotificationsPrefs = new UserNotificationPreferences($parentComment->createdBy);
             if ($parentCommenterNotificationsPrefs->notifyOnCommentReplies()) {
                 $watcherIds[] = $parentComment->created_by;
diff --git a/app/Activity/Notifications/Handlers/CommentMentionNotificationHandler.php b/app/Activity/Notifications/Handlers/CommentMentionNotificationHandler.php
new file mode 100644
index 00000000000..50c8cb8ab59
--- /dev/null
+++ b/app/Activity/Notifications/Handlers/CommentMentionNotificationHandler.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace BookStack\Activity\Notifications\Handlers;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Activity;
+use BookStack\Activity\Models\Comment;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Activity\Models\MentionHistory;
+use BookStack\Activity\Notifications\Messages\CommentMentionNotification;
+use BookStack\Activity\Tools\MentionParser;
+use BookStack\Entities\Models\Page;
+use BookStack\Settings\UserNotificationPreferences;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
+
+class CommentMentionNotificationHandler extends BaseNotificationHandler
+{
+    public function handle(Activity $activity, Loggable|string $detail, User $user): void
+    {
+        if (!($detail instanceof Comment) || !($detail->entity instanceof Page)) {
+            throw new \InvalidArgumentException("Detail for comment mention notifications must be a comment on a page");
+        }
+
+        /** @var Page $page */
+        $page = $detail->entity;
+
+        $parser = new MentionParser();
+        $mentionedUserIds = $parser->parseUserIdsFromHtml($detail->html);
+        $realMentionedUsers = User::whereIn('id', $mentionedUserIds)->get();
+
+        $receivingNotifications = $realMentionedUsers->filter(function (User $user) {
+            $prefs = new UserNotificationPreferences($user);
+            return $prefs->notifyOnCommentMentions();
+        });
+        $receivingNotificationsUserIds = $receivingNotifications->pluck('id')->toArray();
+
+        $userMentionsToLog = $realMentionedUsers;
+
+        // When an edit, we check our history to see if we've already notified the user about this comment before
+        // so that we can filter them out to avoid double notifications.
+        if ($activity->type === ActivityType::COMMENT_UPDATE) {
+            $previouslyNotifiedUserIds = $this->getPreviouslyNotifiedUserIds($detail);
+            $receivingNotificationsUserIds = array_values(array_diff($receivingNotificationsUserIds, $previouslyNotifiedUserIds));
+            $userMentionsToLog = $userMentionsToLog->filter(function (User $user) use ($previouslyNotifiedUserIds) {
+                return !in_array($user->id, $previouslyNotifiedUserIds);
+            });
+        }
+
+        $this->logMentions($userMentionsToLog, $detail, $user);
+        $this->sendNotificationToUserIds(CommentMentionNotification::class, $receivingNotificationsUserIds, $user, $detail, $page);
+    }
+
+    /**
+     * @param Collection<User> $mentionedUsers
+     */
+    protected function logMentions(Collection $mentionedUsers, Comment $comment, User $fromUser): void
+    {
+        $mentions = [];
+        $now = Carbon::now();
+
+        foreach ($mentionedUsers as $mentionedUser) {
+            $mentions[] = [
+                'mentionable_type' => $comment->getMorphClass(),
+                'mentionable_id' => $comment->id,
+                'from_user_id' => $fromUser->id,
+                'to_user_id' => $mentionedUser->id,
+                'created_at' => $now,
+                'updated_at' => $now,
+            ];
+        }
+
+        MentionHistory::query()->insert($mentions);
+    }
+
+    protected function getPreviouslyNotifiedUserIds(Comment $comment): array
+    {
+        return MentionHistory::query()
+            ->where('mentionable_id', $comment->id)
+            ->where('mentionable_type', $comment->getMorphClass())
+            ->pluck('to_user_id')
+            ->toArray();
+    }
+}
diff --git a/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php b/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
index 20dc0fc4d8e..c9489d70e63 100644
--- a/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
+++ b/app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
@@ -39,8 +39,8 @@ public function handle(Activity $activity, Loggable|string $detail, User $user):
         $watchers = new EntityWatchers($detail, WatchLevels::UPDATES);
         $watcherIds = $watchers->getWatcherUserIds();
 
-        // Add page owner if preferences allow
-        if (!$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
+        // Add the page owner if preferences allow
+        if ($detail->owned_by && !$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
             $userNotificationPrefs = new UserNotificationPreferences($detail->ownedBy);
             if ($userNotificationPrefs->notifyOnOwnPageChanges()) {
                 $watcherIds[] = $detail->owned_by;
diff --git a/app/Activity/Notifications/Messages/CommentCreationNotification.php b/app/Activity/Notifications/Messages/CommentCreationNotification.php
index 30d0ffa2be4..d739f4aabbf 100644
--- a/app/Activity/Notifications/Messages/CommentCreationNotification.php
+++ b/app/Activity/Notifications/Messages/CommentCreationNotification.php
@@ -24,7 +24,7 @@ public function toMail(User $notifiable): MailMessage
             $locale->trans('notifications.detail_page_name') => new EntityLinkMessageLine($page),
             $locale->trans('notifications.detail_page_path') => $this->buildPagePathLine($page, $notifiable),
             $locale->trans('notifications.detail_commenter') => $this->user->name,
-            $locale->trans('notifications.detail_comment') => strip_tags($comment->html),
+            $locale->trans('notifications.detail_comment') => $comment->getPlainText(),
         ]);
 
         return $this->newMailMessage($locale)
diff --git a/app/Activity/Notifications/Messages/CommentMentionNotification.php b/app/Activity/Notifications/Messages/CommentMentionNotification.php
new file mode 100644
index 00000000000..4c8ee5bab8b
--- /dev/null
+++ b/app/Activity/Notifications/Messages/CommentMentionNotification.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace BookStack\Activity\Notifications\Messages;
+
+use BookStack\Activity\Models\Comment;
+use BookStack\Activity\Notifications\MessageParts\EntityLinkMessageLine;
+use BookStack\Activity\Notifications\MessageParts\ListMessageLine;
+use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class CommentMentionNotification extends BaseActivityNotification
+{
+    public function toMail(User $notifiable): MailMessage
+    {
+        /** @var Comment $comment */
+        $comment = $this->detail;
+        /** @var Page $page */
+        $page = $comment->entity;
+
+        $locale = $notifiable->getLocale();
+
+        $listLines = array_filter([
+            $locale->trans('notifications.detail_page_name') => new EntityLinkMessageLine($page),
+            $locale->trans('notifications.detail_page_path') => $this->buildPagePathLine($page, $notifiable),
+            $locale->trans('notifications.detail_commenter') => $this->user->name,
+            $locale->trans('notifications.detail_comment') => $comment->getPlainText(),
+        ]);
+
+        return $this->newMailMessage($locale)
+            ->subject($locale->trans('notifications.comment_mention_subject', ['pageName' => $page->getShortName()]))
+            ->line($locale->trans('notifications.comment_mention_intro', ['appName' => setting('app-name')]))
+            ->line(new ListMessageLine($listLines))
+            ->action($locale->trans('notifications.action_view_comment'), $page->getUrl('#comment' . $comment->local_id))
+            ->line($this->buildReasonFooterLine($locale));
+    }
+}
diff --git a/app/Activity/Notifications/NotificationManager.php b/app/Activity/Notifications/NotificationManager.php
index 294f56ebbcf..38da2c552a5 100644
--- a/app/Activity/Notifications/NotificationManager.php
+++ b/app/Activity/Notifications/NotificationManager.php
@@ -6,6 +6,7 @@
 use BookStack\Activity\Models\Activity;
 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Notifications\Handlers\CommentCreationNotificationHandler;
+use BookStack\Activity\Notifications\Handlers\CommentMentionNotificationHandler;
 use BookStack\Activity\Notifications\Handlers\NotificationHandler;
 use BookStack\Activity\Notifications\Handlers\PageCreationNotificationHandler;
 use BookStack\Activity\Notifications\Handlers\PageUpdateNotificationHandler;
@@ -14,14 +15,14 @@
 class NotificationManager
 {
     /**
-     * @var class-string<NotificationHandler>[]
+     * @var array<string, class-string<NotificationHandler>[]>
      */
-    protected array $handlers = [];
+    protected array $handlersByActivity = [];
 
     public function handle(Activity $activity, string|Loggable $detail, User $user): void
     {
         $activityType = $activity->type;
-        $handlersToRun = $this->handlers[$activityType] ?? [];
+        $handlersToRun = $this->handlersByActivity[$activityType] ?? [];
         foreach ($handlersToRun as $handlerClass) {
             /** @var NotificationHandler $handler */
             $handler = new $handlerClass();
@@ -34,12 +35,12 @@ public function handle(Activity $activity, string|Loggable $detail, User $user):
      */
     public function registerHandler(string $activityType, string $handlerClass): void
     {
-        if (!isset($this->handlers[$activityType])) {
-            $this->handlers[$activityType] = [];
+        if (!isset($this->handlersByActivity[$activityType])) {
+            $this->handlersByActivity[$activityType] = [];
         }
 
-        if (!in_array($handlerClass, $this->handlers[$activityType])) {
-            $this->handlers[$activityType][] = $handlerClass;
+        if (!in_array($handlerClass, $this->handlersByActivity[$activityType])) {
+            $this->handlersByActivity[$activityType][] = $handlerClass;
         }
     }
 
@@ -48,5 +49,7 @@ public function loadDefaultHandlers(): void
         $this->registerHandler(ActivityType::PAGE_CREATE, PageCreationNotificationHandler::class);
         $this->registerHandler(ActivityType::PAGE_UPDATE, PageUpdateNotificationHandler::class);
         $this->registerHandler(ActivityType::COMMENT_CREATE, CommentCreationNotificationHandler::class);
+        $this->registerHandler(ActivityType::COMMENT_CREATE, CommentMentionNotificationHandler::class);
+        $this->registerHandler(ActivityType::COMMENT_UPDATE, CommentMentionNotificationHandler::class);
     }
 }
diff --git a/app/Activity/TagRepo.php b/app/Activity/TagRepo.php
index 82c26b00e28..3e8d5545ab6 100644
--- a/app/Activity/TagRepo.php
+++ b/app/Activity/TagRepo.php
@@ -18,9 +18,10 @@ public function __construct(
     }
 
     /**
-     * Start a query against all tags in the system.
+     * Start a query against all tags in the system, with total counts for their usage,
+     * suitable for a system interface list with listing options.
      */
-    public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilter): Builder
+    public function queryWithTotalsForList(SimpleListOptions $listOptions, string $nameFilter): Builder
     {
         $searchTerm = $listOptions->getSearch();
         $sort = $listOptions->getSort();
@@ -28,17 +29,34 @@ public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilt
             $sort = 'value';
         }
 
+        $query = $this->baseQueryWithTotals($nameFilter, $searchTerm)
+            ->orderBy($sort, $listOptions->getOrder());
+
+        return $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+    }
+
+    /**
+     * Start a query against all tags in the system, with total counts for their usage,
+     * which can be used via the API.
+     */
+    public function queryWithTotalsForApi(string $nameFilter): Builder
+    {
+        $query = $this->baseQueryWithTotals($nameFilter, '');
+        return $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+    }
+
+    protected function baseQueryWithTotals(string $nameFilter, string $searchTerm): Builder
+    {
         $query = Tag::query()
             ->select([
                 'name',
                 ($searchTerm || $nameFilter) ? 'value' : DB::raw('COUNT(distinct value) as `values`'),
                 DB::raw('COUNT(id) as usages'),
-                DB::raw('SUM(IF(entity_type = \'page\', 1, 0)) as page_count'),
-                DB::raw('SUM(IF(entity_type = \'chapter\', 1, 0)) as chapter_count'),
-                DB::raw('SUM(IF(entity_type = \'book\', 1, 0)) as book_count'),
-                DB::raw('SUM(IF(entity_type = \'bookshelf\', 1, 0)) as shelf_count'),
+                DB::raw('CAST(SUM(IF(entity_type = \'page\', 1, 0)) as UNSIGNED) as page_count'),
+                DB::raw('CAST(SUM(IF(entity_type = \'chapter\', 1, 0)) as UNSIGNED) as chapter_count'),
+                DB::raw('CAST(SUM(IF(entity_type = \'book\', 1, 0)) as UNSIGNED) as book_count'),
+                DB::raw('CAST(SUM(IF(entity_type = \'bookshelf\', 1, 0)) as UNSIGNED) as shelf_count'),
             ])
-            ->orderBy($sort, $listOptions->getOrder())
             ->whereHas('entity');
 
         if ($nameFilter) {
@@ -57,7 +75,7 @@ public function queryWithTotals(SimpleListOptions $listOptions, string $nameFilt
             });
         }
 
-        return $this->permissions->restrictEntityRelationQuery($query, 'tags', 'entity_id', 'entity_type');
+        return $query;
     }
 
     /**
diff --git a/app/Activity/Tools/CommentTree.php b/app/Activity/Tools/CommentTree.php
index 66df2943086..68f4a94d34d 100644
--- a/app/Activity/Tools/CommentTree.php
+++ b/app/Activity/Tools/CommentTree.php
@@ -13,6 +13,11 @@ class CommentTree
      * @var CommentTreeNode[]
      */
     protected array $tree;
+
+    /**
+     * A linear array of loaded comments.
+     * @var Comment[]
+     */
     protected array $comments;
 
     public function __construct(
@@ -39,7 +44,7 @@ public function count(): int
 
     public function getActive(): array
     {
-        return array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived);
+        return array_values(array_filter($this->tree, fn (CommentTreeNode $node) => !$node->comment->archived));
     }
 
     public function activeThreadCount(): int
@@ -49,7 +54,7 @@ public function activeThreadCount(): int
 
     public function getArchived(): array
     {
-        return array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived);
+        return array_values(array_filter($this->tree, fn (CommentTreeNode $node) => $node->comment->archived));
     }
 
     public function archivedThreadCount(): int
@@ -79,6 +84,14 @@ public function canUpdateAny(): bool
         return false;
     }
 
+    public function loadVisibleHtml(): void
+    {
+        foreach ($this->comments as $comment) {
+            $comment->setAttribute('html', $comment->safeHtml());
+            $comment->makeVisible('html');
+        }
+    }
+
     /**
      * @param Comment[] $comments
      * @return CommentTreeNode[]
@@ -123,6 +136,9 @@ protected function createTreeNodeForId(int $id, int $depth, array &$byId, array
         return new CommentTreeNode($byId[$id], $depth, $children);
     }
 
+    /**
+     * @return Comment[]
+     */
     protected function loadComments(): array
     {
         if (!$this->enabled()) {
diff --git a/app/Activity/Tools/MentionParser.php b/app/Activity/Tools/MentionParser.php
new file mode 100644
index 00000000000..d7bcac5e640
--- /dev/null
+++ b/app/Activity/Tools/MentionParser.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\Activity\Tools;
+
+use BookStack\Util\HtmlDocument;
+use DOMElement;
+
+class MentionParser
+{
+    public function parseUserIdsFromHtml(string $html): array
+    {
+        $doc = new HtmlDocument($html);
+
+        $ids = [];
+        $mentionLinks = $doc->queryXPath('//a[@data-mention-user-id]');
+
+        foreach ($mentionLinks as $link) {
+            if ($link instanceof DOMElement) {
+                $id = intval($link->getAttribute('data-mention-user-id'));
+                if ($id > 0) {
+                    $ids[] = $id;
+                }
+            }
+        }
+
+        return array_values(array_unique($ids));
+    }
+}
diff --git a/app/Activity/Tools/WebhookFormatter.php b/app/Activity/Tools/WebhookFormatter.php
index cb4e9cb0a9c..d5eedb56736 100644
--- a/app/Activity/Tools/WebhookFormatter.php
+++ b/app/Activity/Tools/WebhookFormatter.php
@@ -57,8 +57,10 @@ public function format(): array
     }
 
     /**
+     * @template TModel of Model
+     *
      * @param callable(string, Model):bool $condition
-     * @param callable(Model):void         $format
+     * @param callable(TModel):void         $format
      */
     public function addModelFormatter(callable $condition, callable $format): void
     {
@@ -73,13 +75,17 @@ public function addDefaultModelFormatters(): void
         // Load entity owner, creator, updater details
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Entity),
-            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
+            function (Entity $model) {
+                $model->load(['ownedBy', 'createdBy', 'updatedBy']);
+            }
         );
 
         // Load revision detail for page update and create events
         $this->addModelFormatter(
             fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn ($model) => $model->load('currentRevision')
+            function (Page $model) {
+                $model->load('currentRevision');
+            }
         );
     }
 
diff --git a/app/Api/ApiDocsController.php b/app/Api/ApiDocsController.php
index d88dba3bc2f..eb07c0abe56 100644
--- a/app/Api/ApiDocsController.php
+++ b/app/Api/ApiDocsController.php
@@ -3,9 +3,20 @@
 namespace BookStack\Api;
 
 use BookStack\Http\ApiController;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class ApiDocsController extends ApiController
 {
+    protected static array $gettingStartedSectionsById = [
+        'authentication' => 'Authentication',
+        'request-format' => 'Request Format',
+        'listing-endpoints' => 'Listing Endpoints',
+        'error-handling' => 'Error Handling',
+        'rate-limits' => 'Rate Limits',
+        'content-security' => 'Content Security',
+    ];
+
     /**
      * Load the docs page for the API.
      */
@@ -16,6 +27,7 @@ public function display()
 
         return view('api-docs.index', [
             'docs' => $docs,
+            'gettingStartedSections' => static::$gettingStartedSectionsById,
         ]);
     }
 
@@ -29,10 +41,36 @@ public function json()
         return response()->json($docs);
     }
 
+    /**
+     * Download the API docs as a cleaner HTML file or as JSON with embedded HTML guidance.
+     * Provide a ?format=json query parameter to download as JSON.
+     */
+    public function download(Request $request)
+    {
+        $format = $request->query('format') ?? 'html';
+        $docs = ApiDocsGenerator::generateConsideringCache();
+        $downloadName = Str::slug(strtolower(setting('app-name')) . '-api-docs');
+
+        if ($format === 'json') {
+            $docs = [
+                'getting-started-guide' => view('api-docs.parts.getting-started')->render(),
+                ...$docs,
+            ];
+            return $this->createDownload()->directly(json_encode($docs), "{$downloadName}.json");
+        }
+
+        $responseData = view('api-docs.download', [
+            'docs' => $docs,
+            'gettingStartedSections' => static::$gettingStartedSectionsById,
+        ])->render();
+
+        return $this->createDownload()->directly($responseData, "{$downloadName}.html");
+    }
+
     /**
      * Redirect to the API docs page.
-     *  Required as a controller method, instead of the Route::redirect helper,
-     *  to ensure the URL is generated correctly.
+     * Required as a controller method, instead of the Route::redirect helper,
+     * to ensure the URL is generated correctly.
      */
     public function redirect()
     {
diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php
index 287c8387790..10ef5693ab6 100644
--- a/app/Api/ApiDocsGenerator.php
+++ b/app/Api/ApiDocsGenerator.php
@@ -17,14 +17,21 @@
 
 class ApiDocsGenerator
 {
+    /**
+     * @var array<string, ReflectionClass>
+     */
     protected array $reflectionClasses = [];
+
+    /**
+     * @var array<string, ApiController>
+     */
     protected array $controllerClasses = [];
 
     /**
      * Load the docs form the cache if existing
      * otherwise generate and store in the cache.
      */
-    public static function generateConsideringCache(): Collection
+    public static function generateConsideringCache(): array
     {
         $appVersion = AppVersion::get();
         $cacheKey = 'api-docs::' . $appVersion;
@@ -44,14 +51,14 @@ public static function generateConsideringCache(): Collection
     /**
      * Generate API documentation.
      */
-    protected function generate(): Collection
+    protected function generate(): array
     {
         $apiRoutes = $this->getFlatApiRoutes();
         $apiRoutes = $this->loadDetailsFromControllers($apiRoutes);
         $apiRoutes = $this->loadDetailsFromFiles($apiRoutes);
         $apiRoutes = $apiRoutes->groupBy('base_model');
 
-        return $apiRoutes;
+        return $apiRoutes->toArray();
     }
 
     /**
@@ -83,11 +90,19 @@ protected function loadDetailsFromFiles(Collection $routes): Collection
     protected function loadDetailsFromControllers(Collection $routes): Collection
     {
         return $routes->map(function (array $route) {
+            $class = $this->getReflectionClass($route['controller']);
             $method = $this->getReflectionMethod($route['controller'], $route['controller_method']);
             $comment = $method->getDocComment();
-            $route['description'] = $comment ? $this->parseDescriptionFromMethodComment($comment) : null;
+            $route['description'] = $comment ? $this->parseDescriptionFromDocBlockComment($comment) : null;
             $route['body_params'] = $this->getBodyParamsFromClass($route['controller'], $route['controller_method']);
 
+            // Load class description for the model
+            // Not ideal to have it here on each route, but adding it in a more structured manner would break
+            // docs resulting JSON format and therefore be an API break.
+            // Save refactoring for a more significant set of changes.
+            $classComment = $class->getDocComment();
+            $route['model_description'] = $classComment ? $this->parseDescriptionFromDocBlockComment($classComment) : null;
+
             return $route;
         });
     }
@@ -99,7 +114,6 @@ protected function loadDetailsFromControllers(Collection $routes): Collection
      */
     protected function getBodyParamsFromClass(string $className, string $methodName): ?array
     {
-        /** @var ApiController $class */
         $class = $this->controllerClasses[$className] ?? null;
         if ($class === null) {
             $class = app()->make($className);
@@ -124,8 +138,8 @@ protected function getValidationAsString($validation): string
             return $validation;
         }
 
-        if (is_object($validation) && method_exists($validation, '__toString')) {
-            return strval($validation);
+        if (is_object($validation) && $validation instanceof \Stringable) {
+            return $validation->__toString();
         }
 
         if ($validation instanceof Password) {
@@ -140,12 +154,12 @@ protected function getValidationAsString($validation): string
     /**
      * Parse out the description text from a class method comment.
      */
-    protected function parseDescriptionFromMethodComment(string $comment): string
+    protected function parseDescriptionFromDocBlockComment(string $comment): string
     {
         $matches = [];
         preg_match_all('/^\s*?\*\s?($|((?![\/@\s]).*?))$/m', $comment, $matches);
 
-        $text = implode(' ', $matches[1] ?? []);
+        $text = implode(' ', $matches[1]);
         return str_replace('  ', "\n", $text);
     }
 
@@ -155,6 +169,16 @@ protected function parseDescriptionFromMethodComment(string $comment): string
      * @throws ReflectionException
      */
     protected function getReflectionMethod(string $className, string $methodName): ReflectionMethod
+    {
+        return $this->getReflectionClass($className)->getMethod($methodName);
+    }
+
+    /**
+     * Get a reflection class from the given class name.
+     *
+     * @throws ReflectionException
+     */
+    protected function getReflectionClass(string $className): ReflectionClass
     {
         $class = $this->reflectionClasses[$className] ?? null;
         if ($class === null) {
@@ -162,7 +186,7 @@ protected function getReflectionMethod(string $className, string $methodName): R
             $this->reflectionClasses[$className] = $class;
         }
 
-        return $class->getMethod($methodName);
+        return $class;
     }
 
     /**
@@ -171,11 +195,12 @@ protected function getReflectionMethod(string $className, string $methodName): R
     protected function getFlatApiRoutes(): Collection
     {
         return collect(Route::getRoutes()->getRoutes())->filter(function ($route) {
-            return strpos($route->uri, 'api/') === 0;
+            return str_starts_with($route->uri, 'api/');
         })->map(function ($route) {
             [$controller, $controllerMethod] = explode('@', $route->action['uses']);
             $baseModelName = explode('.', explode('/', $route->uri)[1])[0];
-            $shortName = $baseModelName . '-' . $controllerMethod;
+            $controllerMethodKebab = Str::kebab($controllerMethod);
+            $shortName = $baseModelName . '-' . $controllerMethodKebab;
 
             return [
                 'name'                    => $shortName,
@@ -183,7 +208,7 @@ protected function getFlatApiRoutes(): Collection
                 'method'                  => $route->methods[0],
                 'controller'              => $controller,
                 'controller_method'       => $controllerMethod,
-                'controller_method_kebab' => Str::kebab($controllerMethod),
+                'controller_method_kebab' => $controllerMethodKebab,
                 'base_model'              => $baseModelName,
             ];
         });
diff --git a/app/Api/ApiEntityListFormatter.php b/app/Api/ApiEntityListFormatter.php
index 3c94d96ee60..23073bfc2fd 100644
--- a/app/Api/ApiEntityListFormatter.php
+++ b/app/Api/ApiEntityListFormatter.php
@@ -74,18 +74,21 @@ public function withTags(): self
 
     /**
      * Include parent book/chapter info in the formatted data.
+     * These functions are careful to not load the relation themselves, since they should
+     * have already been loaded in a more efficient manner, with permissions applied, by the time
+     * the parent fields are handled here.
      */
     public function withParents(): self
     {
         $this->withField('book', function (Entity $entity) {
-            if ($entity instanceof BookChild && $entity->book) {
+            if ($entity instanceof BookChild && $entity->relationLoaded('book') && $entity->getRelationValue('book')) {
                 return $entity->book->only(['id', 'name', 'slug']);
             }
             return null;
         });
 
         $this->withField('chapter', function (Entity $entity) {
-            if ($entity instanceof Page && $entity->chapter) {
+            if ($entity instanceof Page && $entity->relationLoaded('chapter') && $entity->getRelationValue('chapter')) {
                 return $entity->chapter->only(['id', 'name', 'slug']);
             }
             return null;
diff --git a/app/Api/ApiTokenGuard.php b/app/Api/ApiTokenGuard.php
index 9f4537b296b..f1a3f0dc883 100644
--- a/app/Api/ApiTokenGuard.php
+++ b/app/Api/ApiTokenGuard.php
@@ -16,30 +16,15 @@ class ApiTokenGuard implements Guard
 {
     use GuardHelpers;
 
-    /**
-     * The request instance.
-     */
-    protected $request;
-
-    /**
-     * @var LoginService
-     */
-    protected $loginService;
-
     /**
      * The last auth exception thrown in this request.
-     *
-     * @var ApiAuthException
      */
-    protected $lastAuthException;
+    protected ApiAuthException|null $lastAuthException = null;
 
-    /**
-     * ApiTokenGuard constructor.
-     */
-    public function __construct(Request $request, LoginService $loginService)
-    {
-        $this->request = $request;
-        $this->loginService = $loginService;
+    public function __construct(
+        protected Request $request,
+        protected LoginService $loginService
+    ) {
     }
 
     /**
@@ -67,7 +52,7 @@ public function user()
     }
 
     /**
-     * Determine if current user is authenticated. If not, throw an exception.
+     * Determine if the current user is authenticated. If not, throw an exception.
      *
      * @throws ApiAuthException
      *
@@ -121,7 +106,7 @@ protected function validateTokenHeaderValue(string $authToken): void
             throw new ApiAuthException(trans('errors.api_no_authorization_found'));
         }
 
-        if (strpos($authToken, ':') === false || strpos($authToken, 'Token ') !== 0) {
+        if (!str_contains($authToken, ':') || !str_starts_with($authToken, 'Token ')) {
             throw new ApiAuthException(trans('errors.api_bad_authorization_format'));
         }
     }
@@ -155,7 +140,7 @@ protected function validateToken(?ApiToken $token, string $secret): void
     /**
      * {@inheritdoc}
      */
-    public function validate(array $credentials = [])
+    public function validate(array $credentials = []): bool
     {
         if (empty($credentials['id']) || empty($credentials['secret'])) {
             return false;
@@ -175,7 +160,7 @@ public function validate(array $credentials = [])
     /**
      * "Log out" the currently authenticated user.
      */
-    public function logout()
+    public function logout(): void
     {
         $this->user = null;
     }
diff --git a/app/Api/ListingResponseBuilder.php b/app/Api/ListingResponseBuilder.php
index 44117bad975..6b9cfdd7d0d 100644
--- a/app/Api/ListingResponseBuilder.php
+++ b/app/Api/ListingResponseBuilder.php
@@ -18,6 +18,13 @@ class ListingResponseBuilder
      */
     protected array $fields;
 
+    /**
+     * Which fields are filterable.
+     * When null, the $fields above are used instead (Allow all fields).
+     * @var string[]|null
+     */
+    protected array|null $filterableFields = null;
+
     /**
      * @var array<callable>
      */
@@ -54,7 +61,7 @@ public function toResponse(): JsonResponse
     {
         $filteredQuery = $this->filterQuery($this->query);
 
-        $total = $filteredQuery->count();
+        $total = $filteredQuery->getCountForPagination();
         $data = $this->fetchData($filteredQuery)->each(function ($model) {
             foreach ($this->resultModifiers as $modifier) {
                 $modifier($model);
@@ -77,6 +84,14 @@ public function modifyResults(callable $modifier): void
         $this->resultModifiers[] = $modifier;
     }
 
+    /**
+     * Limit filtering to just the given set of fields.
+     */
+    public function setFilterableFields(array $fields): void
+    {
+        $this->filterableFields = $fields;
+    }
+
     /**
      * Fetch the data to return within the response.
      */
@@ -94,7 +109,7 @@ protected function fetchData(Builder $query): Collection
     protected function filterQuery(Builder $query): Builder
     {
         $query = clone $query;
-        $requestFilters = $this->request->get('filter', []);
+        $requestFilters = $this->request->input('filter', []);
         if (!is_array($requestFilters)) {
             return $query;
         }
@@ -114,10 +129,11 @@ protected function filterQuery(Builder $query): Builder
     protected function requestFilterToQueryFilter($fieldKey, $value): ?array
     {
         $splitKey = explode(':', $fieldKey);
-        $field = $splitKey[0];
+        $field = strtolower($splitKey[0]);
         $filterOperator = $splitKey[1] ?? 'eq';
 
-        if (!in_array($field, $this->fields)) {
+        $filterFields = $this->filterableFields ?? $this->fields;
+        if (!in_array($field, $filterFields)) {
             return null;
         }
 
@@ -140,8 +156,8 @@ protected function sortQuery(Builder $query): Builder
         $defaultSortName = $this->fields[0];
         $direction = 'asc';
 
-        $sort = $this->request->get('sort', '');
-        if (strpos($sort, '-') === 0) {
+        $sort = $this->request->input('sort', '');
+        if (str_starts_with($sort, '-')) {
             $direction = 'desc';
         }
 
@@ -160,9 +176,9 @@ protected function sortQuery(Builder $query): Builder
     protected function countAndOffsetQuery(Builder $query): Builder
     {
         $query = clone $query;
-        $offset = max(0, $this->request->get('offset', 0));
+        $offset = max(0, $this->request->input('offset', 0));
         $maxCount = config('api.max_item_count');
-        $count = $this->request->get('count', config('api.default_item_count'));
+        $count = $this->request->input('count', config('api.default_item_count'));
         $count = max(min($maxCount, $count), 1);
 
         return $query->skip($offset)->take($count);
diff --git a/app/Api/UserApiTokenController.php b/app/Api/UserApiTokenController.php
index 2ca9e22352e..2894ede3aa5 100644
--- a/app/Api/UserApiTokenController.php
+++ b/app/Api/UserApiTokenController.php
@@ -48,11 +48,11 @@ public function store(Request $request, int $userId)
         $secret = Str::random(32);
 
         $token = (new ApiToken())->forceFill([
-            'name'       => $request->get('name'),
+            'name'       => $request->input('name'),
             'token_id'   => Str::random(32),
             'secret'     => Hash::make($secret),
             'user_id'    => $user->id,
-            'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
+            'expires_at' => $request->input('expires_at') ?: ApiToken::defaultExpiry(),
         ]);
 
         while (ApiToken::query()->where('token_id', '=', $token->token_id)->exists()) {
@@ -100,8 +100,8 @@ public function update(Request $request, int $userId, int $tokenId)
 
         [$user, $token] = $this->checkPermissionAndFetchUserToken($userId, $tokenId);
         $token->fill([
-            'name'       => $request->get('name'),
-            'expires_at' => $request->get('expires_at') ?: ApiToken::defaultExpiry(),
+            'name'       => $request->input('name'),
+            'expires_at' => $request->input('expires_at') ?: ApiToken::defaultExpiry(),
         ])->save();
 
         $this->logActivity(ActivityType::API_TOKEN_UPDATE, $token);
diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 0585e0af5cc..d8193e234f9 100644
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -2,11 +2,8 @@
 
 namespace BookStack\App;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
-use BookStack\Entities\Queries\QueryRecentlyViewed;
-use BookStack\Entities\Queries\QueryTopFavourites;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
@@ -24,49 +21,19 @@ public function __construct(
      */
     public function index(
         Request $request,
-        ActivityQueries $activities,
-        QueryRecentlyViewed $recentlyViewed,
-        QueryTopFavourites $topFavourites,
     ) {
-        $activity = $activities->latest(10);
-        $draftPages = [];
-
-        if ($this->isSignedIn()) {
-            $draftPages = $this->queries->pages->currentUserDraftsForList()
-                ->orderBy('updated_at', 'desc')
-                ->with('book')
-                ->take(6)
-                ->get();
-        }
-
-        $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
-        $recents = $this->isSignedIn() ?
-            $recentlyViewed->run(12 * $recentFactor, 1)
-            : $this->queries->books->visibleForList()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
-        $favourites = $topFavourites->run(6);
-        $recentlyUpdatedPages = $this->queries->pages->visibleForList()
-            ->where('draft', false)
-            ->orderBy('updated_at', 'desc')
-            ->take($favourites->count() > 0 ? 5 : 10)
-            ->get();
-
-        $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
-        $homepageOption = setting('app-homepage-type', 'default');
-        if (!in_array($homepageOption, $homepageOptions)) {
-            $homepageOption = 'default';
+        $homepageType = setting('app-homepage-type');
+        if (!in_array($homepageType, ['default', 'books', 'bookshelves', 'page'])) {
+            $homepageType = 'default';
         }
 
         $commonData = [
-            'activity'             => $activity,
-            'recents'              => $recents,
-            'recentlyUpdatedPages' => $recentlyUpdatedPages,
-            'draftPages'           => $draftPages,
-            'favourites'           => $favourites,
+            'homeView' => $homepageType,
         ];
 
         // Add required list ordering & sorting for books & shelves views.
-        if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
-            $key = $homepageOption;
+        if ($homepageType === 'bookshelves' || $homepageType === 'books') {
+            $key = $homepageType;
             $view = setting()->getForCurrentUser($key . '_view_type');
             $listOptions = SimpleListOptions::fromRequest($request, $key)->withSortOptions([
                 'name' => trans('common.sort_name'),
@@ -80,25 +47,25 @@ public function index(
             ]);
         }
 
-        if ($homepageOption === 'bookshelves') {
+        if ($homepageType === 'bookshelves') {
             $shelves = $this->queries->shelves->visibleForListWithCover()
                 ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
-                ->paginate(18);
+                ->paginate(setting()->getInteger('lists-page-count-shelves', 18, 1, 1000));
             $data = array_merge($commonData, ['shelves' => $shelves]);
 
             return view('home.shelves', $data);
         }
 
-        if ($homepageOption === 'books') {
+        if ($homepageType === 'books') {
             $books = $this->queries->books->visibleForListWithCover()
                 ->orderBy($commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder())
-                ->paginate(18);
+                ->paginate(setting()->getInteger('lists-page-count-books', 18, 1, 1000));
             $data = array_merge($commonData, ['books' => $books]);
 
             return view('home.books', $data);
         }
 
-        if ($homepageOption === 'page') {
+        if ($homepageType === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
             /** @var Page $customHomepage */
diff --git a/app/App/Model.php b/app/App/Model.php
index e1c7511c14f..d9633b2ce08 100644
--- a/app/App/Model.php
+++ b/app/App/Model.php
@@ -2,18 +2,38 @@
 
 namespace BookStack\App;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
+use Illuminate\Database\Eloquent\Relations\Relation;
 
 class Model extends EloquentModel
 {
     /**
      * Provides public access to get the raw attribute value from the model.
      * Used in areas where no mutations are required, but performance is critical.
-     *
-     * @return mixed
      */
-    public function getRawAttribute(string $key)
+    public function getRawAttribute(string $key): mixed
     {
         return parent::getAttributeFromArray($key);
     }
+
+    /**
+     * Modify an ordered relation to be deletable across all database types.
+     * This is used to ensure that delete calls don't use the order, and therefore
+     * follow the pre-Laravel 13 logic which was MySQL compatible.
+     *
+     * This only considers standard delete actions, not force deletes.
+     *
+     * @template T of Relation
+     * @param T $relation
+     * @return T
+     */
+    public function deletableOrderedRelation(Relation $relation): Relation
+    {
+        $relation->onDelete(function (Builder $builder) {
+            $builder->toBase()->reorder()->delete();
+        });
+
+        return $relation;
+    }
 }
diff --git a/app/App/Providers/AppServiceProvider.php b/app/App/Providers/AppServiceProvider.php
index 9012a07ebf4..5264c0dccef 100644
--- a/app/App/Providers/AppServiceProvider.php
+++ b/app/App/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Access\SocialDriverManager;
+use BookStack\Activity\Models\Comment;
 use BookStack\Activity\Tools\ActivityLogger;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
@@ -64,6 +65,13 @@ public function boot(): void
             URL::forceScheme($isHttps ? 'https' : 'http');
         }
 
+        // Set SMTP mail driver to use a local domain matching the app domain,
+        // which helps avoid defaulting to a 127.0.0.1 domain
+        if ($appUrl) {
+            $hostName = parse_url($appUrl, PHP_URL_HOST) ?: null;
+            config()->set('mail.mailers.smtp.local_domain', $hostName);
+        }
+
         // Allow longer string lengths after upgrade to utf8mb4
         Schema::defaultStringLength(191);
 
@@ -73,6 +81,7 @@ public function boot(): void
             'book'      => Book::class,
             'chapter'   => Chapter::class,
             'page'      => Page::class,
+            'comment'   => Comment::class,
         ]);
     }
 }
diff --git a/app/App/Providers/AuthServiceProvider.php b/app/App/Providers/AuthServiceProvider.php
index 6a816252131..8c71fee3ac3 100644
--- a/app/App/Providers/AuthServiceProvider.php
+++ b/app/App/Providers/AuthServiceProvider.php
@@ -10,6 +10,7 @@
 use BookStack\Access\RegistrationService;
 use BookStack\Api\ApiTokenGuard;
 use BookStack\Users\Models\User;
+use BookStack\Users\UserRepo;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
@@ -60,7 +61,7 @@ public function boot(): void
     public function register(): void
     {
         Auth::provider('external-users', function () {
-            return new ExternalBaseUserProvider();
+            return new ExternalBaseUserProvider($this->app[UserRepo::class]);
         });
 
         // Bind and provide the default system user as a singleton to the app instance when needed.
diff --git a/app/App/Providers/ThemeServiceProvider.php b/app/App/Providers/ThemeServiceProvider.php
index 2cf581d3863..9b0f7001e81 100644
--- a/app/App/Providers/ThemeServiceProvider.php
+++ b/app/App/Providers/ThemeServiceProvider.php
@@ -4,7 +4,10 @@
 
 use BookStack\Theming\ThemeEvents;
 use BookStack\Theming\ThemeService;
+use BookStack\Theming\ThemeViews;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\FileViewFinder;
 
 class ThemeServiceProvider extends ServiceProvider
 {
@@ -24,7 +27,30 @@ public function boot(): void
     {
         // Boot up the theme system
         $themeService = $this->app->make(ThemeService::class);
+        $viewFactory = $this->app->make('view');
+        $viewFinder = $viewFactory->getFinder();
+        if (!($viewFinder instanceof FileViewFinder)) {
+            throw new \Exception('Only the file view finder is supported for the theme system');
+        }
+        $themeViews = new ThemeViews($viewFinder);
+
+        // Use a custom include so that we can insert theme views before/after includes.
+        // This is done, even if no theme is active, so that view caching does not create problems
+        // when switching between themes or when switching a theme on/off.
+        $viewFactory->share('__themeViews', $themeViews);
+        Blade::directive('include', function ($expression) {
+            return "<?php echo \$__themeViews->handleViewInclude({$expression}, array_diff_key(get_defined_vars(), ['__data' => 1, '__path' => 1])); ?>";
+        });
+
+        if (!$themeService->getTheme()) {
+            return;
+        }
+
+        $themeService->loadModules();
         $themeService->readThemeActions();
         $themeService->dispatch(ThemeEvents::APP_BOOT, $this->app);
+
+        $themeViews->registerViewPathsForTheme($themeService->getModules());
+        $themeService->dispatch(ThemeEvents::THEME_REGISTER_VIEWS, $themeViews);
     }
 }
diff --git a/app/App/Providers/ValidationRuleServiceProvider.php b/app/App/Providers/ValidationRuleServiceProvider.php
index 1adc1ebd851..fc030263029 100644
--- a/app/App/Providers/ValidationRuleServiceProvider.php
+++ b/app/App/Providers/ValidationRuleServiceProvider.php
@@ -3,6 +3,7 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Uploads\ImageService;
+use BookStack\Util\UrlFilter;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
 
@@ -21,10 +22,8 @@ public function boot(): void
 
         Validator::extend('safe_url', function ($attribute, $value, $parameters, $validator) {
             $cleanLinkName = strtolower(trim($value));
-            $isJs = str_starts_with($cleanLinkName, 'javascript:');
-            $isData = str_starts_with($cleanLinkName, 'data:');
-
-            return !$isJs && !$isData;
+            $filter = new UrlFilter($cleanLinkName);
+            return $filter->isAllowed();
         });
     }
 }
diff --git a/app/App/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
index 6771e513fa6..ae41c1d953a 100644
--- a/app/App/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -3,7 +3,11 @@
 namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
 use BookStack\Util\DateFormatter;
+use BookStack\View\ViewBlockManager;
+use BookStack\View\ViewBlockPreferences;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\View;
@@ -18,6 +22,10 @@ public function register()
                 $app['config']->get('app.display_timezone'),
             );
         });
+
+        $this->app->singleton(ViewBlockManager::class, function ($app) {
+            return new ViewBlockManager(new ViewBlockPreferences());
+        });
     }
 
     /**
@@ -32,7 +40,10 @@ public function boot(): void
         View::composer('entities.breadcrumbs', BreadcrumbsViewComposer::class);
 
         // View Globals
+        $viewBlockManager = $this->app->make(ViewBlockManager::class);
         View::share('dates', $this->app->make(DateFormatter::class));
+        View::share('viewBlocks', $viewBlockManager);
+        Theme::dispatch(ThemeEvents::VIEW_BLOCKS_REGISTER, $viewBlockManager);
 
         // Custom blade view directives
         Blade::directive('icon', function ($expression) {
diff --git a/app/App/PwaManifestBuilder.php b/app/App/PwaManifestBuilder.php
index 81ab2fcd711..2dbaead1373 100644
--- a/app/App/PwaManifestBuilder.php
+++ b/app/App/PwaManifestBuilder.php
@@ -10,7 +10,7 @@ public function build(): array
         // does not start a session, so we won't have current user context.
         // This was attempted but removed since manifest calls could affect user session
         // history tracking and back redirection.
-        // Context: https://github.com/BookStackApp/BookStack/issues/4649
+        // Context: https://codeberg.org/bookstack/bookstack/issues/4649
         $darkMode = (bool) setting()->getForCurrentUser('dark-mode-enabled');
         $appName = setting('app-name');
 
diff --git a/app/App/SluggableInterface.php b/app/App/SluggableInterface.php
index 96af49cd323..dd544f5ed21 100644
--- a/app/App/SluggableInterface.php
+++ b/app/App/SluggableInterface.php
@@ -5,11 +5,9 @@
 /**
  * Assigned to models that can have slugs.
  * Must have the below properties.
+ *
+ * @property string $slug
  */
 interface SluggableInterface
 {
-    /**
-     * Regenerate the slug for this model.
-     */
-    public function refreshSlug(): string;
 }
diff --git a/app/App/helpers.php b/app/App/helpers.php
index 0e357e36aee..45a84da8db7 100644
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -6,6 +6,7 @@
 use BookStack\Permissions\Permission;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
+use BookStack\Users\Models\OwnableInterface;
 use BookStack\Users\Models\User;
 
 /**
@@ -40,7 +41,7 @@ function user(): User
  * Check if the current user has a permission. If an ownable element
  * is passed in the jointPermissions are checked against that particular item.
  */
-function userCan(string|Permission $permission, ?Model $ownable = null): bool
+function userCan(string|Permission $permission, (Model&OwnableInterface)|null $ownable = null): bool
 {
     if (is_null($ownable)) {
         return user()->can($permission);
@@ -81,8 +82,7 @@ function setting(?string $key = null, mixed $default = null): mixed
 
 /**
  * Get a path to a theme resource.
- * Returns null if a theme is not configured and
- * therefore a full path is not available for use.
+ * Returns null if a theme is not configured, and therefore a full path is not available for use.
  */
 function theme_path(string $path = ''): ?string
 {
diff --git a/app/Config/app.php b/app/Config/app.php
index 40e542d3e16..8424e53b0c9 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -37,10 +37,15 @@
     // The limit for all uploaded files, including images and attachments in MB.
     'upload_limit' => env('FILE_UPLOAD_SIZE_LIMIT', 50),
 
-    // Allow <script> tags to entered within page content.
-    // <script> tags are escaped by default.
-    // Even when overridden the WYSIWYG editor may still escape script content.
-    'allow_content_scripts' => env('ALLOW_CONTENT_SCRIPTS', false),
+    // Control the behaviour of content filtering, primarily used for page content.
+    // This setting is a string of characters which represent different available filters:
+    // - j - Filter out JavaScript and unknown binary data based content
+    // - h - Filter out unexpected, and potentially dangerous, HTML elements
+    // - f - Filter out unexpected form elements
+    // - a - Run content through a more complex allowlist filter
+    // This defaults to using all filters, unless ALLOW_CONTENT_SCRIPTS is set to true in which case no filters are used.
+    // Note: These filters are a best-attempt and may not be 100% effective. They are typically a layer used in addition to other security measures.
+    'content_filtering' => env('APP_CONTENT_FILTERING', env('ALLOW_CONTENT_SCRIPTS', false) === true ? '' : 'jhfa'),
 
     // Allow server-side fetches to be performed to potentially unknown
     // and user-provided locations. Primarily used in exports when loading
@@ -48,8 +53,8 @@
     'allow_untrusted_server_fetching' => env('ALLOW_UNTRUSTED_SERVER_FETCHING', false),
 
     // Override the default behaviour for allowing crawlers to crawl the instance.
-    // May be ignored if view has be overridden or modified.
-    // Defaults to null since, if not set, 'app-public' status used instead.
+    // May be ignored if the underlying view has been overridden or modified.
+    // Defaults to null in which case the 'app-public' status is used instead.
     'allow_robots' => env('ALLOW_ROBOTS', null),
 
     // Application Base URL, Used by laravel in development commands
@@ -67,6 +72,17 @@
     // Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
     'iframe_sources' => env('ALLOWED_IFRAME_SOURCES', 'https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com'),
 
+    // A list of style sources/hostnames that can be loaded styles within BookStack.
+    // Space separated if multiple. BookStack host domain is auto-inferred.
+    // If not set, a permissive default set is used to reduce potential breakage.
+    'style_sources' => env('ALLOWED_STYLE_SOURCES', null),
+
+    // A list of sources/hostnames that can be loaded as image content within BookStack.
+    // Space separated if multiple. BookStack host domain is auto-inferred, in addition to
+    // data and blob images, due to their use for various functionality.
+    // If not set, a permissive default set is used to reduce potential breakage.
+    'image_sources' => env('ALLOWED_IMAGE_SOURCES', null),
+
     // A list of the sources/hostnames that can be reached by application SSR calls.
     // This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
     // Host-specific functionality (usually controlled via other options) like auth
@@ -104,7 +120,7 @@
     'auto_detect_locale' => env('APP_AUTO_LANG_PUBLIC', true),
 
     // Encryption key
-    'key' => env('APP_KEY', 'AbAZchsay4uBTU33RubBzLKw203yqSqr'),
+    'key' => env('APP_KEY'),
 
     // Encryption cipher
     'cipher' => 'AES-256-CBC',
diff --git a/app/Config/cache.php b/app/Config/cache.php
index 01c822a653b..5e6b36d0fcd 100644
--- a/app/Config/cache.php
+++ b/app/Config/cache.php
@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Str;
-
 /**
  * Caching configuration options.
  *
@@ -74,17 +72,13 @@
 
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Cache Key Prefix
-    |--------------------------------------------------------------------------
-    |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
-    |
-    */
-
+    // Cache prefix key
+    // Useful when using multiple instances of BookStack on the same cache store.
     'prefix' => env('CACHE_PREFIX', 'bookstack_cache_'),
 
+    // Serializable Classes
+    // This value determines the classes that can be unserialized from cache
+    // storage. By default, no PHP classes will be unserialized from your
+    // cache to prevent gadget chain attacks if your APP_KEY is leaked.
+    'serializable_classes' => false,
 ];
diff --git a/app/Config/database.php b/app/Config/database.php
index 5edafa777c8..86bae5f5b63 100644
--- a/app/Config/database.php
+++ b/app/Config/database.php
@@ -81,7 +81,7 @@
             'strict'         => false,
             'engine'         => null,
             'options'        => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+                (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
diff --git a/app/Config/exports.php b/app/Config/exports.php
index 2e22bc759e3..f48fe0a67a3 100644
--- a/app/Config/exports.php
+++ b/app/Config/exports.php
@@ -68,7 +68,7 @@
          * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic,
          * Symbol, ZapfDingbats.
          */
-        'font_dir' => storage_path('fonts/'),  // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
+        'font_dir' => storage_path('fonts/dompdf'),  // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
 
         /**
          * The location of the DOMPDF font cache directory.
@@ -78,7 +78,7 @@
          *
          * Note: This directory must exist and be writable by the webserver process.
          */
-        'font_cache' => storage_path('fonts/'),
+        'font_cache' => storage_path('fonts/dompdf/cache'),
 
         /**
          * The location of a temporary directory.
diff --git a/app/Config/filesystems.php b/app/Config/filesystems.php
index ab73fec2968..facf5f2df2f 100644
--- a/app/Config/filesystems.php
+++ b/app/Config/filesystems.php
@@ -11,7 +11,7 @@
 return [
 
     // Default Filesystem Disk
-    // Options: local, local_secure, s3
+    // Options: local, local_secure, local_secure_restricted, s3
     'default' => env('STORAGE_TYPE', 'local'),
 
     // Filesystem to use specifically for image uploads.
diff --git a/app/Config/logging.php b/app/Config/logging.php
index f5cbd5ffc01..c3db01cfdf3 100644
--- a/app/Config/logging.php
+++ b/app/Config/logging.php
@@ -49,7 +49,6 @@
             'driver' => 'single',
             'path'   => storage_path('logs/laravel.log'),
             'level'  => 'debug',
-            'days'   => 14,
             'replace_placeholders' => true,
         ],
 
@@ -57,7 +56,7 @@
             'driver' => 'daily',
             'path'   => storage_path('logs/laravel.log'),
             'level'  => 'debug',
-            'days'   => 7,
+            'max_files' => 7,
             'replace_placeholders' => true,
         ],
 
diff --git a/app/Config/session.php b/app/Config/session.php
index f2ec2509fc8..db561ec5f09 100644
--- a/app/Config/session.php
+++ b/app/Config/session.php
@@ -92,4 +92,12 @@
     // a cross-site context. Partitioned cookies are accepted by the browser
     // when flagged "secure" and the Same-Site attribute is set to "none".
     'partitioned' => false,
+
+    // Session Serialization
+    // This value controls the serialization strategy for session data, which
+    // is JSON by default. Setting this to "php" allows the storage of PHP
+    // objects in the session but can make an application vulnerable to
+    // "gadget chain" serialization attacks if the APP_KEY is leaked.
+    // Options: json, php
+    'serialization' => 'json',
 ];
diff --git a/app/Config/setting-defaults.php b/app/Config/setting-defaults.php
index 88c4612ca61..59425449516 100644
--- a/app/Config/setting-defaults.php
+++ b/app/Config/setting-defaults.php
@@ -32,6 +32,7 @@
     'page-draft-color-dark' => '#a66ce8',
     'app-custom-head'      => false,
     'registration-enabled' => false,
+    'app-homepage-type'    => 'default',
 
     // User-level default settings
     'user' => [
@@ -41,6 +42,7 @@
         'bookshelves_view_type' => env('APP_VIEWS_BOOKSHELVES', 'grid'),
         'bookshelf_view_type'   => env('APP_VIEWS_BOOKSHELF', 'grid'),
         'books_view_type'       => env('APP_VIEWS_BOOKS', 'grid'),
+        'notifications#comment-mentions' => true,
     ],
 
 ];
diff --git a/app/Config/view.php b/app/Config/view.php
index 80bc9ef8fe8..2eb30b4c9de 100644
--- a/app/Config/view.php
+++ b/app/Config/view.php
@@ -8,12 +8,6 @@
  * Do not edit this file unless you're happy to maintain any changes yourself.
  */
 
-// Join up possible view locations
-$viewPaths = [realpath(base_path('resources/views'))];
-if ($theme = env('APP_THEME', false)) {
-    array_unshift($viewPaths, base_path('themes/' . $theme));
-}
-
 return [
 
     // App theme
@@ -26,7 +20,7 @@
     // Most templating systems load templates from disk. Here you may specify
     // an array of paths that should be checked for your views. Of course
     // the usual Laravel view path has already been registered for you.
-    'paths' => $viewPaths,
+    'paths' => [realpath(base_path('resources/views'))],
 
     // Compiled View Path
     // This option determines where all the compiled Blade templates will be
diff --git a/app/Console/Commands/AssignSortRuleCommand.php b/app/Console/Commands/AssignSortRuleCommand.php
index c438d078326..f00df83831c 100644
--- a/app/Console/Commands/AssignSortRuleCommand.php
+++ b/app/Console/Commands/AssignSortRuleCommand.php
@@ -32,7 +32,7 @@ class AssignSortRuleCommand extends Command
      */
     public function handle(BookSorter $sorter): int
     {
-        $sortRuleId = intval($this->argument('sort-rule')) ?? 0;
+        $sortRuleId = intval($this->argument('sort-rule'));
         if ($sortRuleId === 0) {
             return $this->listSortRules();
         }
diff --git a/app/Console/Commands/ClearRevisionsCommand.php b/app/Console/Commands/ClearRevisionsCommand.php
index ad001fdb1e8..b579c123919 100644
--- a/app/Console/Commands/ClearRevisionsCommand.php
+++ b/app/Console/Commands/ClearRevisionsCommand.php
@@ -3,6 +3,7 @@
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Models\PageUpdateDraft;
 use Illuminate\Console\Command;
 
 class ClearRevisionsCommand extends Command
@@ -28,8 +29,11 @@ class ClearRevisionsCommand extends Command
      */
     public function handle(): int
     {
-        $deleteTypes = $this->option('all') ? ['version', 'update_draft'] : ['version'];
-        PageRevision::query()->whereIn('type', $deleteTypes)->delete();
+        PageRevision::query()->delete();
+        if ($this->option('all')) {
+            PageUpdateDraft::query()->delete();
+        }
+
         $this->comment('Revisions deleted');
         return 0;
     }
diff --git a/app/Console/Commands/CopyShelfPermissionsCommand.php b/app/Console/Commands/CopyShelfPermissionsCommand.php
index c5e2d504e75..1207621debc 100644
--- a/app/Console/Commands/CopyShelfPermissionsCommand.php
+++ b/app/Console/Commands/CopyShelfPermissionsCommand.php
@@ -32,6 +32,7 @@ public function handle(PermissionsUpdater $permissionsUpdater, BookshelfQueries
     {
         $shelfSlug = $this->option('slug');
         $cascadeAll = $this->option('all');
+        $noInteraction = boolval($this->option('no-interaction'));
         $shelves = null;
 
         if (!$cascadeAll && !$shelfSlug) {
@@ -41,14 +42,16 @@ public function handle(PermissionsUpdater $permissionsUpdater, BookshelfQueries
         }
 
         if ($cascadeAll) {
-            $continue = $this->confirm(
-                'Permission settings for all shelves will be cascaded. ' .
-                        'Books assigned to multiple shelves will receive only the permissions of it\'s last processed shelf. ' .
-                        'Are you sure you want to proceed?'
-            );
+            if (!$noInteraction) {
+                $continue = $this->confirm(
+                    'Permission settings for all shelves will be cascaded. ' .
+                    'Books assigned to multiple shelves will receive only the permissions of it\'s last processed shelf. ' .
+                    'Are you sure you want to proceed?',
+                );
 
-            if (!$continue && !$this->hasOption('no-interaction')) {
-                return 0;
+                if (!$continue) {
+                    return 0;
+                }
             }
 
             $shelves = $queries->start()->get(['id']);
diff --git a/app/Console/Commands/InstallModuleCommand.php b/app/Console/Commands/InstallModuleCommand.php
new file mode 100644
index 00000000000..8e77474554e
--- /dev/null
+++ b/app/Console/Commands/InstallModuleCommand.php
@@ -0,0 +1,319 @@
+<?php
+
+namespace BookStack\Console\Commands;
+
+use BookStack\Http\HttpRequestService;
+use BookStack\Theming\ThemeModule;
+use BookStack\Theming\ThemeModuleException;
+use BookStack\Theming\ThemeModuleManager;
+use BookStack\Theming\ThemeModuleZip;
+use BookStack\Util\UrlComparison;
+use GuzzleHttp\Psr7\Request;
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+class InstallModuleCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'bookstack:install-module
+                            {location : The URL or path of the module file}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Install a module to the currently configured theme';
+
+    protected array $cleanupActions = [];
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $location = $this->argument('location');
+
+        // Get the ZIP file containing the module files
+        $zipPath = $this->getPathToZip($location);
+        if (!$zipPath) {
+            $this->cleanup();
+            return 1;
+        }
+
+        // Validate module zip file (metadata, size, etc...) and get module instance
+        $zip = new ThemeModuleZip($zipPath);
+        $themeModule = $this->validateAndGetModuleInfoFromZip($zip);
+        if (!$themeModule) {
+            $this->cleanup();
+            return 1;
+        }
+
+        // Get the theme folder in use, attempting to create one if no active theme in use
+        $themeFolder = $this->getThemeFolder();
+        if (!$themeFolder) {
+            $this->cleanup();
+            return 1;
+        }
+
+        // Get the modules folder of the theme, attempting to create it if not existing,
+        // and create a new module manager instance.
+        $moduleFolder = $this->getModuleFolder($themeFolder);
+        if (!$moduleFolder) {
+            $this->cleanup();
+            return 1;
+        }
+
+        $manager = new ThemeModuleManager($moduleFolder);
+
+        // Handle existing modules with the same name
+        $exitingModulesWithName = $manager->getByName($themeModule->name);
+        $shouldContinue = $this->handleExistingModulesWithSameName($exitingModulesWithName, $manager);
+        if (!$shouldContinue) {
+            $this->cleanup();
+            return 1;
+        }
+
+        // Extract module ZIP into the theme modules folder
+        try {
+            $newModule = $manager->addFromZip($themeModule->name, $zip);
+        } catch (ThemeModuleException $exception) {
+            $this->error("ERROR: Failed to install module with error: {$exception->getMessage()}");
+            $this->cleanup();
+            return 1;
+        }
+
+        $this->info("Module \"{$newModule->name}\" ({$newModule->getVersion()}) successfully installed!");
+        $this->info("Install location: {$moduleFolder}/{$newModule->folderName}");
+        $this->cleanup();
+        return 0;
+    }
+
+    /**
+     * @param ThemeModule[] $existingModules
+     */
+    protected function handleExistingModulesWithSameName(array $existingModules, ThemeModuleManager $manager): bool
+    {
+        if (count($existingModules) === 0) {
+            return true;
+        }
+
+        $this->warn("The following modules already exist with the same name:");
+        foreach ($existingModules as $folder => $module) {
+            $this->line("{$module->name} ({$folder}:{$module->getVersion()}) - {$module->description}");
+        }
+        $this->line('');
+
+        $choices = ['Cancel module install', 'Add alongside existing module'];
+        if (count($existingModules) === 1) {
+            $choices[] = 'Replace existing module';
+        }
+        $choice = $this->choice("What would you like to do?", $choices, 0, null, false);
+        if ($choice === 'Cancel module install') {
+            return false;
+        }
+
+        if ($choice === 'Replace existing module') {
+            $existingModuleFolder = array_key_first($existingModules);
+            $this->info("Replacing existing module in {$existingModuleFolder} folder");
+            $manager->deleteModuleFolder($existingModuleFolder);
+        }
+
+        return true;
+    }
+
+    protected function getModuleFolder(string $themeFolder): string|null
+    {
+        $path = $themeFolder . DIRECTORY_SEPARATOR . 'modules';
+
+        if (file_exists($path) && !is_dir($path)) {
+            $this->error("ERROR: Cannot create a modules folder, file already exists at {$path}");
+            return null;
+        }
+
+        if (!file_exists($path)) {
+            $created = mkdir($path, 0755, true);
+            if (!$created) {
+                $this->error("ERROR: Failed to create a modules folder at {$path}");
+                return null;
+            }
+        }
+
+        return $path;
+    }
+
+    protected function getThemeFolder(): string|null
+    {
+        $path = theme_path('');
+        if (!$path || !is_dir($path)) {
+            $shouldCreate = $this->confirm('No active theme folder found, would you like to create one?');
+            if (!$shouldCreate) {
+                return null;
+            }
+
+            $folder = 'custom';
+            while (file_exists(base_path("themes" . DIRECTORY_SEPARATOR  . $folder))) {
+                $folder = 'custom-' . Str::random(4);
+            }
+
+            $path = base_path("themes/{$folder}");
+            $created = mkdir($path, 0755, true);
+            if (!$created) {
+                $this->error('Failed to create a theme folder to use. This may be a permissions issue. Try manually configuring an active theme');
+                return null;
+            }
+
+            $this->info("Created theme folder at {$path}");
+            $this->warn("You will need to set APP_THEME={$folder} in your BookStack env configuration to enable this theme!");
+        }
+
+        return $path;
+    }
+
+    protected function validateAndGetModuleInfoFromZip(ThemeModuleZip $zip): ThemeModule|null
+    {
+        if (!$zip->exists()) {
+            $this->error("ERROR: Cannot open ZIP file at {$zip->getPath()}");
+            return null;
+        }
+
+        if ($zip->getContentsSize() > (50 * 1024 * 1024)) {
+            $this->error("ERROR: Module ZIP file contents are too large. Maximum size is 50MB");
+            return null;
+        }
+
+        try {
+            $themeModule = $zip->getModuleInstance();
+        } catch (ThemeModuleException $exception) {
+            $this->error("ERROR: Failed to read module metadata with error: {$exception->getMessage()}");
+            return null;
+        }
+
+        return $themeModule;
+    }
+
+    protected function downloadModuleFile(string $location): string|null
+    {
+        $httpRequests = app()->make(HttpRequestService::class);
+        $client = $httpRequests->buildClient(30, ['stream' => true]);
+        $currentLocation = $location;
+        $maxRedirects = 3;
+        $redirectCount = 0;
+
+        // Follow redirects up to 3 times for the same hostname
+        do {
+            $resp = $client->sendRequest(new Request('GET', $currentLocation));
+            $statusCode = $resp->getStatusCode();
+
+            if ($statusCode >= 300 && $statusCode < 400 && $redirectCount < $maxRedirects) {
+                $redirectLocation = $resp->getHeaderLine('Location');
+                if ($redirectLocation) {
+                    $comparison = new UrlComparison($location, $redirectLocation);
+                    $redirectOriginMatches = $comparison->originsMatch();
+
+                    if (!$redirectOriginMatches) {
+                        $redirectUrl = parse_url($redirectLocation);
+                        $redirectOrigin = ($redirectUrl['scheme'] ?? '') . '://' . ($redirectUrl['host'] ?? '') . (isset($redirectUrl['port']) ? ':' . $redirectUrl['port'] : '');
+                        $this->info("The download URL is redirecting to a different site: {$redirectOrigin}");
+                        $shouldContinue = $this->confirm("Do you trust downloading the module from this site?");
+                        if (!$shouldContinue) {
+                            $this->error("Stopping module installation");
+                            return null;
+                        }
+                    }
+
+                    $currentLocation = $redirectLocation;
+                    $redirectCount++;
+                    continue;
+                }
+            }
+
+            break;
+        } while (true);
+
+        if ($resp->getStatusCode() >= 300) {
+            $this->error("ERROR: Failed to download module from {$location}");
+            $this->error("Download failed with status code {$resp->getStatusCode()}");
+            return null;
+        }
+
+        $tempFile = tempnam(sys_get_temp_dir(), 'bookstack_module_');
+        $fileHandle = fopen($tempFile, 'w');
+        $respBody = $resp->getBody();
+        $size = 0;
+        $maxSize = 50 * 1024 * 1024;
+
+        while (!$respBody->eof()) {
+            fwrite($fileHandle, $respBody->read(1024));
+            $size += 1024;
+            if ($size > $maxSize) {
+                fclose($fileHandle);
+                unlink($tempFile);
+                $this->error("ERROR: Module ZIP file is too large. Maximum size is 50MB");
+                return '';
+            }
+        }
+
+        fclose($fileHandle);
+
+        $this->cleanupActions[] = function () use ($tempFile) {
+            unlink($tempFile);
+        };
+
+        return $tempFile;
+    }
+
+    protected function getPathToZip(string $location): string|null
+    {
+        $lowerLocation = strtolower($location);
+        $isRemote = str_starts_with($lowerLocation, 'http://') || str_starts_with($lowerLocation, 'https://');
+
+        if ($isRemote) {
+            // Warning about fetching from source
+            $host = parse_url($location, PHP_URL_HOST);
+            $this->warn("\nThis will download a module from: {$host}\n\nModules can contain code which would have the ability to do anything on the BookStack host server.\nYou should only install modules from trusted sources.");
+            $trustHost = $this->confirm('Are you sure you trust this source?');
+            if (!$trustHost) {
+                return null;
+            }
+
+            // Check if the connection is http. If so, warn the user.
+            if (str_starts_with($lowerLocation, 'http://')) {
+                $this->warn("You are downloading a module from an insecure HTTP source.\nWe recommend only using HTTPS sources to avoid various security risks.");
+                if (!$this->confirm('Are you sure you want to continue without HTTPS?')) {
+                    return null;
+                }
+            }
+
+            // Download ZIP and get its location
+            return $this->downloadModuleFile($location);
+        }
+
+        // Validate the file and get the full location
+        $zipPath = realpath($location);
+
+        if (!$zipPath || !is_file($zipPath)) {
+            $this->error("ERROR: Module file not found at {$location}");
+            return null;
+        }
+
+        $this->warn("\nThis will install a module from: {$zipPath}\n\nModules can contain code which would have the ability to do anything on the BookStack host server.\nYou should only install modules from trusted sources.");
+        $trustHost = $this->confirm('Are you sure you want to install this module?');
+        if (!$trustHost) {
+            return null;
+        }
+
+        return $zipPath;
+    }
+
+    protected function cleanup(): void
+    {
+        foreach ($this->cleanupActions as $action) {
+            $action();
+        }
+    }
+}
diff --git a/app/Console/Commands/UpdateUrlCommand.php b/app/Console/Commands/UpdateUrlCommand.php
index 71f0b92fe41..5f7cf6ce5cc 100644
--- a/app/Console/Commands/UpdateUrlCommand.php
+++ b/app/Console/Commands/UpdateUrlCommand.php
@@ -45,11 +45,10 @@ public function handle(Connection $db): int
 
         $columnsToUpdateByTable = [
             'attachments' => ['path'],
-            'pages'       => ['html', 'text', 'markdown'],
-            'chapters'    => ['description_html'],
-            'books'       => ['description_html'],
-            'bookshelves' => ['description_html'],
+            'entity_page_data' => ['html', 'text', 'markdown'],
+            'entity_container_data' => ['description_html'],
             'page_revisions' => ['html', 'text', 'markdown'],
+            'page_update_drafts' => ['html', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],
             'comments'    => ['html'],
diff --git a/app/Entities/Controllers/BookApiController.php b/app/Entities/Controllers/BookApiController.php
index 5baea163fd6..22d59772077 100644
--- a/app/Entities/Controllers/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -7,11 +7,13 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\BookQueries;
+use BookStack\Entities\Queries\BookshelfQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Http\ApiController;
 use BookStack\Permissions\Permission;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
@@ -21,6 +23,7 @@ public function __construct(
         protected BookRepo $bookRepo,
         protected BookQueries $queries,
         protected PageQueries $pageQueries,
+        protected BookshelfQueries $shelfQueries,
     ) {
     }
 
@@ -58,15 +61,22 @@ public function create(Request $request)
 
     /**
      * View the details of a single book.
-     * The response data will contain 'content' property listing the chapter and pages directly within, in
+     * The response data will contain a 'content' property listing the chapter and pages directly within, in
      * the same structure as you'd see within the BookStack interface when viewing a book. Top-level
-     * contents will have a 'type' property to distinguish between pages & chapters.
+     * contents will have a 'type' property to distinguish between pages and chapters.
      */
     public function read(string $id)
     {
         $book = $this->queries->findVisibleByIdOrFail(intval($id));
         $book = $this->forJsonDisplay($book);
-        $book->load(['createdBy', 'updatedBy', 'ownedBy']);
+        $book->load([
+            'createdBy',
+            'updatedBy',
+            'ownedBy',
+            'shelves' => function (BelongsToMany $query) {
+                $query->select(['id', 'name', 'slug'])->scopes('visible');
+            }
+        ]);
 
         $contents = (new BookContents($book))->getTree(true, false)->all();
         $contentsApiData = (new ApiEntityListFormatter($contents))
@@ -122,9 +132,10 @@ protected function forJsonDisplay(Book $book): Book
         $book = clone $book;
         $book->unsetRelations()->refresh();
 
-        $book->load(['tags', 'cover']);
-        $book->makeVisible('description_html')
-            ->setAttribute('description_html', $book->descriptionHtml());
+        $book->load(['tags']);
+        $book->makeVisible(['cover', 'description_html'])
+            ->setAttribute('description_html', $book->descriptionInfo()->getHtml())
+            ->setAttribute('cover', $book->coverInfo()->getImage());
 
         return $book;
     }
diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index cbf7ffb7984..aa4f99daa6d 100644
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -2,12 +2,11 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\View;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\Cloner;
@@ -18,7 +17,6 @@
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
@@ -31,8 +29,8 @@ public function __construct(
         protected ShelfContext $shelfContext,
         protected BookRepo $bookRepo,
         protected BookQueries $queries,
+        protected EntityQueries $entityQueries,
         protected BookshelfQueries $shelfQueries,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -50,10 +48,7 @@ public function index(Request $request)
 
         $books = $this->queries->visibleForListWithCover()
             ->orderBy($listOptions->getSort(), $listOptions->getOrder())
-            ->paginate(18);
-        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->take(4)->get() : false;
-        $popular = $this->queries->popularForList()->take(4)->get();
-        $new = $this->queries->visibleForList()->orderBy('created_at', 'desc')->take(4)->get();
+            ->paginate(setting()->getInteger('lists-page-count-books', 18, 1, 1000));
 
         $this->shelfContext->clearShelfContext();
 
@@ -61,9 +56,6 @@ public function index(Request $request)
 
         return view('books.index', [
             'books'   => $books,
-            'recents' => $recents,
-            'popular' => $popular,
-            'new'     => $new,
             'view'    => $view,
             'listOptions' => $listOptions,
         ]);
@@ -125,15 +117,23 @@ public function store(Request $request, ?string $shelfSlug = null)
     /**
      * Display the specified book.
      */
-    public function show(Request $request, ActivityQueries $activities, string $slug)
+    public function show(Request $request, string $slug)
     {
-        $book = $this->queries->findVisibleBySlugOrFail($slug);
+        try {
+            $book = $this->queries->findVisibleBySlugOrFail($slug);
+        } catch (NotFoundException $exception) {
+            $book = $this->entityQueries->findVisibleByOldSlugs('book', $slug);
+            if (is_null($book)) {
+                throw $exception;
+            }
+            return redirect($book->getUrl());
+        }
+
         $bookChildren = (new BookContents($book))->getTree(true);
-        $bookParentShelves = $book->shelves()->scopes('visible')->get();
 
         View::incrementFor($book);
         if ($request->has('shelf')) {
-            $this->shelfContext->setShelfContext(intval($request->get('shelf')));
+            $this->shelfContext->setShelfContext(intval($request->input('shelf')));
         }
 
         $this->setPageTitle($book->getShortName());
@@ -142,10 +142,6 @@ public function show(Request $request, ActivityQueries $activities, string $slug
             'book'              => $book,
             'current'           => $book,
             'bookChildren'      => $bookChildren,
-            'bookParentShelves' => $bookParentShelves,
-            'watchOptions'      => new UserEntityWatchOptions(user(), $book),
-            'activity'          => $activities->entityActivity($book, 20, 1),
-            'referenceCount'    => $this->referenceFetcher->getReferenceCountToEntity($book),
         ]);
     }
 
@@ -213,9 +209,14 @@ public function destroy(string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission(Permission::BookDelete, $book);
+        $contextShelf = $this->shelfContext->getContextualShelfForBook($book);
 
         $this->bookRepo->destroy($book);
 
+        if ($contextShelf) {
+            return redirect($contextShelf->getUrl());
+        }
+
         return redirect('/books');
     }
 
@@ -247,7 +248,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug)
         $this->checkOwnablePermission(Permission::BookView, $book);
         $this->checkPermission(Permission::BookCreateAll);
 
-        $newName = $request->get('name') ?: $book->name;
+        $newName = $request->input('name') ?: $book->name;
         $bookCopy = $cloner->cloneBook($book, $newName);
         $this->showSuccessNotification(trans('entities.books_copy_success'));
 
diff --git a/app/Entities/Controllers/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
index f4bd394a9e7..e620eb59c29 100644
--- a/app/Entities/Controllers/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -49,7 +49,7 @@ public function create(Request $request)
         $this->checkPermission(Permission::BookshelfCreateAll);
         $requestData = $this->validate($request, $this->rules()['create']);
 
-        $bookIds = $request->get('books', []);
+        $bookIds = $request->input('books', []);
         $shelf = $this->bookshelfRepo->create($requestData, $bookIds);
 
         return response()->json($this->forJsonDisplay($shelf));
@@ -88,7 +88,7 @@ public function update(Request $request, string $id)
         $this->checkOwnablePermission(Permission::BookshelfUpdate, $shelf);
 
         $requestData = $this->validate($request, $this->rules()['update']);
-        $bookIds = $request->get('books', null);
+        $bookIds = $request->input('books', null);
 
         $shelf = $this->bookshelfRepo->update($shelf, $requestData, $bookIds);
 
@@ -116,9 +116,10 @@ protected function forJsonDisplay(Bookshelf $shelf): Bookshelf
         $shelf = clone $shelf;
         $shelf->unsetRelations()->refresh();
 
-        $shelf->load(['tags', 'cover']);
-        $shelf->makeVisible('description_html')
-            ->setAttribute('description_html', $shelf->descriptionHtml());
+        $shelf->load(['tags']);
+        $shelf->makeVisible(['cover', 'description_html'])
+            ->setAttribute('description_html', $shelf->descriptionInfo()->getHtml())
+            ->setAttribute('cover', $shelf->coverInfo()->getImage());
 
         return $shelf;
     }
diff --git a/app/Entities/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
index f47742ffaa6..a918c48f185 100644
--- a/app/Entities/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -2,17 +2,16 @@
 
 namespace BookStack\Entities\Controllers;
 
-use BookStack\Activity\ActivityQueries;
 use BookStack\Activity\Models\View;
 use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
@@ -23,9 +22,9 @@ class BookshelfController extends Controller
     public function __construct(
         protected BookshelfRepo $shelfRepo,
         protected BookshelfQueries $queries,
+        protected EntityQueries $entityQueries,
         protected BookQueries $bookQueries,
         protected ShelfContext $shelfContext,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -43,22 +42,13 @@ public function index(Request $request)
 
         $shelves = $this->queries->visibleForListWithCover()
             ->orderBy($listOptions->getSort(), $listOptions->getOrder())
-            ->paginate(18);
-        $recents = $this->isSignedIn() ? $this->queries->recentlyViewedForCurrentUser()->get() : false;
-        $popular = $this->queries->popularForList()->get();
-        $new = $this->queries->visibleForList()
-            ->orderBy('created_at', 'desc')
-            ->take(4)
-            ->get();
+            ->paginate(setting()->getInteger('lists-page-count-shelves', 18, 1, 1000));
 
         $this->shelfContext->clearShelfContext();
         $this->setPageTitle(trans('entities.shelves'));
 
         return view('shelves.index', [
             'shelves'     => $shelves,
-            'recents'     => $recents,
-            'popular'     => $popular,
-            'new'         => $new,
             'view'        => $view,
             'listOptions' => $listOptions,
         ]);
@@ -92,7 +82,7 @@ public function store(Request $request)
             'tags'             => ['array'],
         ]);
 
-        $bookIds = explode(',', $request->get('books', ''));
+        $bookIds = explode(',', $request->input('books', ''));
         $shelf = $this->shelfRepo->create($validated, $bookIds);
 
         return redirect($shelf->getUrl());
@@ -103,9 +93,18 @@ public function store(Request $request)
      *
      * @throws NotFoundException
      */
-    public function show(Request $request, ActivityQueries $activities, string $slug)
+    public function show(Request $request, string $slug)
     {
-        $shelf = $this->queries->findVisibleBySlugOrFail($slug);
+        try {
+            $shelf = $this->queries->findVisibleBySlugOrFail($slug);
+        } catch (NotFoundException $exception) {
+            $shelf = $this->entityQueries->findVisibleByOldSlugs('bookshelf', $slug);
+            if (is_null($shelf)) {
+                throw $exception;
+            }
+            return redirect($shelf->getUrl());
+        }
+
         $this->checkOwnablePermission(Permission::BookshelfView, $shelf);
 
         $listOptions = SimpleListOptions::fromRequest($request, 'shelf_books')->withSortOptions([
@@ -116,6 +115,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
         ]);
 
         $sort = $listOptions->getSort();
+
         $sortedVisibleShelfBooks = $shelf->visibleBooks()
             ->reorder($sort === 'default' ? 'order' : $sort, $listOptions->getOrder())
             ->get()
@@ -132,9 +132,7 @@ public function show(Request $request, ActivityQueries $activities, string $slug
             'shelf'                   => $shelf,
             'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
             'view'                    => $view,
-            'activity'                => $activities->entityActivity($shelf, 20, 1),
             'listOptions'             => $listOptions,
-            'referenceCount'          => $this->referenceFetcher->getReferenceCountToEntity($shelf),
         ]);
     }
 
@@ -184,7 +182,7 @@ public function update(Request $request, string $slug)
             unset($validated['image']);
         }
 
-        $bookIds = explode(',', $request->get('books', ''));
+        $bookIds = explode(',', $request->input('books', ''));
         $shelf = $this->shelfRepo->update($shelf, $validated, $bookIds);
 
         return redirect($shelf->getUrl());
diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
index 80eab7bb8c1..9e0c69b1776 100644
--- a/app/Entities/Controllers/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -64,7 +64,7 @@ public function create(Request $request)
     {
         $requestData = $this->validate($request, $this->rules['create']);
 
-        $bookId = $request->get('book_id');
+        $bookId = $request->input('book_id');
         $book = $this->entityQueries->books->findVisibleByIdOrFail(intval($bookId));
         $this->checkOwnablePermission(Permission::ChapterCreate, $book);
 
@@ -104,7 +104,7 @@ public function update(Request $request, string $id)
         $chapter = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
 
-        if ($request->has('book_id') && $chapter->book_id !== intval($requestData['book_id'])) {
+        if ($request->has('book_id') && $chapter->book_id !== (intval($requestData['book_id']) ?: null)) {
             $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
             try {
@@ -144,7 +144,7 @@ protected function forJsonDisplay(Chapter $chapter): Chapter
 
         $chapter->load(['tags']);
         $chapter->makeVisible('description_html');
-        $chapter->setAttribute('description_html', $chapter->descriptionHtml());
+        $chapter->setAttribute('description_html', $chapter->descriptionInfo()->getHtml());
 
         /** @var Book $book */
         $book = $chapter->book()->first();
diff --git a/app/Entities/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
index 9335e0a7034..c089d357512 100644
--- a/app/Entities/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -3,7 +3,6 @@
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\Models\View;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Queries\ChapterQueries;
 use BookStack\Entities\Queries\EntityQueries;
@@ -18,7 +17,6 @@
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
 use BookStack\Util\DatabaseTransaction;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
@@ -30,7 +28,6 @@ public function __construct(
         protected ChapterRepo $chapterRepo,
         protected ChapterQueries $queries,
         protected EntityQueries $entityQueries,
-        protected ReferenceFetcher $referenceFetcher,
     ) {
     }
 
@@ -77,12 +74,20 @@ public function store(Request $request, string $bookSlug)
      */
     public function show(string $bookSlug, string $chapterSlug)
     {
-        $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        try {
+            $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
+        } catch (NotFoundException $exception) {
+            $chapter = $this->entityQueries->findVisibleByOldSlugs('chapter', $chapterSlug, $bookSlug);
+            if (is_null($chapter)) {
+                throw $exception;
+            }
+            return redirect($chapter->getUrl());
+        }
 
-        $sidebarTree = (new BookContents($chapter->book))->getTree();
         $pages = $this->entityQueries->pages->visibleForChapterList($chapter->id)->get();
 
-        $nextPreviousLocator = new NextPreviousContentLocator($chapter, $sidebarTree);
+        $bookTree = (new BookContents($chapter->book))->getTree();
+        $nextPreviousLocator = new NextPreviousContentLocator($chapter, $bookTree);
         View::incrementFor($chapter);
 
         $this->setPageTitle($chapter->getShortName());
@@ -91,12 +96,10 @@ public function show(string $bookSlug, string $chapterSlug)
             'book'           => $chapter->book,
             'chapter'        => $chapter,
             'current'        => $chapter,
-            'sidebarTree'    => $sidebarTree,
-            'watchOptions'   => new UserEntityWatchOptions(user(), $chapter),
             'pages'          => $pages,
             'next'           => $nextPreviousLocator->getNext(),
             'previous'       => $nextPreviousLocator->getPrevious(),
-            'referenceCount' => $this->referenceFetcher->getReferenceCountToEntity($chapter),
+            'bookTree'       => $bookTree,
         ]);
     }
 
@@ -130,7 +133,7 @@ public function update(Request $request, string $bookSlug, string $chapterSlug)
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
 
-        $this->chapterRepo->update($chapter, $validated);
+        $chapter = $this->chapterRepo->update($chapter, $validated);
 
         return redirect($chapter->getUrl());
     }
@@ -195,7 +198,7 @@ public function move(Request $request, string $bookSlug, string $chapterSlug)
         $this->checkOwnablePermission(Permission::ChapterUpdate, $chapter);
         $this->checkOwnablePermission(Permission::ChapterDelete, $chapter);
 
-        $entitySelection = $request->get('entity_selection', null);
+        $entitySelection = $request->input('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
             return redirect($chapter->getUrl());
         }
@@ -240,7 +243,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
     {
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
 
-        $entitySelection = $request->get('entity_selection') ?: null;
+        $entitySelection = $request->input('entity_selection') ?: null;
         $newParentBook = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $chapter->getParent();
 
         if (!$newParentBook instanceof Book) {
@@ -251,7 +254,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
 
         $this->checkOwnablePermission(Permission::ChapterCreate, $newParentBook);
 
-        $newName = $request->get('name') ?: $chapter->name;
+        $newName = $request->input('name') ?: $chapter->name;
         $chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName);
         $this->showSuccessNotification(trans('entities.chapters_copy_success'));
 
diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php
index 033c19a7a33..48782d70c2e 100644
--- a/app/Entities/Controllers/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BookStack\Entities\Controllers;
 
+use BookStack\Activity\Tools\CommentTree;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
@@ -9,7 +12,9 @@
 use BookStack\Http\ApiController;
 use BookStack\Permissions\Permission;
 use Exception;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class PageApiController extends ApiController
 {
@@ -22,6 +27,7 @@ class PageApiController extends ApiController
             'markdown'   => ['required_without:html', 'string'],
             'tags'       => ['array'],
             'priority'   => ['integer'],
+            'changelog'  => ['string', 'min:1', 'max:180'],
         ],
         'update' => [
             'book_id'    => ['integer'],
@@ -31,6 +37,7 @@ class PageApiController extends ApiController
             'markdown'   => ['string'],
             'tags'       => ['array'],
             'priority'   => ['integer'],
+            'changelog'  => ['string', 'min:1', 'max:180'],
         ],
     ];
 
@@ -44,7 +51,7 @@ public function __construct(
     /**
      * Get a listing of pages visible to the user.
      */
-    public function list()
+    public function list(): JsonResponse
     {
         $pages = $this->queries->visibleForList()
             ->addSelect(['created_by', 'updated_by', 'revision_count', 'editor']);
@@ -68,19 +75,19 @@ public function list()
      * Any images included via base64 data URIs will be extracted and saved as gallery
      * images against the page during upload.
      */
-    public function create(Request $request)
+    public function create(Request $request): JsonResponse
     {
-        $this->validate($request, $this->rules['create']);
+        $validated = $this->validate($request, $this->rules['create']);
 
         if ($request->has('chapter_id')) {
-            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id')));
+            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->input('chapter_id')));
         } else {
-            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
+            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->input('book_id')));
         }
         $this->checkOwnablePermission(Permission::PageCreate, $parent);
 
         $draft = $this->pageRepo->getNewDraftPage($parent);
-        $this->pageRepo->publishDraft($draft, $request->only(array_keys($this->rules['create'])));
+        $this->pageRepo->publishDraft($draft, $validated);
 
         return response()->json($draft->forJsonDisplay());
     }
@@ -88,21 +95,32 @@ public function create(Request $request)
     /**
      * View the details of a single page.
      * Pages will always have HTML content. They may have markdown content
-     * if the markdown editor was used to last update the page.
+     * if the Markdown editor was used to last update the page.
      *
-     * The 'html' property is the fully rendered & escaped HTML content that BookStack
+     * The 'html' property is the fully rendered and escaped HTML content that BookStack
      * would show on page view, with page includes handled.
      * The 'raw_html' property is the direct database stored HTML content, which would be
      * what BookStack shows on page edit.
      *
      * See the "Content Security" section of these docs for security considerations when using
      * the page content returned from this endpoint.
+     *
+     * Comments for the page are provided in a tree-structure representing the hierarchy of top-level
+     * comments and replies, for both archived and active comments.
      */
-    public function read(string $id)
+    public function read(string $id): JsonResponse
     {
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
+
+        $page = $page->forJsonDisplay();
+        $commentTree = (new CommentTree($page));
+        $commentTree->loadVisibleHtml();
+        $page->setAttribute('comments', [
+            'active' => $commentTree->getActive(),
+            'archived' => $commentTree->getArchived(),
+        ]);
 
-        return response()->json($page->forJsonDisplay());
+        return response()->json($page);
     }
 
     /**
@@ -112,18 +130,18 @@ public function read(string $id)
      * Providing a 'book_id' or 'chapter_id' property will essentially move
      * the page into that parent element if you have permissions to do so.
      */
-    public function update(Request $request, string $id)
+    public function update(Request $request, string $id): JsonResponse
     {
         $requestData = $this->validate($request, $this->rules['update']);
 
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $parent = null;
         if ($request->has('chapter_id')) {
-            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->get('chapter_id')));
+            $parent = $this->entityQueries->chapters->findVisibleByIdOrFail(intval($request->input('chapter_id')));
         } elseif ($request->has('book_id')) {
-            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->get('book_id')));
+            $parent = $this->entityQueries->books->findVisibleByIdOrFail(intval($request->input('book_id')));
         }
 
         if ($parent && !$parent->matches($page->getParent())) {
@@ -149,9 +167,9 @@ public function update(Request $request, string $id)
      * Delete a page.
      * This will typically send the page to the recycle bin.
      */
-    public function delete(string $id)
+    public function delete(string $id): Response
     {
-        $page = $this->queries->findVisibleByIdOrFail($id);
+        $page = $this->queries->findVisibleByIdOrFail(intval($id));
         $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $this->pageRepo->destroy($page);
diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
index 67ecb0bb377..8d433a46f07 100644
--- a/app/Entities/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -4,9 +4,9 @@
 
 use BookStack\Activity\Models\View;
 use BookStack\Activity\Tools\CommentTree;
-use BookStack\Activity\Tools\UserEntityWatchOptions;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
@@ -17,13 +17,13 @@
 use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
-use BookStack\References\ReferenceFetcher;
+use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
 use Exception;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Throwable;
@@ -34,7 +34,6 @@ public function __construct(
         protected PageRepo $pageRepo,
         protected PageQueries $queries,
         protected EntityQueries $entityQueries,
-        protected ReferenceFetcher $referenceFetcher
     ) {
     }
 
@@ -87,14 +86,14 @@ public function createAsGuest(Request $request, string $bookSlug, ?string $chapt
 
         $page = $this->pageRepo->getNewDraftPage($parent);
         $this->pageRepo->publishDraft($page, [
-            'name' => $request->get('name'),
+            'name' => $request->input('name'),
         ]);
 
         return redirect($page->getUrl('/edit'));
     }
 
     /**
-     * Show form to continue editing a draft page.
+     * Show a form to continue editing a draft page.
      *
      * @throws NotFoundException
      */
@@ -102,6 +101,7 @@ public function editDraft(Request $request, string $bookSlug, int $pageId)
     {
         $draft = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageCreate, $draft->getParent());
+        $this->ensureDraftAccess($draft);
 
         $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));
         $this->setPageTitle(trans('entities.pages_edit_draft'));
@@ -120,8 +120,10 @@ public function store(Request $request, string $bookSlug, int $pageId)
         $this->validate($request, [
             'name' => ['required', 'string', 'max:255'],
         ]);
+
         $draftPage = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageCreate, $draftPage->getParent());
+        $this->ensureDraftAccess($draftPage);
 
         $page = $this->pageRepo->publishDraft($draftPage, $request->all());
 
@@ -139,9 +141,7 @@ public function show(string $bookSlug, string $pageSlug)
         try {
             $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         } catch (NotFoundException $e) {
-            $revision = $this->entityQueries->revisions->findLatestVersionBySlugs($bookSlug, $pageSlug);
-            $page = $revision->page ?? null;
-
+            $page = $this->entityQueries->findVisibleByOldSlugs('page', $pageSlug, $bookSlug);
             if (is_null($page)) {
                 throw $e;
             }
@@ -151,11 +151,10 @@ public function show(string $bookSlug, string $pageSlug)
 
         $pageContent = (new PageContent($page));
         $page->html = $pageContent->render();
-        $pageNav = $pageContent->getNavigation($page->html);
 
-        $sidebarTree = (new BookContents($page->book))->getTree();
+        $bookTree = (new BookContents($page->book))->getTree();
         $commentTree = (new CommentTree($page));
-        $nextPreviousLocator = new NextPreviousContentLocator($page, $sidebarTree);
+        $nextPreviousLocator = new NextPreviousContentLocator($page, $bookTree);
 
         View::incrementFor($page);
         $this->setPageTitle($page->getShortName());
@@ -164,18 +163,15 @@ public function show(string $bookSlug, string $pageSlug)
             'page'            => $page,
             'book'            => $page->book,
             'current'         => $page,
-            'sidebarTree'     => $sidebarTree,
+            'bookTree'        => $bookTree,
             'commentTree'     => $commentTree,
-            'pageNav'         => $pageNav,
-            'watchOptions'    => new UserEntityWatchOptions(user(), $page),
             'next'            => $nextPreviousLocator->getNext(),
             'previous'        => $nextPreviousLocator->getPrevious(),
-            'referenceCount'  => $this->referenceFetcher->getReferenceCountToEntity($page),
         ]);
     }
 
     /**
-     * Get page from an ajax request.
+     * Get a page from an ajax request.
      *
      * @throws NotFoundException
      */
@@ -185,6 +181,10 @@ public function getPageAjax(int $pageId)
         $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));
         $page->makeHidden(['book']);
 
+        $filterConfig = HtmlContentFilterConfig::fromConfigString(config('app.content_filtering'));
+        $filter = new HtmlContentFilter($filterConfig);
+        $page->html = $filter->filterString($page->html);
+
         return response()->json($page);
     }
 
@@ -231,6 +231,7 @@ public function update(Request $request, string $bookSlug, string $pageSlug)
      * Save a draft update as a revision.
      *
      * @throws NotFoundException
+     * @throws PermissionsException
      */
     public function saveDraft(Request $request, int $pageId)
     {
@@ -241,7 +242,11 @@ public function saveDraft(Request $request, int $pageId)
             return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);
         }
 
-        $draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
+        if ($page->draft) {
+            $this->ensureDraftAccess($page);
+        }
+
+        $draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown', 'changelog']));
         $warnings = (new PageEditActivity($page))->getWarningMessagesForDraft($draft);
 
         return response()->json([
@@ -290,11 +295,14 @@ public function showDelete(string $bookSlug, string $pageSlug)
      * Show the deletion page for the specified page.
      *
      * @throws NotFoundException
+     * @throws PermissionsException
      */
     public function showDeleteDraft(string $bookSlug, int $pageId)
     {
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->ensureDraftAccess($page);
+
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
         $usedAsTemplate =
             $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||
@@ -336,7 +344,9 @@ public function destroyDraft(string $bookSlug, int $pageId)
         $page = $this->queries->findVisibleByIdOrFail($pageId);
         $book = $page->book;
         $chapter = $page->chapter;
+
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
+        $this->ensureDraftAccess($page);
 
         $this->pageRepo->destroy($page);
 
@@ -354,8 +364,8 @@ public function destroyDraft(string $bookSlug, int $pageId)
      */
     public function showRecentlyUpdated()
     {
-        $visibleBelongsScope = function (BelongsTo $query) {
-            $query->scopes('visible');
+        $visibleBelongsScope = function (Relation $relation): void {
+            $relation->scopes('visible');
         };
 
         $pages = $this->queries->visibleForList()
@@ -404,7 +414,7 @@ public function move(Request $request, string $bookSlug, string $pageSlug)
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
         $this->checkOwnablePermission(Permission::PageDelete, $page);
 
-        $entitySelection = $request->get('entity_selection', null);
+        $entitySelection = $request->input('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
             return redirect($page->getUrl());
         }
@@ -449,7 +459,7 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission(Permission::PageView, $page);
 
-        $entitySelection = $request->get('entity_selection') ?: null;
+        $entitySelection = $request->input('entity_selection') ?: null;
         $newParent = $entitySelection ? $this->entityQueries->findVisibleByStringIdentifier($entitySelection) : $page->getParent();
 
         if (!$newParent instanceof Book && !$newParent instanceof Chapter) {
@@ -460,10 +470,20 @@ public function copy(Request $request, Cloner $cloner, string $bookSlug, string
 
         $this->checkOwnablePermission(Permission::PageCreate, $newParent);
 
-        $newName = $request->get('name') ?: $page->name;
+        $newName = $request->input('name') ?: $page->name;
         $pageCopy = $cloner->clonePage($page, $newParent, $newName);
         $this->showSuccessNotification(trans('entities.pages_copy_success'));
 
         return redirect($pageCopy->getUrl());
     }
+
+    /**
+     * @throws PermissionsException
+     */
+    protected function ensureDraftAccess(Page $draft): void
+    {
+        if (!$draft->draft || $draft->created_by !== user()->id) {
+            throw new PermissionsException('This page is already published or does not belong to you.');
+        }
+    }
 }
diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index 35f1e8daf0e..158c6244a7c 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -1,10 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BookStack\Entities\Controllers;
 
 use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Queries\PageQueries;
+use BookStack\Entities\Queries\PageRevisionQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\RevisionRepo;
 use BookStack\Entities\Tools\PageContent;
@@ -12,8 +16,12 @@
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
+use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
 use BookStack\Util\SimpleListOptions;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\View\View;
 use Ssddanbrown\HtmlDiff\Diff;
 
 class PageRevisionController extends Controller
@@ -21,6 +29,7 @@ class PageRevisionController extends Controller
     public function __construct(
         protected PageRepo $pageRepo,
         protected PageQueries $pageQueries,
+        protected PageRevisionQueries $revisionQueries,
         protected RevisionRepo $revisionRepo,
     ) {
     }
@@ -30,20 +39,22 @@ public function __construct(
      *
      * @throws NotFoundException
      */
-    public function index(Request $request, string $bookSlug, string $pageSlug)
+    public function index(Request $request, string $bookSlug, string $pageSlug): View
     {
+        $this->checkPermission(Permission::RevisionViewAll);
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $listOptions = SimpleListOptions::fromRequest($request, 'page_revisions', true)->withSortOptions([
-            'id' => trans('entities.pages_revisions_sort_number')
+            'created_at' => trans('common.sort_created_at'),
+            'revision_number' => trans('entities.pages_revisions_sort_number'),
         ]);
 
         $revisions = $page->revisions()->select([
-                'id', 'page_id', 'name', 'created_at', 'created_by', 'updated_at',
-                'type', 'revision_number', 'summary',
+                'id', 'page_id', 'name', 'created_at', 'created_by', 'updated_at', 'revision_number', 'summary',
             ])
             ->selectRaw("IF(markdown = '', false, true) as is_markdown")
             ->with(['page.book', 'createdBy'])
-            ->reorder('id', $listOptions->getOrder())
+            ->reorder($listOptions->getSort(), $listOptions->getOrder())
+            ->orderBy('id', $listOptions->getOrder())
             ->paginate(50);
 
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName' => $page->getShortName()]));
@@ -53,23 +64,40 @@ public function index(Request $request, string $bookSlug, string $pageSlug)
             'page'        => $page,
             'listOptions' => $listOptions,
             'oldestRevisionId' => $page->revisions()->min('id'),
+            'youngestRevisionId' => $page->revisions()->max('id'),
         ]);
     }
 
     /**
-     * Shows a preview of a single revision.
+     * Shows a preview of a single revision, via the page-local revision number.
      *
      * @throws NotFoundException
      */
-    public function show(string $bookSlug, string $pageSlug, int $revisionId)
+    public function showByNumber(string $bookSlug, string $pageSlug, string $revisionNum): View
     {
+        $this->checkPermission(Permission::RevisionViewAll);
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        /** @var ?PageRevision $revision */
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            throw new NotFoundException();
-        }
+        $revision = $this->revisionQueries->findForPageByNumberOrFail($page->id, intval($revisionNum));
+
+        return $this->show($page, $revision);
+    }
+
+    /**
+     * Shows a preview of a single revision, looked up via the revision's ID.
+     * Note: This is here for legacy support, with the above showByNumber intended to be used instead
+     * as a more user-friendly identifier for the revision.
+     */
+    public function showById(string $bookSlug, string $pageSlug, string $revisionId): View
+    {
+        $this->checkPermission(Permission::RevisionViewAll);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $revision = $this->revisionQueries->findForPageByIdOrFail($page->id, intval($revisionId));
 
+        return $this->show($page, $revision);
+    }
+
+    protected function show(Page $page, PageRevision $revision): View
+    {
         $page->fill($revision->toArray());
         // TODO - Refactor PageContent so we don't need to juggle this
         $page->html = $revision->html;
@@ -86,27 +114,45 @@ public function show(string $bookSlug, string $pageSlug, int $revisionId)
     }
 
     /**
-     * Shows the changes of a single revision.
+     * Show the changes compared to the previous revision.
+     */
+    public function changesByNumber(string $bookSlug, string $pageSlug, string $revisionNum): View
+    {
+        $this->checkPermission(Permission::RevisionViewAll);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $revision = $this->revisionQueries->findForPageByNumberOrFail($page->id, intval($revisionNum));
+
+        return $this->changes($page, $revision);
+    }
+
+    /**
+     * Show the changes compared to the previous revision, with the lookup performed by revision ID.
      *
-     * @throws NotFoundException
+     * Note: This is here for legacy support, with the above showByNumber intended to be used instead
+     * as a more user-friendly identifier for the revision.
      */
-    public function changes(string $bookSlug, string $pageSlug, int $revisionId)
+    public function changesById(string $bookSlug, string $pageSlug, string $revisionId): View
     {
+        $this->checkPermission(Permission::RevisionViewAll);
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
-        /** @var ?PageRevision $revision */
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            throw new NotFoundException();
-        }
+        $revision = $this->revisionQueries->findForPageByIdOrFail($page->id, intval($revisionId));
 
+        return $this->changes($page, $revision);
+    }
+
+    protected function changes(Page $page, PageRevision $revision): View
+    {
         $prev = $revision->getPreviousRevision();
         $prevContent = $prev->html ?? '';
-        $diff = Diff::excecute($prevContent, $revision->html);
+
+        // TODO - Refactor PageContent so we can de-dupe these steps
+        $rawDiff = Diff::excecute($prevContent, $revision->html);
+        $filterConfig = HtmlContentFilterConfig::fromConfigString(config('app.content_filtering'));
+        $filter = new HtmlContentFilter($filterConfig);
+        $diff = $filter->filterString($rawDiff);
 
         $page->fill($revision->toArray());
-        // TODO - Refactor PageContent so we don't need to juggle this
-        $page->html = $revision->html;
-        $page->html = (new PageContent($page))->render();
+        $page->html = '';
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
 
         return view('pages.revision', [
@@ -122,12 +168,15 @@ public function changes(string $bookSlug, string $pageSlug, int $revisionId)
      *
      * @throws NotFoundException
      */
-    public function restore(string $bookSlug, string $pageSlug, int $revisionId)
+    public function restore(string $bookSlug, string $pageSlug, string $revisionNum): RedirectResponse
     {
+        $this->checkPermission(Permission::RevisionViewAll);
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $revision = $this->revisionQueries->findForPageByNumberOrFail($page->id, intval($revisionNum));
+
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
-        $page = $this->pageRepo->restoreRevision($page, $revisionId);
+        $page = $this->pageRepo->restoreRevision($page, $revision->id);
 
         return redirect($page->getUrl());
     }
@@ -137,18 +186,18 @@ public function restore(string $bookSlug, string $pageSlug, int $revisionId)
      *
      * @throws NotFoundException
      */
-    public function destroy(string $bookSlug, string $pageSlug, int $revId)
+    public function destroy(string $bookSlug, string $pageSlug, string $revisionNum): RedirectResponse
     {
+        $this->checkPermission(Permission::RevisionViewAll);
         $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
+        $revision = $this->revisionQueries->findForPageByNumberOrFail($page->id, intval($revisionNum));
+
         $this->checkOwnablePermission(Permission::PageDelete, $page);
 
-        $revision = $page->revisions()->where('id', '=', $revId)->first();
-        if ($revision === null) {
-            throw new NotFoundException("Revision #{$revId} not found");
-        }
+        $revision = $this->revisionQueries->findForPageByIdOrFail($page->id, $revision->id);
 
         // Check if it's the latest revision, cannot delete the latest revision.
-        if (intval($page->currentRevision->id ?? null) === intval($revId)) {
+        if (intval($page->currentRevision->id ?? null) === $revision->id) {
             $this->showErrorNotification(trans('entities.revision_cannot_delete_latest'));
 
             return redirect($page->getUrl('/revisions'));
@@ -159,15 +208,4 @@ public function destroy(string $bookSlug, string $pageSlug, int $revId)
 
         return redirect($page->getUrl('/revisions'));
     }
-
-    /**
-     * Destroys existing drafts, belonging to the current user, for the given page.
-     */
-    public function destroyUserDraft(string $pageId)
-    {
-        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-        $this->revisionRepo->deleteDraftsForCurrentUser($page);
-
-        return response('', 200);
-    }
 }
diff --git a/app/Entities/Controllers/PageTemplateController.php b/app/Entities/Controllers/PageTemplateController.php
index c0b97214856..9ff2fe0293e 100644
--- a/app/Entities/Controllers/PageTemplateController.php
+++ b/app/Entities/Controllers/PageTemplateController.php
@@ -21,8 +21,8 @@ public function __construct(
      */
     public function list(Request $request)
     {
-        $page = $request->get('page', 1);
-        $search = $request->get('search', '');
+        $page = $request->input('page', 1);
+        $search = $request->input('search', '');
         $count = 10;
 
         $query = $this->pageQueries->visibleTemplates()
diff --git a/app/Entities/Controllers/PageUpdateDraftController.php b/app/Entities/Controllers/PageUpdateDraftController.php
new file mode 100644
index 00000000000..defabe1ef05
--- /dev/null
+++ b/app/Entities/Controllers/PageUpdateDraftController.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BookStack\Entities\Controllers;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\Entities\Repos\PageUpdateDraftRepo;
+use BookStack\Http\Controller;
+use Illuminate\Http\Response;
+
+class PageUpdateDraftController extends Controller
+{
+    public function __construct(
+        protected PageQueries $pageQueries,
+        protected PageUpdateDraftRepo $draftRepo,
+    ) {
+    }
+
+    /**
+     * Destroys existing drafts, belonging to the current user, for the given page.
+     */
+    public function destroy(string $pageId): Response
+    {
+        $page = $this->pageQueries->findVisibleByIdOrFail(intval($pageId));
+        $this->draftRepo->deleteForCurrentUser($page);
+
+        return response('', 200);
+    }
+}
diff --git a/app/Entities/Controllers/RecycleBinApiController.php b/app/Entities/Controllers/RecycleBinApiController.php
index 6146851366b..ab729fa9fe4 100644
--- a/app/Entities/Controllers/RecycleBinApiController.php
+++ b/app/Entities/Controllers/RecycleBinApiController.php
@@ -11,7 +11,6 @@
 use BookStack\Http\ApiController;
 use BookStack\Permissions\Permission;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecycleBinApiController extends ApiController
 {
diff --git a/app/Entities/EntityExistsRule.php b/app/Entities/EntityExistsRule.php
new file mode 100644
index 00000000000..da210544611
--- /dev/null
+++ b/app/Entities/EntityExistsRule.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BookStack\Entities;
+
+use Illuminate\Validation\Rules\Exists;
+
+class EntityExistsRule implements \Stringable
+{
+    public function __construct(
+        protected string $type,
+    ) {
+    }
+
+    public function __toString()
+    {
+        $existsRule = (new Exists('entities', 'id'))
+            ->where('type', $this->type);
+        return $existsRule->__toString();
+    }
+}
diff --git a/app/Entities/Models/Book.php b/app/Entities/Models/Book.php
index 5f54e0f6af6..abb081d712f 100644
--- a/app/Entities/Models/Book.php
+++ b/app/Entities/Models/Book.php
@@ -2,9 +2,10 @@
 
 namespace BookStack\Entities\Models;
 
+use BookStack\Entities\Tools\EntityCover;
+use BookStack\Entities\Tools\EntityDefaultTemplate;
 use BookStack\Sorting\SortRule;
 use BookStack\Uploads\Image;
-use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -15,26 +16,25 @@
  * Class Book.
  *
  * @property string                                   $description
- * @property int                                      $image_id
+ * @property string                                   $description_html
+ * @property ?int                                     $image_id
  * @property ?int                                     $default_template_id
  * @property ?int                                     $sort_rule_id
- * @property Image|null                               $cover
- * @property \Illuminate\Database\Eloquent\Collection $chapters
- * @property \Illuminate\Database\Eloquent\Collection $pages
- * @property \Illuminate\Database\Eloquent\Collection $directPages
- * @property \Illuminate\Database\Eloquent\Collection $shelves
- * @property ?Page                                    $defaultTemplate
- * @property ?SortRule                                 $sortRule
+ * @property \Illuminate\Database\Eloquent\Collection<int, Chapter> $chapters
+ * @property \Illuminate\Database\Eloquent\Collection<int, Page> $pages
+ * @property \Illuminate\Database\Eloquent\Collection<int, Page> $directPages
+ * @property \Illuminate\Database\Eloquent\Collection<int, Bookshelf> $shelves
+ * @property ?SortRule                                $sortRule
  */
-class Book extends Entity implements CoverImageInterface, HtmlDescriptionInterface
+class Book extends Entity implements HasDescriptionInterface, HasCoverInterface, HasDefaultTemplateInterface
 {
     use HasFactory;
-    use HtmlDescriptionTrait;
+    use ContainerTrait;
 
     public float $searchFactor = 1.2;
 
+    protected $hidden = ['pivot', 'deleted_at', 'description_html', 'entity_id', 'entity_type', 'chapter_id', 'book_id', 'priority'];
     protected $fillable = ['name'];
-    protected $hidden = ['pivot', 'image_id', 'deleted_at', 'description_html'];
 
     /**
      * Get the url for this book.
@@ -44,55 +44,6 @@ public function getUrl(string $path = ''): string
         return url('/books/' . implode('/', [urlencode($this->slug), trim($path, '/')]));
     }
 
-    /**
-     * Returns book cover image, if book cover not exists return default cover image.
-     */
-    public function getBookCover(int $width = 440, int $height = 250): string
-    {
-        $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
-        if (!$this->image_id || !$this->cover) {
-            return $default;
-        }
-
-        try {
-            return $this->cover->getThumb($width, $height, false) ?? $default;
-        } catch (Exception $err) {
-            return $default;
-        }
-    }
-
-    /**
-     * Get the cover image of the book.
-     */
-    public function cover(): BelongsTo
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    /**
-     * Get the type of the image model that is used when storing a cover image.
-     */
-    public function coverImageTypeKey(): string
-    {
-        return 'cover_book';
-    }
-
-    /**
-     * Get the Page that is used as default template for newly created pages within this Book.
-     */
-    public function defaultTemplate(): BelongsTo
-    {
-        return $this->belongsTo(Page::class, 'default_template_id');
-    }
-
-    /**
-     * Get the sort set assigned to this book, if existing.
-     */
-    public function sortRule(): BelongsTo
-    {
-        return $this->belongsTo(SortRule::class);
-    }
-
     /**
      * Get all pages within this book.
      * @return HasMany<Page, $this>
@@ -107,7 +58,7 @@ public function pages(): HasMany
      */
     public function directPages(): HasMany
     {
-        return $this->pages()->where('chapter_id', '=', '0');
+        return $this->pages()->whereNull('chapter_id');
     }
 
     /**
@@ -137,4 +88,27 @@ public function getDirectVisibleChildren(): Collection
 
         return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
     }
+
+    public function defaultTemplate(): EntityDefaultTemplate
+    {
+        return new EntityDefaultTemplate($this);
+    }
+
+    public function cover(): BelongsTo
+    {
+        return $this->belongsTo(Image::class, 'image_id');
+    }
+
+    public function coverInfo(): EntityCover
+    {
+        return new EntityCover($this);
+    }
+
+    /**
+     * Get the sort rule assigned to this container, if existing.
+     */
+    public function sortRule(): BelongsTo
+    {
+        return $this->belongsTo(SortRule::class);
+    }
 }
diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php
index ad54fb926a9..9a8493c3a0a 100644
--- a/app/Entities/Models/BookChild.php
+++ b/app/Entities/Models/BookChild.php
@@ -2,8 +2,6 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\References\ReferenceUpdater;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
@@ -18,34 +16,10 @@ abstract class BookChild extends Entity
 {
     /**
      * Get the book this page sits in.
+     * @return BelongsTo<Book, $this>
      */
     public function book(): BelongsTo
     {
         return $this->belongsTo(Book::class)->withTrashed();
     }
-
-    /**
-     * Change the book that this entity belongs to.
-     */
-    public function changeBook(int $newBookId): Entity
-    {
-        $oldUrl = $this->getUrl();
-        $this->book_id = $newBookId;
-        $this->refreshSlug();
-        $this->save();
-        $this->refresh();
-
-        if ($oldUrl !== $this->getUrl()) {
-            app()->make(ReferenceUpdater::class)->updateEntityReferences($this, $oldUrl);
-        }
-
-        // Update all child pages if a chapter
-        if ($this instanceof Chapter) {
-            foreach ($this->pages()->withTrashed()->get() as $page) {
-                $page->changeBook($newBookId);
-            }
-        }
-
-        return $this;
-    }
 }
diff --git a/app/Entities/Models/Bookshelf.php b/app/Entities/Models/Bookshelf.php
index 9ae52abcb0a..2fa40a5098c 100644
--- a/app/Entities/Models/Bookshelf.php
+++ b/app/Entities/Models/Bookshelf.php
@@ -2,36 +2,37 @@
 
 namespace BookStack\Entities\Models;
 
+use BookStack\Entities\Tools\EntityCover;
 use BookStack\Uploads\Image;
-use Exception;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
-class Bookshelf extends Entity implements CoverImageInterface, HtmlDescriptionInterface
+/**
+ * @property string $description
+ * @property string $description_html
+ */
+class Bookshelf extends Entity implements HasDescriptionInterface, HasCoverInterface
 {
     use HasFactory;
-    use HtmlDescriptionTrait;
-
-    protected $table = 'bookshelves';
+    use ContainerTrait;
 
     public float $searchFactor = 1.2;
 
-    protected $fillable = ['name', 'description', 'image_id'];
-
-    protected $hidden = ['image_id', 'deleted_at', 'description_html'];
+    protected $hidden = ['pivot', 'image_id', 'deleted_at', 'description_html', 'priority', 'default_template_id', 'sort_rule_id', 'entity_id', 'entity_type', 'chapter_id', 'book_id'];
+    protected $fillable = ['name'];
 
     /**
      * Get the books in this shelf.
-     * Should not be used directly since does not take into account permissions.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * Should not be used directly since it does not take into account permissions.
      */
-    public function books()
+    public function books(): BelongsToMany
     {
-        return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')
+        $relation = $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')
+            ->select(['entities.*', 'entity_container_data.*'])
             ->withPivot('order')
             ->orderBy('order', 'asc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -50,41 +51,6 @@ public function getUrl(string $path = ''): string
         return url('/shelves/' . implode('/', [urlencode($this->slug), trim($path, '/')]));
     }
 
-    /**
-     * Returns shelf cover image, if cover not exists return default cover image.
-     */
-    public function getBookCover(int $width = 440, int $height = 250): string
-    {
-        // TODO - Make generic, focused on books right now, Perhaps set-up a better image
-        $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
-        if (!$this->image_id || !$this->cover) {
-            return $default;
-        }
-
-        try {
-            return $this->cover->getThumb($width, $height, false) ?? $default;
-        } catch (Exception $err) {
-            return $default;
-        }
-    }
-
-    /**
-     * Get the cover image of the shelf.
-     * @return BelongsTo<Image, $this>
-     */
-    public function cover(): BelongsTo
-    {
-        return $this->belongsTo(Image::class, 'image_id');
-    }
-
-    /**
-     * Get the type of the image model that is used when storing a cover image.
-     */
-    public function coverImageTypeKey(): string
-    {
-        return 'cover_bookshelf';
-    }
-
     /**
      * Check if this shelf contains the given book.
      */
@@ -96,7 +62,7 @@ public function contains(Book $book): bool
     /**
      * Add a book to the end of this shelf.
      */
-    public function appendBook(Book $book)
+    public function appendBook(Book $book): void
     {
         if ($this->contains($book)) {
             return;
@@ -106,12 +72,13 @@ public function appendBook(Book $book)
         $this->books()->attach($book->id, ['order' => $maxOrder + 1]);
     }
 
-    /**
-     * Get a visible shelf by its slug.
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
-     */
-    public static function getBySlug(string $slug): self
+    public function coverInfo(): EntityCover
     {
-        return static::visible()->where('slug', '=', $slug)->firstOrFail();
+        return new EntityCover($this);
+    }
+
+    public function cover(): BelongsTo
+    {
+        return $this->belongsTo(Image::class, 'image_id');
     }
 }
diff --git a/app/Entities/Models/Chapter.php b/app/Entities/Models/Chapter.php
index d70a49e7a98..d5ec158d87d 100644
--- a/app/Entities/Models/Chapter.php
+++ b/app/Entities/Models/Chapter.php
@@ -2,27 +2,25 @@
 
 namespace BookStack\Entities\Models;
 
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use BookStack\Entities\Tools\EntityDefaultTemplate;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
 
 /**
- * Class Chapter.
- *
  * @property Collection<Page> $pages
  * @property ?int             $default_template_id
- * @property ?Page            $defaultTemplate
+ * @property string           $description
+ * @property string           $description_html
  */
-class Chapter extends BookChild implements HtmlDescriptionInterface
+class Chapter extends BookChild implements HasDescriptionInterface, HasDefaultTemplateInterface
 {
     use HasFactory;
-    use HtmlDescriptionTrait;
+    use ContainerTrait;
 
     public float $searchFactor = 1.2;
-
-    protected $fillable = ['name', 'description', 'priority'];
-    protected $hidden = ['pivot', 'deleted_at', 'description_html'];
+    protected $hidden = ['pivot', 'deleted_at', 'description_html', 'sort_rule_id', 'image_id', 'entity_id', 'entity_type', 'chapter_id'];
+    protected $fillable = ['name', 'priority'];
 
     /**
      * Get the pages that this chapter contains.
@@ -31,7 +29,8 @@ class Chapter extends BookChild implements HtmlDescriptionInterface
      */
     public function pages(string $dir = 'ASC'): HasMany
     {
-        return $this->hasMany(Page::class)->orderBy('priority', $dir);
+        $relation = $this->hasMany(Page::class)->orderBy('priority', $dir);
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -50,14 +49,6 @@ public function getUrl(string $path = ''): string
         return url('/' . implode('/', $parts));
     }
 
-    /**
-     * Get the Page that is used as default template for newly created pages within this Chapter.
-     */
-    public function defaultTemplate(): BelongsTo
-    {
-        return $this->belongsTo(Page::class, 'default_template_id');
-    }
-
     /**
      * Get the visible pages in this chapter.
      * @return Collection<Page>
@@ -70,4 +61,9 @@ public function getVisiblePages(): Collection
         ->orderBy('priority', 'asc')
         ->get();
     }
+
+    public function defaultTemplate(): EntityDefaultTemplate
+    {
+        return new EntityDefaultTemplate($this);
+    }
 }
diff --git a/app/Entities/Models/ContainerTrait.php b/app/Entities/Models/ContainerTrait.php
new file mode 100644
index 00000000000..9ef5ca8d43a
--- /dev/null
+++ b/app/Entities/Models/ContainerTrait.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Entities\Tools\EntityHtmlDescription;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+/**
+ * @mixin Entity
+ */
+trait ContainerTrait
+{
+    public function descriptionInfo(): EntityHtmlDescription
+    {
+        return new EntityHtmlDescription($this);
+    }
+
+    /**
+     * @return HasOne<EntityContainerData, $this>
+     */
+    public function relatedData(): HasOne
+    {
+        return $this->hasOne(EntityContainerData::class, 'entity_id', 'id')
+            ->where('entity_type', '=', $this->getMorphClass());
+    }
+}
diff --git a/app/Entities/Models/CoverImageInterface.php b/app/Entities/Models/CoverImageInterface.php
deleted file mode 100644
index 5f781fe02ab..00000000000
--- a/app/Entities/Models/CoverImageInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-interface CoverImageInterface
-{
-    /**
-     * Get the cover image for this item.
-     */
-    public function cover(): BelongsTo;
-
-    /**
-     * Get the type of the image model that is used when storing a cover image.
-     */
-    public function coverImageTypeKey(): string;
-}
diff --git a/app/Entities/Models/Deletion.php b/app/Entities/Models/Deletion.php
index 55589f61ec9..c24c72d442a 100644
--- a/app/Entities/Models/Deletion.php
+++ b/app/Entities/Models/Deletion.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\Models\Loggable;
 use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -17,6 +18,8 @@
  */
 class Deletion extends Model implements Loggable
 {
+    use HasFactory;
+
     protected $hidden = [];
 
     /**
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 31511aa832d..a159214b6ad 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -13,7 +13,6 @@
 use BookStack\Activity\Models\Watch;
 use BookStack\App\Model;
 use BookStack\App\SluggableInterface;
-use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Permissions\JointPermissionBuilder;
 use BookStack\Permissions\Models\EntityPermission;
 use BookStack\Permissions\Models\JointPermission;
@@ -28,24 +27,26 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class Entity
- * The base class for book-like items such as pages, chapters & books.
+ * The base class for book-like items such as pages, chapters and books.
  * This is not a database model in itself but extended.
  *
  * @property int        $id
+ * @property string     $type
  * @property string     $name
  * @property string     $slug
  * @property Carbon     $created_at
  * @property Carbon     $updated_at
  * @property Carbon     $deleted_at
- * @property int        $created_by
- * @property int        $updated_by
- * @property int        $owned_by
- * @property Collection $tags
+ * @property int|null   $created_by
+ * @property int|null   $updated_by
+ * @property int|null   $owned_by
+ * @property Collection<int, Tag> $tags
  *
  * @method static Entity|Builder visible()
  * @method static Builder withLastView()
@@ -77,6 +78,72 @@ abstract class Entity extends Model implements
      */
     public float $searchFactor = 1.0;
 
+    /**
+     * Set the table to be that used by all entities.
+     */
+    protected $table = 'entities';
+
+    /**
+     * Set a custom query builder for entities.
+     */
+    protected static string $builder = EntityQueryBuilder::class;
+
+    public static array $commonFields = [
+        'id',
+        'type',
+        'name',
+        'slug',
+        'book_id',
+        'chapter_id',
+        'priority',
+        'created_at',
+        'updated_at',
+        'deleted_at',
+        'created_by',
+        'updated_by',
+        'owned_by',
+    ];
+
+    /**
+     * Override the save method to also save the contents for convenience.
+     */
+    public function save(array $options = []): bool
+    {
+        /** @var EntityPageData|EntityContainerData $contents */
+        $contents = $this->relatedData()->firstOrNew();
+        $contentFields = $this->getContentsAttributes();
+
+        foreach ($contentFields as $key => $value) {
+            $contents->setAttribute($key, $value);
+            unset($this->attributes[$key]);
+        }
+
+        $this->setAttribute('type', $this->getMorphClass());
+        $result = parent::save($options);
+        $contentsResult = true;
+
+        if ($result && $contents->isDirty()) {
+            $contentsFillData = $contents instanceof EntityPageData ? ['page_id' => $this->id] : ['entity_id' => $this->id, 'entity_type' => $this->getMorphClass()];
+            $contents->forceFill($contentsFillData);
+            $contentsResult = $contents->save();
+            $this->touch();
+        }
+
+        $this->forceFill($contentFields);
+
+        return $result && $contentsResult;
+    }
+
+    /**
+     * Check if this item is a container item.
+     */
+    public function isContainer(): bool
+    {
+        return $this instanceof Bookshelf ||
+            $this instanceof Book ||
+            $this instanceof Chapter;
+    }
+
     /**
      * Get the entities that are visible to the current user.
      */
@@ -91,8 +158,8 @@ public function scopeVisible(Builder $query): Builder
     public function scopeWithLastView(Builder $query)
     {
         $viewedAtQuery = View::query()->select('updated_at')
-            ->whereColumn('viewable_id', '=', $this->getTable() . '.id')
-            ->where('viewable_type', '=', $this->getMorphClass())
+            ->whereColumn('viewable_id', '=', 'entities.id')
+            ->whereColumn('viewable_type', '=', 'entities.type')
             ->where('user_id', '=', user()->id)
             ->take(1);
 
@@ -102,11 +169,12 @@ public function scopeWithLastView(Builder $query)
     /**
      * Query scope to get the total view count of the entities.
      */
-    public function scopeWithViewCount(Builder $query)
+    public function scopeWithViewCount(Builder $query): void
     {
         $viewCountQuery = View::query()->selectRaw('SUM(views) as view_count')
-            ->whereColumn('viewable_id', '=', $this->getTable() . '.id')
-            ->where('viewable_type', '=', $this->getMorphClass())->take(1);
+            ->whereColumn('viewable_id', '=', 'entities.id')
+            ->whereColumn('viewable_type', '=', 'entities.type')
+            ->take(1);
 
         $query->addSelect(['view_count' => $viewCountQuery]);
     }
@@ -145,8 +213,9 @@ public function matchesOrContains(self $entity): bool
      */
     public function activity(): MorphMany
     {
-        return $this->morphMany(Activity::class, 'loggable')
+        $relation = $this->morphMany(Activity::class, 'loggable')
             ->orderBy('created_at', 'desc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -162,17 +231,20 @@ public function views(): MorphMany
      */
     public function tags(): MorphMany
     {
-        return $this->morphMany(Tag::class, 'entity')->orderBy('order', 'asc');
+        $relation = $this->morphMany(Tag::class, 'entity')
+            ->orderBy('order', 'asc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
      * Get the comments for an entity.
+     * @return MorphMany<Comment, $this>
      */
     public function comments(bool $orderByCreated = true): MorphMany
     {
-        $query = $this->morphMany(Comment::class, 'entity');
-
-        return $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
+        $query = $this->morphMany(Comment::class, 'commentable');
+        $query = $orderByCreated ? $query->orderBy('created_at', 'asc') : $query;
+        return $this->deletableOrderedRelation($query);
     }
 
     /**
@@ -184,7 +256,7 @@ public function searchTerms(): MorphMany
     }
 
     /**
-     * Get this entities restrictions.
+     * Get this entities assigned permissions.
      */
     public function permissions(): MorphMany
     {
@@ -267,7 +339,7 @@ public static function getType(): string
     }
 
     /**
-     * Gets a limited-length version of the entities name.
+     * Gets a limited-length version of the entity name.
      */
     public function getShortName(int $length = 25): string
     {
@@ -334,16 +406,6 @@ public function indexForSearch(): void
         app()->make(SearchIndex::class)->indexEntity(clone $this);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function refreshSlug(): string
-    {
-        $this->slug = app()->make(SlugGenerator::class)->generate($this, $this->name);
-
-        return $this->slug;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -370,6 +432,14 @@ public function watches(): MorphMany
         return $this->morphMany(Watch::class, 'watchable');
     }
 
+    /**
+     * Get the related slug history for this entity.
+     */
+    public function slugHistory(): MorphMany
+    {
+        return $this->morphMany(SlugHistory::class, 'sluggable');
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -377,4 +447,41 @@ public function logDescriptor(): string
     {
         return "({$this->id}) {$this->name}";
     }
+
+    /**
+     * @return HasOne<covariant (EntityContainerData|EntityPageData), $this>
+     */
+    abstract public function relatedData(): HasOne;
+
+    /**
+     * Get the attributes that are intended for the related contents model.
+     * @return array<string, mixed>
+     */
+    protected function getContentsAttributes(): array
+    {
+        $contentFields = [];
+        $contentModel = $this instanceof Page ? EntityPageData::class : EntityContainerData::class;
+
+        foreach ($this->attributes as $key => $value) {
+            if (in_array($key, $contentModel::$fields)) {
+                $contentFields[$key] = $value;
+            }
+        }
+
+        return $contentFields;
+    }
+
+    /**
+     * Create a new instance for the given entity type.
+     */
+    public static function instanceFromType(string $type): self
+    {
+        return match ($type) {
+            'page' => new Page(),
+            'chapter' => new Chapter(),
+            'book' => new Book(),
+            'bookshelf' => new Bookshelf(),
+            default => throw new \InvalidArgumentException("Invalid entity type: {$type}"),
+        };
+    }
 }
diff --git a/app/Entities/Models/EntityContainerData.php b/app/Entities/Models/EntityContainerData.php
new file mode 100644
index 00000000000..21bace7513f
--- /dev/null
+++ b/app/Entities/Models/EntityContainerData.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int     $entity_id
+ * @property string  $entity_type
+ * @property string  $description
+ * @property string  $description_html
+ * @property ?int    $default_template_id
+ * @property ?int    $image_id
+ * @property ?int    $sort_rule_id
+ */
+class EntityContainerData extends Model
+{
+    public $timestamps = false;
+    protected $primaryKey = 'entity_id';
+    public $incrementing = false;
+
+    public static array $fields = [
+        'description',
+        'description_html',
+        'default_template_id',
+        'image_id',
+        'sort_rule_id',
+    ];
+
+    /**
+     * Override the default set keys for save query method to make it work with composite keys.
+     */
+    public function setKeysForSaveQuery($query): Builder
+    {
+        $query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery())
+            ->where('entity_type', '=', $this->entity_type);
+
+        return $query;
+    }
+
+    /**
+     * Override the default set keys for a select query method to make it work with composite keys.
+     */
+    protected function setKeysForSelectQuery($query): Builder
+    {
+        $query->where($this->getKeyName(), '=', $this->getKeyForSelectQuery())
+            ->where('entity_type', '=', $this->entity_type);
+
+        return $query;
+    }
+}
diff --git a/app/Entities/Models/EntityPageData.php b/app/Entities/Models/EntityPageData.php
new file mode 100644
index 00000000000..a98b1a9823c
--- /dev/null
+++ b/app/Entities/Models/EntityPageData.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int    $page_id
+ */
+class EntityPageData extends Model
+{
+    public $timestamps = false;
+    protected $primaryKey = 'page_id';
+    public $incrementing = false;
+
+    public static array $fields = [
+        'draft',
+        'template',
+        'revision_count',
+        'editor',
+        'html',
+        'text',
+        'markdown',
+    ];
+}
diff --git a/app/Entities/Models/EntityQueryBuilder.php b/app/Entities/Models/EntityQueryBuilder.php
new file mode 100644
index 00000000000..7db16b2c9e4
--- /dev/null
+++ b/app/Entities/Models/EntityQueryBuilder.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+class EntityQueryBuilder extends Builder
+{
+    /**
+     * Create a new Eloquent query builder instance.
+     */
+    public function __construct(QueryBuilder $query)
+    {
+        parent::__construct($query);
+
+        $this->withGlobalScope('entity', new EntityScope());
+    }
+
+    public function withoutGlobalScope($scope): static
+    {
+        // Prevent removal of the entity scope
+        if ($scope === 'entity') {
+            return $this;
+        }
+
+        return parent::withoutGlobalScope($scope);
+    }
+
+    /**
+     * Override the default forceDelete method to add type filter onto the query
+     * since it specifically ignores scopes by default.
+     */
+    public function forceDelete()
+    {
+        return $this->query->where('type', '=', $this->model->getMorphClass())->delete();
+    }
+}
diff --git a/app/Entities/Models/EntityScope.php b/app/Entities/Models/EntityScope.php
new file mode 100644
index 00000000000..c77b75a1624
--- /dev/null
+++ b/app/Entities/Models/EntityScope.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Database\Query\JoinClause;
+
+class EntityScope implements Scope
+{
+    /**
+     * Apply the scope to a given Eloquent query builder.
+     */
+    public function apply(Builder $builder, Model $model): void
+    {
+        $builder = $builder->where('type', '=', $model->getMorphClass());
+        $table = $model->getTable();
+        if ($model instanceof Page) {
+            $builder->leftJoin('entity_page_data', 'entity_page_data.page_id', '=', "{$table}.id");
+        } else {
+            $builder->leftJoin('entity_container_data', function (JoinClause $join) use ($model, $table) {
+                $join->on('entity_container_data.entity_id', '=', "{$table}.id")
+                    ->where('entity_container_data.entity_type', '=', $model->getMorphClass());
+            });
+        }
+    }
+}
diff --git a/app/Entities/Models/EntityTable.php b/app/Entities/Models/EntityTable.php
new file mode 100644
index 00000000000..441fd087cb5
--- /dev/null
+++ b/app/Entities/Models/EntityTable.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Activity\Models\Tag;
+use BookStack\Activity\Models\View;
+use BookStack\App\Model;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * This is a simplistic model interpretation of a generic Entity used to query and represent
+ * that database abstractly. Generally, this should rarely be used outside queries.
+ */
+class EntityTable extends Model
+{
+    use SoftDeletes;
+
+    protected $table = 'entities';
+
+    /**
+     * Get the entities that are visible to the current user.
+     * Note: This only applies basic permission filtering which considers the core entity table.
+     * This will not filter on information from other tables such as page draft status.
+     * That should be done after applying this scope.
+     */
+    public function scopeVisible(Builder $query): Builder
+    {
+        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);
+    }
+
+    /**
+     * Get the entity jointPermissions this is connected to.
+     */
+    public function jointPermissions(): HasMany
+    {
+        return $this->hasMany(JointPermission::class, 'entity_id')
+            ->whereColumn('entity_type', '=', 'entities.type');
+    }
+
+    /**
+     * Get the Tags that have been assigned to entities.
+     */
+    public function tags(): HasMany
+    {
+        return $this->hasMany(Tag::class, 'entity_id')
+            ->whereColumn('entity_type', '=', 'entities.type');
+    }
+
+    /**
+     * Get the assigned permissions.
+     */
+    public function permissions(): HasMany
+    {
+        return $this->hasMany(EntityPermission::class, 'entity_id')
+            ->whereColumn('entity_type', '=', 'entities.type');
+    }
+
+    /**
+     * Get View objects for this entity.
+     */
+    public function views(): HasMany
+    {
+        return $this->hasMany(View::class, 'viewable_id')
+            ->whereColumn('viewable_type', '=', 'entities.type');
+    }
+}
diff --git a/app/Entities/Models/HasCoverInterface.php b/app/Entities/Models/HasCoverInterface.php
new file mode 100644
index 00000000000..a4e79e9004d
--- /dev/null
+++ b/app/Entities/Models/HasCoverInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Entities\Tools\EntityCover;
+use BookStack\Uploads\Image;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+interface HasCoverInterface
+{
+    public function coverInfo(): EntityCover;
+
+    /**
+     * The cover image of this entity.
+     * @return BelongsTo<Image, covariant Entity>
+     */
+    public function cover(): BelongsTo;
+}
diff --git a/app/Entities/Models/HasDefaultTemplateInterface.php b/app/Entities/Models/HasDefaultTemplateInterface.php
new file mode 100644
index 00000000000..f3af0da48ab
--- /dev/null
+++ b/app/Entities/Models/HasDefaultTemplateInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Entities\Tools\EntityDefaultTemplate;
+
+interface HasDefaultTemplateInterface
+{
+    public function defaultTemplate(): EntityDefaultTemplate;
+}
diff --git a/app/Entities/Models/HasDescriptionInterface.php b/app/Entities/Models/HasDescriptionInterface.php
new file mode 100644
index 00000000000..f35dbdcb2e1
--- /dev/null
+++ b/app/Entities/Models/HasDescriptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Entities\Tools\EntityHtmlDescription;
+
+interface HasDescriptionInterface
+{
+    public function descriptionInfo(): EntityHtmlDescription;
+}
diff --git a/app/Entities/Models/HtmlDescriptionInterface.php b/app/Entities/Models/HtmlDescriptionInterface.php
deleted file mode 100644
index ffe7f0c5ff1..00000000000
--- a/app/Entities/Models/HtmlDescriptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-interface HtmlDescriptionInterface
-{
-    /**
-     * Get the HTML-based description for this item.
-     * By default, the content should be sanitised unless raw is set to true.
-     */
-    public function descriptionHtml(bool $raw = false): string;
-
-    /**
-     * Set the HTML-based description for this item.
-     */
-    public function setDescriptionHtml(string $html, string|null $plaintext = null): void;
-}
diff --git a/app/Entities/Models/HtmlDescriptionTrait.php b/app/Entities/Models/HtmlDescriptionTrait.php
deleted file mode 100644
index ed726ccaee3..00000000000
--- a/app/Entities/Models/HtmlDescriptionTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace BookStack\Entities\Models;
-
-use BookStack\Util\HtmlContentFilter;
-
-/**
- * @property string $description
- * @property string $description_html
- */
-trait HtmlDescriptionTrait
-{
-    public function descriptionHtml(bool $raw = false): string
-    {
-        $html = $this->description_html ?: '<p>' . nl2br(e($this->description)) . '</p>';
-        if ($raw) {
-            return $html;
-        }
-
-        return HtmlContentFilter::removeScriptsFromHtmlString($html);
-    }
-
-    public function setDescriptionHtml(string $html, string|null $plaintext = null): void
-    {
-        $this->description_html = $html;
-
-        if ($plaintext !== null) {
-            $this->description = $plaintext;
-        }
-
-        if (empty($html) && !empty($plaintext)) {
-            $this->description_html = $this->descriptionHtml();
-        }
-    }
-}
diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index 499ef4d7288..5d9911bb71b 100644
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -3,7 +3,6 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Entities\Tools\PageContent;
-use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
@@ -15,7 +14,7 @@
 
 /**
  * Class Page.
- *
+ * @property EntityPageData $pageData
  * @property int          $chapter_id
  * @property string       $html
  * @property string       $markdown
@@ -24,21 +23,19 @@
  * @property bool         $draft
  * @property int          $revision_count
  * @property string       $editor
- * @property Chapter      $chapter
- * @property Collection   $attachments
- * @property Collection   $revisions
+ * @property Chapter|null $chapter
+ * @property Collection<int, Attachment>   $attachments
+ * @property Collection<int, PageRevision>   $revisions
  * @property PageRevision $currentRevision
  */
 class Page extends BookChild
 {
     use HasFactory;
 
-    protected $fillable = ['name', 'priority'];
-
     public string $textField = 'text';
     public string $htmlField = 'html';
-
-    protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at'];
+    protected $hidden = ['html', 'markdown', 'text', 'pivot', 'deleted_at',  'entity_id', 'entity_type'];
+    protected $fillable = ['name', 'priority'];
 
     protected $casts = [
         'draft'    => 'boolean',
@@ -57,10 +54,8 @@ public function scopeVisible(Builder $query): Builder
 
     /**
      * Get the chapter that this page is in, If applicable.
-     *
-     * @return BelongsTo
      */
-    public function chapter()
+    public function chapter(): BelongsTo
     {
         return $this->belongsTo(Chapter::class);
     }
@@ -76,13 +71,14 @@ public function hasChapter(): bool
     /**
      * Get the associated page revisions, ordered by created date.
      * Only provides actual saved page revision instances, Not drafts.
+     * @return HasMany<PageRevision, $this>
      */
     public function revisions(): HasMany
     {
-        return $this->allRevisions()
-            ->where('type', '=', 'version')
+        $relation = $this->allRevisions()
             ->orderBy('created_at', 'desc')
             ->orderBy('id', 'desc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -90,29 +86,36 @@ public function revisions(): HasMany
      */
     public function currentRevision(): HasOne
     {
-        return $this->hasOne(PageRevision::class)
-            ->where('type', '=', 'version')
+        $relation = $this->hasOne(PageRevision::class)
             ->orderBy('created_at', 'desc')
             ->orderBy('id', 'desc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
      * Get all revision instances assigned to this page.
-     * Includes all types of revisions.
      */
     public function allRevisions(): HasMany
     {
         return $this->hasMany(PageRevision::class);
     }
 
+    /**
+     * Get all user update drafts which have been created for this page.
+     */
+    public function updateDrafts(): HasMany
+    {
+        return $this->hasMany(PageUpdateDraft::class);
+    }
+
     /**
      * Get the attachments assigned to this page.
-     *
-     * @return HasMany
      */
-    public function attachments()
+    public function attachments(): HasMany
     {
-        return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc');
+        $relation = $this->hasMany(Attachment::class, 'uploaded_to')
+            ->orderBy('order', 'asc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -122,15 +125,23 @@ public function getUrl(string $path = ''): string
     {
         $parts = [
             'books',
-            urlencode($this->book_slug ?? $this->book->slug),
+            urlencode($this->book_slug ?? $this->book->slug ?? ''),
             $this->draft ? 'draft' : 'page',
-            $this->draft ? $this->id : urlencode($this->slug),
+            $this->draft ? $this->id : urlencode($this->slug ?? ''),
             trim($path, '/'),
         ];
 
         return url('/' . implode('/', $parts));
     }
 
+    /**
+     * Get the ID-based permalink for this page.
+     */
+    public function getPermalink(): string
+    {
+        return url("/link/{$this->id}");
+    }
+
     /**
      * Get this page for JSON display.
      */
@@ -139,8 +150,27 @@ public function forJsonDisplay(): self
         $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']);
         $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown']));
         $refreshed->setAttribute('raw_html', $refreshed->html);
-        $refreshed->html = (new PageContent($refreshed))->render();
+        $refreshed->setAttribute('html', (new PageContent($refreshed))->render());
 
         return $refreshed;
     }
+
+    /**
+     * @return HasOne<EntityPageData, $this>
+     */
+    public function relatedData(): HasOne
+    {
+        return $this->hasOne(EntityPageData::class, 'page_id', 'id');
+    }
+
+    /**
+     * Update this page's own revision counter, incrementing it up by one upon
+     * any existing revision and/or the existing revision count.
+     */
+    public function incrementRevisionCount(): void
+    {
+        $maxRevNum = $this->revisions()->max('revision_number') ?? 0;
+        $newCount = max($this->revision_count + 1, $maxRevNum + 1);
+        $this->revision_count = $newCount;
+    }
 }
diff --git a/app/Entities/Models/PageRevision.php b/app/Entities/Models/PageRevision.php
index 1a6c980e109..b410583bf24 100644
--- a/app/Entities/Models/PageRevision.php
+++ b/app/Entities/Models/PageRevision.php
@@ -6,6 +6,7 @@
 use BookStack\App\Model;
 use BookStack\Users\Models\User;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
@@ -19,7 +20,6 @@
  * @property int    $created_by
  * @property Carbon $created_at
  * @property Carbon $updated_at
- * @property string $type
  * @property string $summary
  * @property string $markdown
  * @property string $html
@@ -30,6 +30,8 @@
  */
 class PageRevision extends Model implements Loggable
 {
+    use HasFactory;
+
     protected $fillable = ['name', 'text', 'summary'];
     protected $hidden = ['html', 'markdown', 'text'];
 
@@ -54,7 +56,7 @@ public function page(): BelongsTo
      */
     public function getUrl(string $path = ''): string
     {
-        return $this->page->getUrl('/revisions/' . $this->id . '/' . ltrim($path, '/'));
+        return $this->page->getUrl('/revision/' . $this->revision_number . '/' . ltrim($path, '/'));
     }
 
     /**
diff --git a/app/Entities/Models/PageUpdateDraft.php b/app/Entities/Models/PageUpdateDraft.php
new file mode 100644
index 00000000000..32110b223cb
--- /dev/null
+++ b/app/Entities/Models/PageUpdateDraft.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\Activity\Models\Loggable;
+use BookStack\App\Model;
+use BookStack\Users\Models\User;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * @property mixed  $id
+ * @property int    $page_id
+ * @property string $name
+ * @property string $html
+ * @property string $markdown
+ * @property string $summary
+ * @property int    $created_by
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Page   $page
+ * @property-read ?User $createdBy
+ */
+class PageUpdateDraft extends Model
+{
+    use HasFactory;
+
+    protected $fillable = ['name', 'summary'];
+    protected $hidden = ['html', 'markdown', 'text'];
+
+    /**
+     * Get the user that created the page update draft.
+     */
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    /**
+     * Get the page this update draft has been created for.
+     */
+    public function page(): BelongsTo
+    {
+        return $this->belongsTo(Page::class);
+    }
+}
diff --git a/app/Entities/Models/SlugHistory.php b/app/Entities/Models/SlugHistory.php
new file mode 100644
index 00000000000..4041cedd959
--- /dev/null
+++ b/app/Entities/Models/SlugHistory.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace BookStack\Entities\Models;
+
+use BookStack\App\Model;
+use BookStack\Permissions\Models\JointPermission;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * @property int $id
+ * @property int $sluggable_id
+ * @property string $sluggable_type
+ * @property string $slug
+ * @property ?string $parent_slug
+ */
+class SlugHistory extends Model
+{
+    use HasFactory;
+
+    protected $table = 'slug_history';
+
+    public function jointPermissions(): HasMany
+    {
+        return $this->hasMany(JointPermission::class, 'entity_id', 'sluggable_id')
+            ->whereColumn('joint_permissions.entity_type', '=', 'slug_history.sluggable_type');
+    }
+}
diff --git a/app/Entities/Queries/BookQueries.php b/app/Entities/Queries/BookQueries.php
index 2492f81318a..a466f37bc0f 100644
--- a/app/Entities/Queries/BookQueries.php
+++ b/app/Entities/Queries/BookQueries.php
@@ -55,6 +55,11 @@ public function visibleForList(): Builder
             ->select(static::$listAttributes);
     }
 
+    public function visibleForContent(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
+
     public function visibleForListWithCover(): Builder
     {
         return $this->visibleForList()->with('cover');
diff --git a/app/Entities/Queries/BookshelfQueries.php b/app/Entities/Queries/BookshelfQueries.php
index 842011a8781..3fe0a2afcef 100644
--- a/app/Entities/Queries/BookshelfQueries.php
+++ b/app/Entities/Queries/BookshelfQueries.php
@@ -60,6 +60,11 @@ public function visibleForList(): Builder
         return $this->start()->scopes('visible')->select(static::$listAttributes);
     }
 
+    public function visibleForContent(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
+
     public function visibleForListWithCover(): Builder
     {
         return $this->visibleForList()->with('cover');
diff --git a/app/Entities/Queries/ChapterQueries.php b/app/Entities/Queries/ChapterQueries.php
index 9bf0ff65bfd..9ddeb9b5896 100644
--- a/app/Entities/Queries/ChapterQueries.php
+++ b/app/Entities/Queries/ChapterQueries.php
@@ -65,8 +65,14 @@ public function visibleForList(): Builder
             ->scopes('visible')
             ->select(array_merge(static::$listAttributes, ['book_slug' => function ($builder) {
                 $builder->select('slug')
-                    ->from('books')
-                    ->whereColumn('books.id', '=', 'chapters.book_id');
+                    ->from('entities as books')
+                    ->where('type', '=', 'book')
+                    ->whereColumn('books.id', '=', 'entities.book_id');
             }]));
     }
+
+    public function visibleForContent(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
 }
diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 0d2cd7acf64..d017f465c1d 100644
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -3,7 +3,12 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\EntityTable;
+use BookStack\Entities\Tools\SlugHistory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Facades\DB;
 use InvalidArgumentException;
 
 class EntityQueries
@@ -14,6 +19,8 @@ public function __construct(
         public ChapterQueries $chapters,
         public PageQueries $pages,
         public PageRevisionQueries $revisions,
+        public PageUpdateDraftQueries $updateDrafts,
+        protected SlugHistory $slugHistory,
     ) {
     }
 
@@ -27,9 +34,62 @@ public function findVisibleByStringIdentifier(string $identifier): ?Entity
         $explodedId = explode(':', $identifier);
         $entityType = $explodedId[0];
         $entityId = intval($explodedId[1]);
-        $queries = $this->getQueriesForType($entityType);
 
-        return $queries->findVisibleById($entityId);
+        return $this->findVisibleById($entityType, $entityId);
+    }
+
+    /**
+     * Find an entity by its ID.
+     */
+    public function findVisibleById(string $type, int $id): ?Entity
+    {
+        $queries = $this->getQueriesForType($type);
+        return $queries->findVisibleById($id);
+    }
+
+    /**
+     * Find an entity by looking up old slugs in the slug history.
+     */
+    public function findVisibleByOldSlugs(string $type, string $slug, string $parentSlug = ''): ?Entity
+    {
+        $id = $this->slugHistory->lookupEntityIdUsingSlugs($type, $slug, $parentSlug);
+        if ($id === null) {
+            return null;
+        }
+
+        return $this->findVisibleById($type, $id);
+    }
+
+    /**
+     * Start a query across all entity types.
+     * Combines the description/text fields into a single 'description' field.
+     * @return Builder<EntityTable>
+     */
+    public function visibleForList(): Builder
+    {
+        $rawDescriptionField = DB::raw('COALESCE(description, text) as description');
+        $bookSlugSelect = function (QueryBuilder $query) {
+            return $query->select('slug')->from('entities as books')
+                ->whereColumn('books.id', '=', 'entities.book_id')
+                ->where('type', '=', 'book');
+        };
+
+        return EntityTable::query()->scopes('visible')
+            ->select(['id', 'type', 'name', 'slug', 'book_id', 'chapter_id', 'created_at', 'updated_at', 'draft', 'book_slug' => $bookSlugSelect, $rawDescriptionField])
+            ->leftJoin('entity_container_data', function (JoinClause $join) {
+                $join->on('entity_container_data.entity_id', '=', 'entities.id')
+                    ->on('entity_container_data.entity_type', '=', 'entities.type');
+            })->leftJoin('entity_page_data', function (JoinClause $join) {
+                $join->on('entity_page_data.page_id', '=', 'entities.id')
+                    ->where('entities.type', '=', 'page');
+            })->where(function ($query) {
+                $query->whereNull('entity_page_data.draft')
+                    ->orWhere('entity_page_data.draft', '=', 0)
+                    ->orWhere(function ($query) {
+                        $query->where('entity_page_data.draft', '=', 1)
+                            ->where('entities.owned_by', '=', user()->id);
+                    });
+            });
     }
 
     /**
@@ -37,12 +97,23 @@ public function findVisibleByStringIdentifier(string $identifier): ?Entity
      * suitable for listing display.
      * @return Builder<Entity>
      */
-    public function visibleForList(string $entityType): Builder
+    public function visibleForListForType(string $entityType): Builder
     {
         $queries = $this->getQueriesForType($entityType);
         return $queries->visibleForList();
     }
 
+    /**
+     * Start a query of visible entities of the given type,
+     * suitable for using the contents of the items.
+     * @return Builder<Entity>
+     */
+    public function visibleForContentForType(string $entityType): Builder
+    {
+        $queries = $this->getQueriesForType($entityType);
+        return $queries->visibleForContent();
+    }
+
     protected function getQueriesForType(string $type): ProvidesEntityQueries
     {
         $queries = match ($type) {
diff --git a/app/Entities/Queries/PageQueries.php b/app/Entities/Queries/PageQueries.php
index ee7b201bc1a..f4ecee2dc08 100644
--- a/app/Entities/Queries/PageQueries.php
+++ b/app/Entities/Queries/PageQueries.php
@@ -13,7 +13,7 @@ class PageQueries implements ProvidesEntityQueries
 {
     protected static array $contentAttributes = [
         'name', 'id', 'slug', 'book_id', 'chapter_id', 'draft',
-        'template', 'html', 'text', 'created_at', 'updated_at', 'priority',
+        'template', 'html', 'markdown', 'text', 'created_at', 'updated_at', 'priority',
         'created_by', 'updated_by', 'owned_by',
     ];
     protected static array $listAttributes = [
@@ -82,6 +82,14 @@ public function visibleForList(): Builder
             ->select($this->mergeBookSlugForSelect(static::$listAttributes));
     }
 
+    /**
+     * @return Builder<Page>
+     */
+    public function visibleForContent(): Builder
+    {
+        return $this->start()->scopes('visible');
+    }
+
     public function visibleForChapterList(int $chapterId): Builder
     {
         return $this->visibleForList()
@@ -104,18 +112,19 @@ public function currentUserDraftsForList(): Builder
             ->where('created_by', '=', user()->id);
     }
 
-    public function visibleTemplates(): Builder
+    public function visibleTemplates(bool $includeContents = false): Builder
     {
-        return $this->visibleForList()
-            ->where('template', '=', true);
+        $base = $includeContents ? $this->visibleWithContents() : $this->visibleForList();
+        return $base->where('template', '=', true);
     }
 
     protected function mergeBookSlugForSelect(array $columns): array
     {
         return array_merge($columns, ['book_slug' => function ($builder) {
             $builder->select('slug')
-                ->from('books')
-                ->whereColumn('books.id', '=', 'pages.book_id');
+                ->from('entities as books')
+                ->where('type', '=', 'book')
+                ->whereColumn('books.id', '=', 'entities.book_id');
         }]);
     }
 }
diff --git a/app/Entities/Queries/PageRevisionQueries.php b/app/Entities/Queries/PageRevisionQueries.php
index 6e017a742dc..6f9af35e7e3 100644
--- a/app/Entities/Queries/PageRevisionQueries.php
+++ b/app/Entities/Queries/PageRevisionQueries.php
@@ -7,38 +7,65 @@
 
 class PageRevisionQueries
 {
+    /**
+     * Start a new revision query.
+     * @return Builder<PageRevision>
+     */
     public function start(): Builder
     {
         return PageRevision::query();
     }
 
-    public function findLatestVersionBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
+    /**
+     * Get the latest revision of a page based on the provided slugs.
+     */
+    public function findLatestBySlugs(string $bookSlug, string $pageSlug): ?PageRevision
     {
-        return PageRevision::query()
+        return $this->start()
             ->whereHas('page', function (Builder $query) {
                 $query->scopes('visible');
             })
             ->where('slug', '=', $pageSlug)
-            ->where('type', '=', 'version')
             ->where('book_slug', '=', $bookSlug)
             ->orderBy('created_at', 'desc')
             ->first();
     }
 
-    public function findLatestCurrentUserDraftsForPageId(int $pageId): ?PageRevision
+    /**
+     * Get the page revision of the given page-local number.
+     */
+    public function findForPageByNumberOrFail(int $pageId, int $revisionNumber): PageRevision
     {
-        /** @var ?PageRevision $revision */
-        $revision = $this->latestCurrentUserDraftsForPageId($pageId)->first();
+        return $this->start()
+            ->where('page_id', '=', $pageId)
+            ->where('revision_number', '=', $revisionNumber)
+            ->orderBy('created_at', 'desc')
+            ->firstOrFail();
+    }
 
-        return $revision;
+    /**
+     * Get the page revision by revision ID.
+     * The use of also using page id (and filtering by type) is purposeful to ensure that the revision
+     * being returned belongs to the expected page, to avoid scenarios where it may unknowingly
+     * be for a different page than that which has had its access permission checked.
+     */
+    public function findForPageByIdOrFail(int $pageId, int $revisionId): PageRevision
+    {
+        return $this->start()
+            ->where('id', '=', $revisionId)
+            ->where('page_id', '=', $pageId)
+            ->orderBy('created_at', 'desc')
+            ->firstOrFail();
     }
 
-    public function latestCurrentUserDraftsForPageId(int $pageId): Builder
+    /**
+     * Get the max existing version number from the version revisions
+     * of the page of the given ID.
+     */
+    public function maxRevisionVersionNumberForPageId(int $pageId): int
     {
         return $this->start()
-            ->where('created_by', '=', user()->id)
-            ->where('type', 'update_draft')
             ->where('page_id', '=', $pageId)
-            ->orderBy('created_at', 'desc');
+            ->max('revision_number') ?? 0;
     }
 }
diff --git a/app/Entities/Queries/PageUpdateDraftQueries.php b/app/Entities/Queries/PageUpdateDraftQueries.php
new file mode 100644
index 00000000000..3ae03c3ef1e
--- /dev/null
+++ b/app/Entities/Queries/PageUpdateDraftQueries.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace BookStack\Entities\Queries;
+
+use BookStack\Entities\Models\PageUpdateDraft;
+use Illuminate\Database\Eloquent\Builder;
+
+class PageUpdateDraftQueries
+{
+    /**
+     * Start a new revision query.
+     * @return Builder<PageUpdateDraft>
+     */
+    protected function start(): Builder
+    {
+        return PageUpdateDraft::query();
+    }
+
+    /**
+     * Get the latest page update draft for the given page belonging the logged-in user.
+     */
+    public function findLatestCurrentUserDraftsForPageId(int $pageId): ?PageUpdateDraft
+    {
+        return $this->latestCurrentUserDraftsForPageId($pageId)->first();
+    }
+
+    /**
+     * Start a query for the the latest page edit drafts belonging to the currently logged in user,
+     * ordered by most recent first.
+     *
+     * @return Builder<PageUpdateDraft>
+     */
+    public function latestCurrentUserDraftsForPageId(int $pageId): Builder
+    {
+        return $this->start()
+            ->where('created_by', '=', user()->id)
+            ->where('page_id', '=', $pageId)
+            ->orderBy('created_at', 'desc');
+    }
+}
diff --git a/app/Entities/Queries/ProvidesEntityQueries.php b/app/Entities/Queries/ProvidesEntityQueries.php
index 79fc64b3ab8..674e96afa24 100644
--- a/app/Entities/Queries/ProvidesEntityQueries.php
+++ b/app/Entities/Queries/ProvidesEntityQueries.php
@@ -35,4 +35,11 @@ public function findVisibleById(int $id): ?Entity;
      * @return Builder<TModel>
      */
     public function visibleForList(): Builder;
+
+    /**
+     * Start a query for items that are visible, with selection
+     * configured for using the content of the items found.
+     * @return Builder<TModel>
+     */
+    public function visibleForContent(): Builder;
 }
diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index 065ae82ef82..1782070de86 100644
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -6,6 +6,7 @@
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
@@ -20,6 +21,7 @@ public function __construct(
 
     public function run(int $count, int $page, array $filterModels): Collection
     {
+        /** @var Builder<View> $query */
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
             ->select('*', 'viewable_id', 'viewable_type', DB::raw('SUM(views) as view_count'))
diff --git a/app/Entities/Queries/QueryRecentlyViewed.php b/app/Entities/Queries/QueryRecentlyViewed.php
index f28b8f8652f..8ba1a57badd 100644
--- a/app/Entities/Queries/QueryRecentlyViewed.php
+++ b/app/Entities/Queries/QueryRecentlyViewed.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\Models\View;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 
 class QueryRecentlyViewed
@@ -22,6 +23,7 @@ public function run(int $count, int $page): Collection
             return collect();
         }
 
+        /** @var Builder<View> $query */
         $query = $this->permissions->restrictEntityRelationQuery(
             View::query(),
             'views',
diff --git a/app/Entities/Queries/QueryTopFavourites.php b/app/Entities/Queries/QueryTopFavourites.php
index 6340e35ef18..2719e94bc8b 100644
--- a/app/Entities/Queries/QueryTopFavourites.php
+++ b/app/Entities/Queries/QueryTopFavourites.php
@@ -5,6 +5,7 @@
 use BookStack\Activity\Models\Favourite;
 use BookStack\Entities\Tools\MixedEntityListLoader;
 use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 
 class QueryTopFavourites
@@ -22,6 +23,7 @@ public function run(int $count, int $skip = 0)
             return collect();
         }
 
+        /** @var Builder<Favourite> $query */
         $query = $this->permissions
             ->restrictEntityRelationQuery(Favourite::query(), 'favourites', 'favouritable_id', 'favouritable_type')
             ->select('favourites.*')
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index bfc01a58d1d..44baeaccfdc 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -3,20 +3,20 @@
 namespace BookStack\Entities\Repos;
 
 use BookStack\Activity\TagRepo;
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\HasCoverInterface;
+use BookStack\Entities\Models\HasDescriptionInterface;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\CoverImageInterface;
-use BookStack\Entities\Models\HtmlDescriptionInterface;
-use BookStack\Entities\Models\HtmlDescriptionTrait;
 use BookStack\Entities\Queries\PageQueries;
+use BookStack\Entities\Tools\SlugGenerator;
+use BookStack\Entities\Tools\SlugHistory;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\References\ReferenceStore;
 use BookStack\References\ReferenceUpdater;
 use BookStack\Sorting\BookSorter;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Util\HtmlDescriptionFilter;
+use BookStack\Util\HtmlToPlainText;
 use Illuminate\Http\UploadedFile;
 
 class BaseRepo
@@ -28,22 +28,32 @@ public function __construct(
         protected ReferenceStore $referenceStore,
         protected PageQueries $pageQueries,
         protected BookSorter $bookSorter,
+        protected SlugGenerator $slugGenerator,
+        protected SlugHistory $slugHistory,
     ) {
     }
 
     /**
      * Create a new entity in the system.
+     * @template T of Entity
+     * @param T $entity
+     * @return T
      */
-    public function create(Entity $entity, array $input)
+    public function create(Entity $entity, array $input): Entity
     {
+        $entity = (clone $entity)->refresh();
         $entity->fill($input);
-        $this->updateDescription($entity, $input);
         $entity->forceFill([
             'created_by' => user()->id,
             'updated_by' => user()->id,
             'owned_by'   => user()->id,
         ]);
-        $entity->refreshSlug();
+        $this->refreshSlug($entity);
+
+        if ($entity instanceof HasDescriptionInterface) {
+            $this->updateDescription($entity, $input);
+        }
+
         $entity->save();
 
         if (isset($input['tags'])) {
@@ -53,22 +63,31 @@ public function create(Entity $entity, array $input)
         $entity->refresh();
         $entity->rebuildPermissions();
         $entity->indexForSearch();
+
         $this->referenceStore->updateForEntity($entity);
+
+        return $entity;
     }
 
     /**
      * Update the given entity.
+     * @template T of Entity
+     * @param T $entity
+     * @return T
      */
-    public function update(Entity $entity, array $input)
+    public function update(Entity $entity, array $input): Entity
     {
         $oldUrl = $entity->getUrl();
 
         $entity->fill($input);
-        $this->updateDescription($entity, $input);
         $entity->updated_by = user()->id;
 
         if ($entity->isDirty('name') || empty($entity->slug)) {
-            $entity->refreshSlug();
+            $this->refreshSlug($entity);
+        }
+
+        if ($entity instanceof HasDescriptionInterface) {
+            $this->updateDescription($entity, $input);
         }
 
         $entity->save();
@@ -84,59 +103,35 @@ public function update(Entity $entity, array $input)
         if ($oldUrl !== $entity->getUrl()) {
             $this->referenceUpdater->updateEntityReferences($entity, $oldUrl);
         }
+
+        return $entity;
     }
 
     /**
-     * Update the given items' cover image, or clear it.
+     * Update the given items' cover image or clear it.
      *
      * @throws ImageUploadException
      * @throws \Exception
      */
-    public function updateCoverImage(Entity&CoverImageInterface $entity, ?UploadedFile $coverImage, bool $removeImage = false)
+    public function updateCoverImage(Entity&HasCoverInterface $entity, ?UploadedFile $coverImage, bool $removeImage = false): void
     {
         if ($coverImage) {
-            $imageType = $entity->coverImageTypeKey();
-            $this->imageRepo->destroyImage($entity->cover()->first());
+            $imageType = 'cover_' . $entity->type;
+            $this->imageRepo->destroyImage($entity->coverInfo()->getImage());
             $image = $this->imageRepo->saveNew($coverImage, $imageType, $entity->id, 512, 512, true);
-            $entity->cover()->associate($image);
+            $entity->coverInfo()->setImage($image);
             $entity->save();
         }
 
         if ($removeImage) {
-            $this->imageRepo->destroyImage($entity->cover()->first());
-            $entity->cover()->dissociate();
+            $this->imageRepo->destroyImage($entity->coverInfo()->getImage());
+            $entity->coverInfo()->setImage(null);
             $entity->save();
         }
     }
 
     /**
-     * Update the default page template used for this item.
-     * Checks that, if changing, the provided value is a valid template and the user
-     * has visibility of the provided page template id.
-     */
-    public function updateDefaultTemplate(Book|Chapter $entity, int $templateId): void
-    {
-        $changing = $templateId !== intval($entity->default_template_id);
-        if (!$changing) {
-            return;
-        }
-
-        if ($templateId === 0) {
-            $entity->default_template_id = null;
-            $entity->save();
-            return;
-        }
-
-        $templateExists = $this->pageQueries->visibleTemplates()
-            ->where('id', '=', $templateId)
-            ->exists();
-
-        $entity->default_template_id = $templateExists ? $templateId : null;
-        $entity->save();
-    }
-
-    /**
-     * Sort the parent of the given entity, if any auto sort actions are set for it.
+     * Sort the parent of the given entity if any auto sort actions are set for it.
      * Typically ran during create/update/insert events.
      */
     public function sortParent(Entity $entity): void
@@ -147,19 +142,32 @@ public function sortParent(Entity $entity): void
         }
     }
 
+    /**
+     * Update the description of the given entity from input data.
+     */
     protected function updateDescription(Entity $entity, array $input): void
     {
-        if (!($entity instanceof HtmlDescriptionInterface)) {
+        if (!$entity instanceof HasDescriptionInterface) {
             return;
         }
 
         if (isset($input['description_html'])) {
-            $entity->setDescriptionHtml(
+            $plainTextConverter = new HtmlToPlainText();
+            $entity->descriptionInfo()->set(
                 HtmlDescriptionFilter::filterFromString($input['description_html']),
-                html_entity_decode(strip_tags($input['description_html']))
+                $plainTextConverter->convert($input['description_html']),
             );
         } else if (isset($input['description'])) {
-            $entity->setDescriptionHtml('', $input['description']);
+            $entity->descriptionInfo()->set('', $input['description']);
         }
     }
+
+    /**
+     * Refresh the slug for the given entity.
+     */
+    public function refreshSlug(Entity $entity): void
+    {
+        $this->slugHistory->recordForEntity($entity);
+        $this->slugGenerator->regenerateForEntity($entity);
+    }
 }
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index 6d28d5d6aab..b4244b9bb77 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -30,19 +30,18 @@ public function __construct(
     public function create(array $input): Book
     {
         return (new DatabaseTransaction(function () use ($input) {
-            $book = new Book();
-
-            $this->baseRepo->create($book, $input);
+            $book = $this->baseRepo->create(new Book(), $input);
             $this->baseRepo->updateCoverImage($book, $input['image'] ?? null);
-            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id'] ?? null));
+            $book->defaultTemplate()->setFromId(intval($input['default_template_id'] ?? null));
             Activity::add(ActivityType::BOOK_CREATE, $book);
 
             $defaultBookSortSetting = intval(setting('sorting-book-default', '0'));
             if ($defaultBookSortSetting && SortRule::query()->find($defaultBookSortSetting)) {
                 $book->sort_rule_id = $defaultBookSortSetting;
-                $book->save();
             }
 
+            $book->save();
+
             return $book;
         }))->run();
     }
@@ -52,28 +51,29 @@ public function create(array $input): Book
      */
     public function update(Book $book, array $input): Book
     {
-        $this->baseRepo->update($book, $input);
+        $book = $this->baseRepo->update($book, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $this->baseRepo->updateDefaultTemplate($book, intval($input['default_template_id']));
+            $book->defaultTemplate()->setFromId(intval($input['default_template_id']));
         }
 
         if (array_key_exists('image', $input)) {
             $this->baseRepo->updateCoverImage($book, $input['image'], $input['image'] === null);
         }
 
+        $book->save();
         Activity::add(ActivityType::BOOK_UPDATE, $book);
 
         return $book;
     }
 
     /**
-     * Update the given book's cover image, or clear it.
+     * Update the given book's cover image or clear it.
      *
      * @throws ImageUploadException
      * @throws Exception
      */
-    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false)
+    public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $removeImage = false): void
     {
         $this->baseRepo->updateCoverImage($book, $coverImage, $removeImage);
     }
@@ -83,7 +83,7 @@ public function updateCoverImage(Book $book, ?UploadedFile $coverImage, bool $re
      *
      * @throws Exception
      */
-    public function destroy(Book $book)
+    public function destroy(Book $book): void
     {
         $this->trashCan->softDestroyBook($book);
         Activity::add(ActivityType::BOOK_DELETE, $book);
diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index b870ec37747..bb84b51fd5e 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -25,8 +25,7 @@ public function __construct(
     public function create(array $input, array $bookIds): Bookshelf
     {
         return (new DatabaseTransaction(function () use ($input, $bookIds) {
-            $shelf = new Bookshelf();
-            $this->baseRepo->create($shelf, $input);
+            $shelf = $this->baseRepo->create(new Bookshelf(), $input);
             $this->baseRepo->updateCoverImage($shelf, $input['image'] ?? null);
             $this->updateBooks($shelf, $bookIds);
             Activity::add(ActivityType::BOOKSHELF_CREATE, $shelf);
@@ -39,7 +38,7 @@ public function create(array $input, array $bookIds): Bookshelf
      */
     public function update(Bookshelf $shelf, array $input, ?array $bookIds): Bookshelf
     {
-        $this->baseRepo->update($shelf, $input);
+        $shelf = $this->baseRepo->update($shelf, $input);
 
         if (!is_null($bookIds)) {
             $this->updateBooks($shelf, $bookIds);
@@ -96,7 +95,7 @@ protected function updateBooks(Bookshelf $shelf, array $bookIds): void
      *
      * @throws Exception
      */
-    public function destroy(Bookshelf $shelf)
+    public function destroy(Bookshelf $shelf): void
     {
         $this->trashCan->softDestroyShelf($shelf);
         Activity::add(ActivityType::BOOKSHELF_DELETE, $shelf);
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 5d4b5297841..a528eece092 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Tools\ParentChanger;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
@@ -21,6 +22,7 @@ public function __construct(
         protected BaseRepo $baseRepo,
         protected EntityQueries $entityQueries,
         protected TrashCan $trashCan,
+        protected ParentChanger $parentChanger,
     ) {
     }
 
@@ -33,8 +35,11 @@ public function create(array $input, Book $parentBook): Chapter
             $chapter = new Chapter();
             $chapter->book_id = $parentBook->id;
             $chapter->priority = (new BookContents($parentBook))->getLastPriority() + 1;
-            $this->baseRepo->create($chapter, $input);
-            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id'] ?? null));
+
+            $chapter = $this->baseRepo->create($chapter, $input);
+            $chapter->defaultTemplate()->setFromId(intval($input['default_template_id'] ?? null));
+
+            $chapter->save();
             Activity::add(ActivityType::CHAPTER_CREATE, $chapter);
 
             $this->baseRepo->sortParent($chapter);
@@ -48,12 +53,13 @@ public function create(array $input, Book $parentBook): Chapter
      */
     public function update(Chapter $chapter, array $input): Chapter
     {
-        $this->baseRepo->update($chapter, $input);
+        $chapter = $this->baseRepo->update($chapter, $input);
 
         if (array_key_exists('default_template_id', $input)) {
-            $this->baseRepo->updateDefaultTemplate($chapter, intval($input['default_template_id']));
+            $chapter->defaultTemplate()->setFromId(intval($input['default_template_id']));
         }
 
+        $chapter->save();
         Activity::add(ActivityType::CHAPTER_UPDATE, $chapter);
 
         $this->baseRepo->sortParent($chapter);
@@ -66,7 +72,7 @@ public function update(Chapter $chapter, array $input): Chapter
      *
      * @throws Exception
      */
-    public function destroy(Chapter $chapter)
+    public function destroy(Chapter $chapter): void
     {
         $this->trashCan->softDestroyChapter($chapter);
         Activity::add(ActivityType::CHAPTER_DELETE, $chapter);
@@ -93,7 +99,7 @@ public function move(Chapter $chapter, string $parentIdentifier): Book
         }
 
         return (new DatabaseTransaction(function () use ($chapter, $parent) {
-            $chapter->changeBook($parent->id);
+            $this->parentChanger->changeBook($chapter, $parent->id);
             $chapter->rebuildPermissions();
             Activity::add(ActivityType::CHAPTER_MOVE, $chapter);
 
diff --git a/app/Entities/Repos/DeletionRepo.php b/app/Entities/Repos/DeletionRepo.php
index e47192cc2f1..5b67e5e6b52 100644
--- a/app/Entities/Repos/DeletionRepo.php
+++ b/app/Entities/Repos/DeletionRepo.php
@@ -9,11 +9,9 @@
 
 class DeletionRepo
 {
-    private TrashCan $trashCan;
-
-    public function __construct(TrashCan $trashCan)
-    {
-        $this->trashCan = $trashCan;
+    public function __construct(
+        protected TrashCan $trashCan
+    ) {
     }
 
     public function restore(int $id): int
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 76377f9a6dd..47b34f57753 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -8,10 +8,12 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Models\PageUpdateDraft;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\PageEditorType;
+use BookStack\Entities\Tools\ParentChanger;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\PermissionsException;
@@ -27,17 +29,19 @@ class PageRepo
     public function __construct(
         protected BaseRepo $baseRepo,
         protected RevisionRepo $revisionRepo,
+        protected PageUpdateDraftRepo $pageUpdateDraftRepo,
         protected EntityQueries $entityQueries,
         protected ReferenceStore $referenceStore,
         protected ReferenceUpdater $referenceUpdater,
         protected TrashCan $trashCan,
+        protected ParentChanger $parentChanger,
     ) {
     }
 
     /**
      * Get a new draft page belonging to the given parent entity.
      */
-    public function getNewDraftPage(Entity $parent)
+    public function getNewDraftPage(Entity $parent): Page
     {
         $page = (new Page())->forceFill([
             'name'       => trans('entities.pages_initial_name'),
@@ -46,6 +50,9 @@ public function getNewDraftPage(Entity $parent)
             'updated_by' => user()->id,
             'draft'      => true,
             'editor'     => PageEditorType::getSystemDefault()->value,
+            'html'       => '',
+            'markdown'   => '',
+            'text'       => '',
         ]);
 
         if ($parent instanceof Chapter) {
@@ -55,17 +62,18 @@ public function getNewDraftPage(Entity $parent)
             $page->book_id = $parent->id;
         }
 
-        $defaultTemplate = $page->chapter->defaultTemplate ?? $page->book->defaultTemplate;
-        if ($defaultTemplate && userCan(Permission::PageView, $defaultTemplate)) {
+        $defaultTemplate = $page->chapter?->defaultTemplate()->get() ?? $page->book->defaultTemplate()->get();
+        if ($defaultTemplate) {
             $page->forceFill([
                 'html'  => $defaultTemplate->html,
                 'markdown' => $defaultTemplate->markdown,
             ]);
+            $page->text = (new PageContent($page))->toPlainText();
         }
 
         (new DatabaseTransaction(function () use ($page) {
             $page->save();
-            $page->refresh()->rebuildPermissions();
+            $page->rebuildPermissions();
         }))->run();
 
         return $page;
@@ -81,10 +89,11 @@ public function publishDraft(Page $draft, array $input): Page
             $draft->revision_count = 1;
             $draft->priority = $this->getNewPriority($draft);
             $this->updateTemplateStatusAndContentFromInput($draft, $input);
-            $this->baseRepo->update($draft, $input);
+
+            $draft = $this->baseRepo->update($draft, $input);
             $draft->rebuildPermissions();
 
-            $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+            $summary = trim($input['changelog'] ?? '') ?: trans('entities.pages_initial_revision');
             $this->revisionRepo->storeNewForPage($draft, $summary);
             $draft->refresh();
 
@@ -112,22 +121,22 @@ public function setContentFromInput(Page $page, array $input): void
     public function update(Page $page, array $input): Page
     {
         // Hold the old details to compare later
-        $oldHtml = $page->html;
         $oldName = $page->name;
+        $oldHtml = $page->html;
         $oldMarkdown = $page->markdown;
 
         $this->updateTemplateStatusAndContentFromInput($page, $input);
-        $this->baseRepo->update($page, $input);
+        $page = $this->baseRepo->update($page, $input);
 
         // Update with new details
-        $page->revision_count++;
+        $page->incrementRevisionCount();
         $page->save();
 
         // Remove all update drafts for this user and page.
-        $this->revisionRepo->deleteDraftsForCurrentUser($page);
+        $this->pageUpdateDraftRepo->deleteForCurrentUser($page);
 
         // Save a revision after updating
-        $summary = trim($input['summary'] ?? '');
+        $summary = trim($input['changelog'] ?? '');
         $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
         $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
         $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
@@ -176,21 +185,25 @@ protected function updateTemplateStatusAndContentFromInput(Page $page, array $in
     /**
      * Save a page update draft.
      */
-    public function updatePageDraft(Page $page, array $input)
+    public function updatePageDraft(Page $page, array $input): Page|PageUpdateDraft
     {
-        // If the page itself is a draft simply update that
+        // If the page itself is a draft, simply update that
         if ($page->draft) {
             $this->updateTemplateStatusAndContentFromInput($page, $input);
-            $page->fill($input);
+            $page->forceFill(array_intersect_key($input, array_flip(['name'])))->save();
             $page->save();
 
             return $page;
         }
 
         // Otherwise, save the data to a revision
-        $draft = $this->revisionRepo->getNewDraftForCurrentUser($page);
+        $draft = $this->pageUpdateDraftRepo->getNewForCurrentUser($page);
         $draft->fill($input);
 
+        if (isset($input['changelog'])) {
+            $draft->summary = $input['changelog'];
+        }
+
         if (!empty($input['markdown'])) {
             $draft->markdown = $input['markdown'];
             $draft->html = '';
@@ -209,7 +222,7 @@ public function updatePageDraft(Page $page, array $input)
      *
      * @throws Exception
      */
-    public function destroy(Page $page)
+    public function destroy(Page $page): void
     {
         $this->trashCan->softDestroyPage($page);
         Activity::add(ActivityType::PAGE_DELETE, $page);
@@ -222,7 +235,7 @@ public function destroy(Page $page)
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $oldUrl = $page->getUrl();
-        $page->revision_count++;
+        $page->incrementRevisionCount();
 
         /** @var PageRevision $revision */
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
@@ -237,7 +250,7 @@ public function restoreRevision(Page $page, int $revisionId): Page
         }
 
         $page->updated_by = user()->id;
-        $page->refreshSlug();
+        $this->baseRepo->refreshSlug($page);
         $page->save();
         $page->indexForSearch();
         $this->referenceStore->updateForEntity($page);
@@ -279,7 +292,7 @@ public function move(Page $page, string $parentIdentifier): Entity
         return (new DatabaseTransaction(function () use ($page, $parent) {
             $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
             $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
-            $page->changeBook($newBookId);
+            $this->parentChanger->changeBook($page, $newBookId);
             $page->rebuildPermissions();
 
             Activity::add(ActivityType::PAGE_MOVE, $page);
diff --git a/app/Entities/Repos/PageUpdateDraftRepo.php b/app/Entities/Repos/PageUpdateDraftRepo.php
new file mode 100644
index 00000000000..085beec1884
--- /dev/null
+++ b/app/Entities/Repos/PageUpdateDraftRepo.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\Entities\Repos;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\PageUpdateDraft;
+use BookStack\Entities\Queries\PageUpdateDraftQueries;
+
+class PageUpdateDraftRepo
+{
+    public function __construct(
+        protected PageUpdateDraftQueries $queries,
+    ) {
+    }
+
+    /**
+     * Delete all drafts revisions, for the given page, belonging to the current user.
+     */
+    public function deleteForCurrentUser(Page $page): void
+    {
+        $this->queries->latestCurrentUserDraftsForPageId($page->id)->reorder()->delete();
+    }
+
+    /**
+     * Get a new page update draft for the given page.
+     * Checks for an existing draft before providing a fresh one.
+     */
+    public function getNewForCurrentUser(Page $page): PageUpdateDraft
+    {
+        $draft = $this->queries->findLatestCurrentUserDraftsForPageId($page->id);
+        if ($draft) {
+            return $draft;
+        }
+
+        $draft = new PageUpdateDraft();
+        $draft->page_id = $page->id;
+        $draft->created_by = user()->id;
+
+        return $draft;
+    }
+}
diff --git a/app/Entities/Repos/RevisionRepo.php b/app/Entities/Repos/RevisionRepo.php
index d5549a0f14a..0ee361ebeb6 100644
--- a/app/Entities/Repos/RevisionRepo.php
+++ b/app/Entities/Repos/RevisionRepo.php
@@ -13,36 +13,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * Delete all drafts revisions, for the given page, belonging to the current user.
-     */
-    public function deleteDraftsForCurrentUser(Page $page): void
-    {
-        $this->queries->latestCurrentUserDraftsForPageId($page->id)->delete();
-    }
-
-    /**
-     * Get a user update_draft page revision to update for the given page.
-     * Checks for an existing revisions before providing a fresh one.
-     */
-    public function getNewDraftForCurrentUser(Page $page): PageRevision
-    {
-        $draft = $this->queries->findLatestCurrentUserDraftsForPageId($page->id);
-
-        if ($draft) {
-            return $draft;
-        }
-
-        $draft = new PageRevision();
-        $draft->page_id = $page->id;
-        $draft->slug = $page->slug;
-        $draft->book_slug = $page->book->slug;
-        $draft->created_by = user()->id;
-        $draft->type = 'update_draft';
-
-        return $draft;
-    }
-
     /**
      * Store a new revision in the system for the given page.
      */
@@ -59,9 +29,11 @@ public function storeNewForPage(Page $page, ?string $summary = null): PageRevisi
         $revision->book_slug = $page->book->slug;
         $revision->created_by = user()->id;
         $revision->created_at = $page->updated_at;
-        $revision->type = 'version';
         $revision->summary = $summary;
-        $revision->revision_number = $page->revision_count;
+
+        $pageDraftMaxRevision = $this->queries->maxRevisionVersionNumberForPageId($page->id);
+        $revision->revision_number = max($page->revision_count, $pageDraftMaxRevision + 1);
+
         $revision->save();
 
         $this->deleteOldRevisions($page);
@@ -72,7 +44,7 @@ public function storeNewForPage(Page $page, ?string $summary = null): PageRevisi
     /**
      * Delete old revisions, for the given page, from the system.
      */
-    protected function deleteOldRevisions(Page $page)
+    protected function deleteOldRevisions(Page $page): void
     {
         $revisionLimit = config('app.revision_limit');
         if ($revisionLimit === false) {
diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php
index 7dd3f3e11ad..4bbab626520 100644
--- a/app/Entities/Tools/BookContents.php
+++ b/app/Entities/Tools/BookContents.php
@@ -3,13 +3,10 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
-use BookStack\Sorting\BookSortMap;
-use BookStack\Sorting\BookSortMapItem;
 use Illuminate\Support\Collection;
 
 class BookContents
@@ -29,7 +26,7 @@ public function getLastPriority(): int
     {
         $maxPage = $this->book->pages()
             ->where('draft', '=', false)
-            ->where('chapter_id', '=', 0)
+            ->whereDoesntHave('chapter')
             ->max('priority');
 
         $maxChapter = $this->book->chapters()
@@ -80,11 +77,11 @@ public function getTree(bool $showDrafts = false, bool $renderPages = false): Co
     protected function bookChildSortFunc(): callable
     {
         return function (Entity $entity) {
-            if (isset($entity['draft']) && $entity['draft']) {
+            if ($entity->getAttribute('draft') ?? false) {
                 return -100;
             }
 
-            return $entity['priority'] ?? 0;
+            return $entity->getAttribute('priority') ?? 0;
         };
     }
 
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 05618fef461..64c48c351ae 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -6,37 +6,54 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\HasCoverInterface;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\CoverImageInterface;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Permissions\Permission;
+use BookStack\References\ReferenceChangeContext;
+use BookStack\References\ReferenceUpdater;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use Illuminate\Http\UploadedFile;
 
 class Cloner
 {
+    protected ReferenceChangeContext $referenceChangeContext;
+
     public function __construct(
         protected PageRepo $pageRepo,
         protected ChapterRepo $chapterRepo,
         protected BookRepo $bookRepo,
         protected ImageService $imageService,
+        protected ReferenceUpdater $referenceUpdater,
     ) {
+        $this->referenceChangeContext = new ReferenceChangeContext();
     }
 
     /**
      * Clone the given page into the given parent using the provided name.
      */
     public function clonePage(Page $original, Entity $parent, string $newName): Page
+    {
+        $context = $this->newReferenceChangeContext();
+        $page = $this->createPageClone($original, $parent, $newName);
+        $this->referenceUpdater->changeReferencesUsingContext($context);
+        return $page;
+    }
+
+    protected function createPageClone(Page $original, Entity $parent, string $newName): Page
     {
         $copyPage = $this->pageRepo->getNewDraftPage($parent);
         $pageData = $this->entityToInputData($original);
         $pageData['name'] = $newName;
 
-        return $this->pageRepo->publishDraft($copyPage, $pageData);
+        $newPage = $this->pageRepo->publishDraft($copyPage, $pageData);
+        $this->referenceChangeContext->add($original, $newPage);
+
+        return $newPage;
     }
 
     /**
@@ -44,6 +61,14 @@ public function clonePage(Page $original, Entity $parent, string $newName): Page
      * Clones all child pages.
      */
     public function cloneChapter(Chapter $original, Book $parent, string $newName): Chapter
+    {
+        $context = $this->newReferenceChangeContext();
+        $chapter = $this->createChapterClone($original, $parent, $newName);
+        $this->referenceUpdater->changeReferencesUsingContext($context);
+        return $chapter;
+    }
+
+    protected function createChapterClone(Chapter $original, Book $parent, string $newName): Chapter
     {
         $chapterDetails = $this->entityToInputData($original);
         $chapterDetails['name'] = $newName;
@@ -53,10 +78,12 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
         if (userCan(Permission::PageCreate, $copyChapter)) {
             /** @var Page $page */
             foreach ($original->getVisiblePages() as $page) {
-                $this->clonePage($page, $copyChapter, $page->name);
+                $this->createPageClone($page, $copyChapter, $page->name);
             }
         }
 
+        $this->referenceChangeContext->add($original, $copyChapter);
+
         return $copyChapter;
     }
 
@@ -65,6 +92,14 @@ public function cloneChapter(Chapter $original, Book $parent, string $newName):
      * Clones all child chapters and pages.
      */
     public function cloneBook(Book $original, string $newName): Book
+    {
+        $context = $this->newReferenceChangeContext();
+        $book = $this->createBookClone($original, $newName);
+        $this->referenceUpdater->changeReferencesUsingContext($context);
+        return $book;
+    }
+
+    protected function createBookClone(Book $original, string $newName): Book
     {
         $bookDetails = $this->entityToInputData($original);
         $bookDetails['name'] = $newName;
@@ -76,11 +111,11 @@ public function cloneBook(Book $original, string $newName): Book
         $directChildren = $original->getDirectVisibleChildren();
         foreach ($directChildren as $child) {
             if ($child instanceof Chapter && userCan(Permission::ChapterCreate, $copyBook)) {
-                $this->cloneChapter($child, $copyBook, $child->name);
+                $this->createChapterClone($child, $copyBook, $child->name);
             }
 
             if ($child instanceof Page && !$child->draft && userCan(Permission::PageCreate, $copyBook)) {
-                $this->clonePage($child, $copyBook, $child->name);
+                $this->createPageClone($child, $copyBook, $child->name);
             }
         }
 
@@ -92,6 +127,8 @@ public function cloneBook(Book $original, string $newName): Book
             }
         }
 
+        $this->referenceChangeContext->add($original, $copyBook);
+
         return $copyBook;
     }
 
@@ -106,8 +143,8 @@ public function entityToInputData(Entity $entity): array
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity
-        if ($entity instanceof CoverImageInterface) {
-            $cover = $entity->cover()->first();
+        if ($entity instanceof HasCoverInterface) {
+            $cover = $entity->coverInfo()->getImage();
             if ($cover) {
                 $inputData['image'] = $this->imageToUploadedFile($cover);
             }
@@ -155,4 +192,10 @@ protected function entityTagsToInputArray(Entity $entity): array
 
         return $tags;
     }
+
+    protected function newReferenceChangeContext(): ReferenceChangeContext
+    {
+        $this->referenceChangeContext = new ReferenceChangeContext();
+        return $this->referenceChangeContext;
+    }
 }
diff --git a/app/Entities/Tools/EntityCover.php b/app/Entities/Tools/EntityCover.php
new file mode 100644
index 00000000000..1e8fce201dd
--- /dev/null
+++ b/app/Entities/Tools/EntityCover.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Uploads\Image;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+
+class EntityCover
+{
+    public function __construct(
+        protected Book|Bookshelf $entity,
+    ) {
+    }
+
+    protected function imageQuery(): Builder
+    {
+        return Image::query()->where('id', '=', $this->entity->image_id);
+    }
+
+    /**
+     * Check if a cover image exists for this entity.
+     */
+    public function exists(): bool
+    {
+        return $this->entity->image_id !== null && $this->imageQuery()->exists();
+    }
+
+    /**
+     * Get the assigned cover image model.
+     */
+    public function getImage(): Image|null
+    {
+        if ($this->entity->image_id === null) {
+            return null;
+        }
+
+        $cover = $this->imageQuery()->first();
+        if ($cover instanceof Image) {
+            return $cover;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a cover image URL, or the given default if none assigned/existing.
+     */
+    public function getUrl(int $width = 440, int $height = 250, string|null $default = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='): string|null
+    {
+        if (!$this->entity->image_id) {
+            return $default;
+        }
+
+        try {
+            return $this->getImage()?->getThumb($width, $height, false) ?? $default;
+        } catch (Exception $err) {
+            return $default;
+        }
+    }
+
+    /**
+     * Set the image to use as the cover for this entity.
+     */
+    public function setImage(Image|null $image): void
+    {
+        if ($image === null) {
+            $this->entity->image_id = null;
+        } else {
+            $this->entity->image_id = $image->id;
+        }
+    }
+}
diff --git a/app/Entities/Tools/EntityDefaultTemplate.php b/app/Entities/Tools/EntityDefaultTemplate.php
new file mode 100644
index 00000000000..d36c3f270e8
--- /dev/null
+++ b/app/Entities/Tools/EntityDefaultTemplate.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\PageQueries;
+
+class EntityDefaultTemplate
+{
+    public function __construct(
+        protected Book|Chapter $entity,
+    ) {
+    }
+
+    /**
+     * Set the default template ID for this entity.
+     */
+    public function setFromId(int $templateId): void
+    {
+        $changing = $templateId !== intval($this->entity->default_template_id);
+        if (!$changing) {
+            return;
+        }
+
+        if ($templateId === 0) {
+            $this->entity->default_template_id = null;
+            return;
+        }
+
+        $pageQueries = app()->make(PageQueries::class);
+        $templateExists = $pageQueries->visibleTemplates()
+            ->where('id', '=', $templateId)
+            ->exists();
+
+        $this->entity->default_template_id = $templateExists ? $templateId : null;
+    }
+
+    /**
+     * Get the default template for this entity (if visible).
+     */
+    public function get(): Page|null
+    {
+        if (!$this->entity->default_template_id) {
+            return null;
+        }
+
+        $pageQueries = app()->make(PageQueries::class);
+        $page = $pageQueries->visibleTemplates(true)
+            ->where('id', '=', $this->entity->default_template_id)
+            ->first();
+
+        if ($page instanceof Page) {
+            return $page;
+        }
+
+        return null;
+    }
+}
diff --git a/app/Entities/Tools/EntityHtmlDescription.php b/app/Entities/Tools/EntityHtmlDescription.php
new file mode 100644
index 00000000000..052088c04d6
--- /dev/null
+++ b/app/Entities/Tools/EntityHtmlDescription.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
+
+class EntityHtmlDescription
+{
+    protected string $html = '';
+    protected string $plain = '';
+
+    public function __construct(
+        protected Book|Chapter|Bookshelf $entity,
+    ) {
+        $this->html = $this->entity->description_html ?? '';
+        $this->plain = $this->entity->description ?? '';
+    }
+
+    /**
+     * Update the description from HTML code.
+     * Optionally takes plaintext to use for the model also.
+     */
+    public function set(string $html, string|null $plaintext = null): void
+    {
+        $this->html = $html;
+        $this->entity->description_html = $this->html;
+
+        if ($plaintext !== null) {
+            $this->plain = $plaintext;
+            $this->entity->description = $this->plain;
+        }
+
+        if (empty($html) && !empty($plaintext)) {
+            $this->html = $this->getHtml();
+            $this->entity->description_html = $this->html;
+        }
+    }
+
+    /**
+     * Get the description as HTML.
+     * Optionally returns the raw HTML if requested.
+     */
+    public function getHtml(bool $raw = false): string
+    {
+        $html = $this->html ?: '<p>' . nl2br(e($this->plain)) . '</p>';
+        if ($raw) {
+            return $html;
+        }
+
+        $isEmpty = empty(trim(strip_tags($html)));
+        if ($isEmpty) {
+            return '<p></p>';
+        }
+
+        $filter = new HtmlContentFilter(new HtmlContentFilterConfig());
+        return $filter->filterString($html);
+    }
+
+    public function getPlain(): string
+    {
+        return $this->plain;
+    }
+}
diff --git a/app/Entities/Tools/EntityHydrator.php b/app/Entities/Tools/EntityHydrator.php
new file mode 100644
index 00000000000..87e39d222ec
--- /dev/null
+++ b/app/Entities/Tools/EntityHydrator.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Activity\Models\Tag;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\EntityTable;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\EntityQueries;
+use Illuminate\Database\Eloquent\Collection;
+
+class EntityHydrator
+{
+    public function __construct(
+        protected EntityQueries $entityQueries,
+    ) {
+    }
+
+    /**
+     * Hydrate the entities of this hydrator to return a list of entities represented
+     * in their original intended models.
+     * @param EntityTable[] $entities
+     * @return Entity[]
+     */
+    public function hydrate(array $entities, bool $loadTags = false, bool $loadParents = false): array
+    {
+        $hydrated = [];
+
+        foreach ($entities as $entity) {
+            $data = $entity->getRawOriginal();
+            $instance = Entity::instanceFromType($entity->type);
+
+            if ($instance instanceof Page) {
+                $data['text'] = $data['description'];
+                unset($data['description']);
+            }
+
+            $instance = $instance->setRawAttributes($data, true);
+            $hydrated[] = $instance;
+        }
+
+        if ($loadTags) {
+            $this->loadTagsIntoModels($hydrated);
+        }
+
+        if ($loadParents) {
+            $this->loadParentsIntoModels($hydrated);
+        }
+
+        return $hydrated;
+    }
+
+    /**
+     * @param Entity[] $entities
+     */
+    protected function loadTagsIntoModels(array $entities): void
+    {
+        $idsByType = [];
+        $entityMap = [];
+        foreach ($entities as $entity) {
+            if (!isset($idsByType[$entity->type])) {
+                $idsByType[$entity->type] = [];
+            }
+            $idsByType[$entity->type][] = $entity->id;
+            $entityMap[$entity->type . ':' . $entity->id] = $entity;
+        }
+
+        $query = Tag::query();
+        foreach ($idsByType as $type => $ids) {
+            $query->orWhere(function ($query) use ($type, $ids) {
+                $query->where('entity_type', '=', $type)
+                    ->whereIn('entity_id', $ids);
+            });
+        }
+
+        $tags = empty($idsByType) ? [] : $query->get()->all();
+        $tagMap = [];
+        foreach ($tags as $tag) {
+            $key = $tag->entity_type . ':' . $tag->entity_id;
+            if (!isset($tagMap[$key])) {
+                $tagMap[$key] = [];
+            }
+            $tagMap[$key][] = $tag;
+        }
+
+        foreach ($entityMap as $key => $entity) {
+            $entityTags = new Collection($tagMap[$key] ?? []);
+            $entity->setRelation('tags', $entityTags);
+        }
+    }
+
+    /**
+     * @param Entity[] $entities
+     */
+    protected function loadParentsIntoModels(array $entities): void
+    {
+        $parentsByType = ['book' => [], 'chapter' => []];
+
+        foreach ($entities as $entity) {
+            if ($entity->getAttribute('book_id') !== null) {
+                $parentsByType['book'][] = $entity->getAttribute('book_id');
+            }
+            if ($entity->getAttribute('chapter_id') !== null) {
+                $parentsByType['chapter'][] = $entity->getAttribute('chapter_id');
+            }
+        }
+
+        $parentQuery = $this->entityQueries->visibleForList();
+        $filtered = count($parentsByType['book']) > 0 || count($parentsByType['chapter']) > 0;
+        $parentQuery = $parentQuery->where(function ($query) use ($parentsByType) {
+            foreach ($parentsByType as $type => $ids) {
+                if (count($ids) > 0) {
+                    $query = $query->orWhere(function ($query) use ($type, $ids) {
+                        $query->where('type', '=', $type)
+                            ->whereIn('id', $ids);
+                    });
+                }
+            }
+        });
+
+        $parentModels = $filtered ? $parentQuery->get()->all() : [];
+        $parents = $this->hydrate($parentModels);
+        $parentMap = [];
+        foreach ($parents as $parent) {
+            $parentMap[$parent->type . ':' . $parent->id] = $parent;
+        }
+
+        foreach ($entities as $entity) {
+            if ($entity instanceof Page || $entity instanceof Chapter) {
+                $key = 'book:' . $entity->getRawAttribute('book_id');
+                $entity->setRelation('book', $parentMap[$key] ?? null);
+            }
+            if ($entity instanceof Page) {
+                $key = 'chapter:' . $entity->getRawAttribute('chapter_id');
+                $entity->setRelation('chapter', $parentMap[$key] ?? null);
+            }
+        }
+    }
+}
diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php
index b0d8880f402..59edb5d1fda 100644
--- a/app/Entities/Tools/HierarchyTransformer.php
+++ b/app/Entities/Tools/HierarchyTransformer.php
@@ -17,7 +17,8 @@ public function __construct(
         protected BookRepo $bookRepo,
         protected BookshelfRepo $shelfRepo,
         protected Cloner $cloner,
-        protected TrashCan $trashCan
+        protected TrashCan $trashCan,
+        protected ParentChanger $parentChanger,
     ) {
     }
 
@@ -34,12 +35,14 @@ public function transformChapterToBook(Chapter $chapter): Book
         /** @var Page $page */
         foreach ($chapter->pages as $page) {
             $page->chapter_id = 0;
-            $page->changeBook($book->id);
+            $page->save();
+            $this->parentChanger->changeBook($page, $book->id);
         }
 
         $this->trashCan->destroyEntity($chapter);
 
         Activity::add(ActivityType::BOOK_CREATE_FROM_CHAPTER, $book);
+        $book->rebuildPermissions();
 
         return $book;
     }
diff --git a/app/Entities/Tools/Markdown/CustomListItemRenderer.php b/app/Entities/Tools/Markdown/CustomListItemRenderer.php
index 0c506d7f9b5..14cdaa2eaa4 100644
--- a/app/Entities/Tools/Markdown/CustomListItemRenderer.php
+++ b/app/Entities/Tools/Markdown/CustomListItemRenderer.php
@@ -25,9 +25,13 @@ public function __construct()
      */
     public function render(Node $node, ChildNodeRendererInterface $childRenderer)
     {
+        if (!($node instanceof ListItem)) {
+            return null;
+        }
+
         $listItem = $this->baseRenderer->render($node, $childRenderer);
 
-        if ($node instanceof ListItem && $this->startsTaskListItem($node) && $listItem instanceof HtmlElement) {
+        if ($this->startsTaskListItem($node) && $listItem instanceof HtmlElement) {
             $listItem->setAttribute('class', 'task-list-item');
         }
 
diff --git a/app/Entities/Tools/MixedEntityListLoader.php b/app/Entities/Tools/MixedEntityListLoader.php
index f9a940b981b..9987cc061ce 100644
--- a/app/Entities/Tools/MixedEntityListLoader.php
+++ b/app/Entities/Tools/MixedEntityListLoader.php
@@ -19,7 +19,7 @@ public function __construct(
      * This will look for a model id and type via 'name_id' and 'name_type'.
      * @param Model[] $relations
      */
-    public function loadIntoRelations(array $relations, string $relationName, bool $loadParents): void
+    public function loadIntoRelations(array $relations, string $relationName, bool $loadParents, bool $withContents = false): void
     {
         $idsByType = [];
         foreach ($relations as $relation) {
@@ -33,7 +33,7 @@ public function loadIntoRelations(array $relations, string $relationName, bool $
             $idsByType[$type][] = $id;
         }
 
-        $modelMap = $this->idsByTypeToModelMap($idsByType, $loadParents);
+        $modelMap = $this->idsByTypeToModelMap($idsByType, $loadParents, $withContents);
 
         foreach ($relations as $relation) {
             $type = $relation->getAttribute($relationName . '_type');
@@ -49,13 +49,13 @@ public function loadIntoRelations(array $relations, string $relationName, bool $
      * @param array<string, int[]> $idsByType
      * @return array<string, array<int, Model>>
      */
-    protected function idsByTypeToModelMap(array $idsByType, bool $eagerLoadParents): array
+    protected function idsByTypeToModelMap(array $idsByType, bool $eagerLoadParents, bool $withContents): array
     {
         $modelMap = [];
 
         foreach ($idsByType as $type => $ids) {
-            $models = $this->queries->visibleForList($type)
-                ->whereIn('id', $ids)
+            $base = $withContents ? $this->queries->visibleForContentForType($type) : $this->queries->visibleForListForType($type);
+            $models = $base->whereIn('id', $ids)
                 ->with($eagerLoadParents ? $this->getRelationsToEagerLoad($type) : [])
                 ->get();
 
diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 4b1d77db720..c66dcbe4151 100644
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Entities\Tools;
 
+use BookStack\App\AppVersion;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
@@ -13,7 +14,9 @@
 use BookStack\Uploads\ImageService;
 use BookStack\Users\Models\User;
 use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
 use BookStack\Util\HtmlDocument;
+use BookStack\Util\HtmlToPlainText;
 use BookStack\Util\WebSafeMimeSniffer;
 use Closure;
 use DOMElement;
@@ -37,7 +40,14 @@ public function __construct(
     public function setNewHTML(string $html, User $updater): void
     {
         $html = $this->extractBase64ImagesFromHtml($html, $updater);
-        $this->page->html = $this->formatHtml($html);
+        $html = $this->formatHtml($html);
+
+        $themeResult = Theme::dispatch(ThemeEvents::PAGE_CONTENT_PRE_STORE, $html, $this->page);
+        if (is_string($themeResult)) {
+            $html = $themeResult;
+        }
+
+        $this->page->html = $html;
         $this->page->text = $this->toPlainText();
         $this->page->markdown = '';
     }
@@ -50,7 +60,14 @@ public function setNewMarkdown(string $markdown, User $updater): void
         $markdown = $this->extractBase64ImagesFromMarkdown($markdown, $updater);
         $this->page->markdown = $markdown;
         $html = (new MarkdownToHtml($markdown))->convert();
-        $this->page->html = $this->formatHtml($html);
+        $html = $this->formatHtml($html);
+
+        $themeResult = Theme::dispatch(ThemeEvents::PAGE_CONTENT_PRE_STORE, $html, $this->page);
+        if (is_string($themeResult)) {
+            $html = $themeResult;
+        }
+
+        $this->page->html = $html;
         $this->page->text = $this->toPlainText();
     }
 
@@ -79,7 +96,7 @@ protected function extractBase64ImagesFromHtml(string $htmlText, User $updater):
 
     /**
      * Convert all inline base64 content to uploaded image files.
-     * Regex is used to locate the start of data-uri definitions then
+     * Regex is used to locate the start of data-uri definitions, then
      * manual looping over content is done to parse the whole data uri.
      * Attempting to capture the whole data uri using regex can cause PHP
      * PCRE limits to be hit with larger, multi-MB, files.
@@ -284,11 +301,11 @@ protected function setUniqueId(DOMNode $element, array &$idMap): array
     /**
      * Get a plain-text visualisation of this page.
      */
-    protected function toPlainText(): string
+    public function toPlainText(): string
     {
         $html = $this->render(true);
-
-        return html_entity_decode(strip_tags($html));
+        $converter = new HtmlToPlainText();
+        return $converter->convert($html);
     }
 
     /**
@@ -299,7 +316,7 @@ public function render(bool $blankIncludes = false): string
         $html = $this->page->html ?? '';
 
         if (empty($html)) {
-            return $html;
+            return $this->handlePostRender('');
         }
 
         $doc = new HtmlDocument($html);
@@ -317,11 +334,36 @@ public function render(bool $blankIncludes = false): string
             $this->updateIdsRecursively($doc->getBody(), 0, $idMap, $changeMap);
         }
 
-        if (!config('app.allow_content_scripts')) {
-            HtmlContentFilter::removeScriptsFromDocument($doc);
+        $cacheKey = $this->getContentCacheKey($doc->getBodyInnerHtml());
+        $cached = cache()->get($cacheKey, null);
+        if ($cached !== null) {
+            return $this->handlePostRender($cached);
         }
 
-        return $doc->getBodyInnerHtml();
+        $filterConfig = HtmlContentFilterConfig::fromConfigString(config('app.content_filtering'));
+        $filter = new HtmlContentFilter($filterConfig);
+        $filtered = $filter->filterDocument($doc);
+
+        $cacheTime = 86400 * 7; // 1 week
+        cache()->put($cacheKey, $filtered, $cacheTime);
+
+        return $this->handlePostRender($filtered);
+    }
+
+    protected function handlePostRender(string $html): string
+    {
+        $themeResult = Theme::dispatch(ThemeEvents::PAGE_CONTENT_POST_RENDER, $html, $this->page);
+        return is_string($themeResult) ? $themeResult : $html;
+    }
+
+    protected function getContentCacheKey(string $html): string
+    {
+        $contentHash = md5($html);
+        $contentId = $this->page->id;
+        $contentTime = $this->page->updated_at->timestamp ?? time();
+        $appVersion = AppVersion::get();
+        $filterConfig = config('app.content_filtering') ?? '';
+        return "page-content-cache::{$filterConfig}::{$appVersion}::{$contentId}::{$contentTime}::{$contentHash}";
     }
 
     /**
@@ -379,28 +421,41 @@ public function getNavigation(string $htmlContent): array
      */
     protected function headerNodesToLevelList(DOMNodeList $nodeList): array
     {
-        $tree = collect($nodeList)->map(function (DOMElement $header) {
+        $minLevel = 6;
+
+        $headerDetails = array_map(function (DOMNode $header) use (&$minLevel) {
+            if (!$header instanceof DOMElement) {
+                return null;
+            }
+
             $text = trim(str_replace("\xc2\xa0", ' ', $header->nodeValue));
             $text = mb_substr($text, 0, 100);
 
+            if (empty($text)) {
+                return null;
+            }
+
+            $level = intval(str_replace('h', '', $header->nodeName));
+            if ($level < $minLevel) {
+                $minLevel = $level;
+            }
+
             return [
                 'nodeName' => strtolower($header->nodeName),
-                'level'    => intval(str_replace('h', '', $header->nodeName)),
+                'level'    => $level,
                 'link'     => '#' . $header->getAttribute('id'),
                 'text'     => $text,
             ];
-        })->filter(function ($header) {
-            return mb_strlen($header['text']) > 0;
-        });
+        }, [...$nodeList]);
 
-        // Shift headers if only smaller headers have been used
-        $levelChange = ($tree->pluck('level')->min() - 1);
-        $tree = $tree->map(function ($header) use ($levelChange) {
-            $header['level'] -= ($levelChange);
+        $filtered = array_values(array_filter($headerDetails));
 
-            return $header;
-        });
+        // Shift headers if only smaller headers have been used
+        $levelChange = ($minLevel - 1);
+        foreach ($filtered as $index => $header) {
+            $filtered[$index]['level'] -= $levelChange;
+        }
 
-        return $tree->toArray();
+        return $filtered;
     }
 }
diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php
index 22f89bf62be..0f9f9388282 100644
--- a/app/Entities/Tools/PageEditActivity.php
+++ b/app/Entities/Tools/PageEditActivity.php
@@ -3,7 +3,7 @@
 namespace BookStack\Entities\Tools;
 
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Models\PageUpdateDraft;
 use BookStack\Util\DateFormatter;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
@@ -33,7 +33,6 @@ public function activeEditingMessage(): string
 
         $userMessage = trans('entities.pages_draft_edit_active.start_a', ['count' => $count]);
         if ($count === 1) {
-            /** @var PageRevision $firstDraft */
             $firstDraft = $pageDraftEdits->first();
             $userMessage = trans('entities.pages_draft_edit_active.start_b', ['userName' => $firstDraft->createdBy->name ?? '']);
         }
@@ -48,7 +47,7 @@ public function activeEditingMessage(): string
      *
      * @return string[]
      */
-    public function getWarningMessagesForDraft(Page|PageRevision $draft): array
+    public function getWarningMessagesForDraft(Page|PageUpdateDraft $draft): array
     {
         $warnings = [];
 
@@ -56,7 +55,7 @@ public function getWarningMessagesForDraft(Page|PageRevision $draft): array
             $warnings[] = $this->activeEditingMessage();
         }
 
-        if ($draft instanceof PageRevision && $this->hasPageBeenUpdatedSinceDraftCreated($draft)) {
+        if ($draft instanceof PageUpdateDraft && $this->hasPageBeenUpdatedSinceDraftCreated($draft)) {
             $warnings[] = trans('entities.pages_draft_page_changed_since_creation');
         }
 
@@ -66,7 +65,7 @@ public function getWarningMessagesForDraft(Page|PageRevision $draft): array
     /**
      * Check if the page has been updated since the draft has been saved.
      */
-    protected function hasPageBeenUpdatedSinceDraftCreated(PageRevision $draft): bool
+    protected function hasPageBeenUpdatedSinceDraftCreated(PageUpdateDraft $draft): bool
     {
         return $draft->page->updated_at->timestamp > $draft->created_at->timestamp;
     }
@@ -74,7 +73,7 @@ protected function hasPageBeenUpdatedSinceDraftCreated(PageRevision $draft): boo
     /**
      * Get the message to show when the user will be editing one of their drafts.
      */
-    public function getEditingActiveDraftMessage(PageRevision $draft): string
+    public function getEditingActiveDraftMessage(PageUpdateDraft $draft): string
     {
         $formatter = resolve(DateFormatter::class);
         $message = trans('entities.pages_editing_draft_notification', ['timeDiff' => $formatter->relative($draft->updated_at)]);
@@ -88,12 +87,13 @@ public function getEditingActiveDraftMessage(PageRevision $draft): string
     /**
      * A query to check for active update drafts on a particular page
      * within the last given many minutes.
+     *
+     * @return Builder<PageUpdateDraft>
      */
     protected function activePageEditingQuery(int $withinMinutes): Builder
     {
         $checkTime = Carbon::now()->subMinutes($withinMinutes);
-        $query = PageRevision::query()
-            ->where('type', '=', 'update_draft')
+        $query = PageUpdateDraft::query()
             ->where('page_id', '=', $this->page->id)
             ->where('updated_at', '>', $this->page->updated_at)
             ->where('created_by', '!=', user()->id)
diff --git a/app/Entities/Tools/PageEditorData.php b/app/Entities/Tools/PageEditorData.php
index b41b319095e..ccbc65856eb 100644
--- a/app/Entities/Tools/PageEditorData.php
+++ b/app/Entities/Tools/PageEditorData.php
@@ -8,6 +8,8 @@
 use BookStack\Entities\Tools\Markdown\HtmlToMarkdown;
 use BookStack\Entities\Tools\Markdown\MarkdownToHtml;
 use BookStack\Permissions\Permission;
+use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
 
 class PageEditorData
 {
@@ -47,22 +49,32 @@ protected function build(): array
         $isDraftRevision = false;
         $this->warnings = [];
         $editActivity = new PageEditActivity($page);
+        $lastEditorId = $page->updated_by ?? user()->id;
 
         if ($editActivity->hasActiveEditing()) {
             $this->warnings[] = $editActivity->activeEditingMessage();
         }
 
         // Check for a current draft version for this user
-        $userDraft = $this->queries->revisions->findLatestCurrentUserDraftsForPageId($page->id);
+        $userDraft = $this->queries->updateDrafts->findLatestCurrentUserDraftsForPageId($page->id);
         if (!is_null($userDraft)) {
-            $page->forceFill($userDraft->only(['name', 'html', 'markdown']));
+            $page->forceFill($userDraft->only(['name', 'html', 'markdown', 'summary']));
             $isDraftRevision = true;
             $this->warnings[] = $editActivity->getEditingActiveDraftMessage($userDraft);
+            $lastEditorId = $userDraft->created_by;
         }
 
+        // Get editor type and handle changes
         $editorType = $this->getEditorType($page);
         $this->updateContentForEditor($page, $editorType);
 
+        // Filter HTML content if required
+        if ($editorType->isHtmlBased() && !old('html') && $lastEditorId !== user()->id) {
+            $filterConfig = HtmlContentFilterConfig::fromConfigString(config('app.content_filtering'));
+            $filter = new HtmlContentFilter($filterConfig);
+            $page->html = $filter->filterString($page->html);
+        }
+
         return [
             'page'            => $page,
             'book'            => $page->book,
diff --git a/app/Entities/Tools/PageIncludeParser.php b/app/Entities/Tools/PageIncludeParser.php
index af7ed4fc6a1..16917f41c8e 100644
--- a/app/Entities/Tools/PageIncludeParser.php
+++ b/app/Entities/Tools/PageIncludeParser.php
@@ -192,10 +192,10 @@ protected function splitNodeAtChildNode(DOMElement $parentNode, DOMNode $domNode
     /**
      * Get the parent paragraph of the given node, if existing.
      */
-    protected function getParentParagraph(DOMNode $parent): ?DOMNode
+    protected function getParentParagraph(DOMNode $parent): ?DOMElement
     {
         do {
-            if (strtolower($parent->nodeName) === 'p') {
+            if (strtolower($parent->nodeName) === 'p' && $parent instanceof DOMElement) {
                 return $parent;
             }
 
diff --git a/app/Entities/Tools/ParentChanger.php b/app/Entities/Tools/ParentChanger.php
new file mode 100644
index 00000000000..00ce42aae7e
--- /dev/null
+++ b/app/Entities/Tools/ParentChanger.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Chapter;
+use BookStack\References\ReferenceUpdater;
+
+class ParentChanger
+{
+    public function __construct(
+        protected SlugGenerator $slugGenerator,
+        protected ReferenceUpdater $referenceUpdater
+    ) {
+    }
+
+    /**
+     * Change the parent book of a chapter or page.
+     */
+    public function changeBook(BookChild $child, int $newBookId): void
+    {
+        $oldUrl = $child->getUrl();
+
+        $child->book_id = $newBookId;
+        $child->unsetRelation('book');
+        $this->slugGenerator->regenerateForEntity($child);
+        $child->save();
+
+        if ($oldUrl !== $child->getUrl()) {
+            $this->referenceUpdater->updateEntityReferences($child, $oldUrl);
+        }
+
+        // Update all child pages if a chapter
+        if ($child instanceof Chapter) {
+            foreach ($child->pages()->withTrashed()->get() as $page) {
+                $this->changeBook($page, $newBookId);
+            }
+        }
+    }
+}
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index fa9ae753c51..c4e614ee698 100644
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -7,7 +7,6 @@
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
-use BookStack\Permissions\Models\EntityPermission;
 use BookStack\Permissions\Permission;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
@@ -20,8 +19,8 @@ class PermissionsUpdater
      */
     public function updateFromPermissionsForm(Entity $entity, Request $request): void
     {
-        $permissions = $request->get('permissions', null);
-        $ownerId = $request->get('owned_by', null);
+        $permissions = $request->input('permissions', null);
+        $ownerId = $request->input('owned_by', null);
 
         $entity->permissions()->delete();
 
@@ -47,7 +46,7 @@ public function updateFromApiRequestData(Entity $entity, array $data): void
     {
         if (isset($data['role_permissions'])) {
             $entity->permissions()->where('role_id', '!=', 0)->delete();
-            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions($data['role_permissions'] ?? [], false);
+            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions($data['role_permissions'], false);
             $entity->permissions()->createMany($rolePermissionData);
         }
 
diff --git a/app/Entities/Tools/SlugGenerator.php b/app/Entities/Tools/SlugGenerator.php
index fb912318750..ac003b97a8f 100644
--- a/app/Entities/Tools/SlugGenerator.php
+++ b/app/Entities/Tools/SlugGenerator.php
@@ -5,12 +5,14 @@
 use BookStack\App\Model;
 use BookStack\App\SluggableInterface;
 use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Entity;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Str;
 
 class SlugGenerator
 {
     /**
-     * Generate a fresh slug for the given entity.
+     * Generate a fresh slug for the given item.
      * The slug will be generated so that it doesn't conflict within the same parent item.
      */
     public function generate(SluggableInterface&Model $model, string $slugSource): string
@@ -23,6 +25,26 @@ public function generate(SluggableInterface&Model $model, string $slugSource): s
         return $slug;
     }
 
+    /**
+     * Regenerate the slug for the given entity.
+     */
+    public function regenerateForEntity(Entity $entity): string
+    {
+        $entity->slug = $this->generate($entity, $entity->name);
+
+        return $entity->slug;
+    }
+
+    /**
+     * Regenerate the slug for a user.
+     */
+    public function regenerateForUser(User $user): string
+    {
+        $user->slug = $this->generate($user, $user->name);
+
+        return $user->slug;
+    }
+
     /**
      * Format a name as a URL slug.
      */
@@ -30,7 +52,7 @@ protected function formatNameAsSlug(string $name): string
     {
         $slug = Str::slug($name);
         if ($slug === '') {
-            $slug = substr(md5(rand(1, 500)), 0, 5);
+            $slug = substr(md5(strval(rand(1, 500))), 0, 5);
         }
 
         return $slug;
diff --git a/app/Entities/Tools/SlugHistory.php b/app/Entities/Tools/SlugHistory.php
new file mode 100644
index 00000000000..2c8d88129b6
--- /dev/null
+++ b/app/Entities/Tools/SlugHistory.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace BookStack\Entities\Tools;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\EntityTable;
+use BookStack\Entities\Models\SlugHistory as SlugHistoryModel;
+use BookStack\Permissions\PermissionApplicator;
+use Illuminate\Support\Facades\DB;
+
+class SlugHistory
+{
+    public function __construct(
+        protected PermissionApplicator $permissions,
+    ) {
+    }
+
+    /**
+     * Record the current slugs for the given entity.
+     */
+    public function recordForEntity(Entity $entity): void
+    {
+        if (!$entity->id || !$entity->slug) {
+            return;
+        }
+
+        $parentSlug = null;
+        if ($entity instanceof BookChild) {
+            $parentSlug = $entity->book()->first()?->slug;
+        }
+
+        $latest = $this->getLatestEntryForEntity($entity);
+        if ($latest && $latest->slug === $entity->slug && $latest->parent_slug === $parentSlug) {
+            return;
+        }
+
+        $info = [
+            'sluggable_type' => $entity->getMorphClass(),
+            'sluggable_id'   => $entity->id,
+            'slug'           => $entity->slug,
+            'parent_slug'    => $parentSlug,
+        ];
+
+        $entry = new SlugHistoryModel();
+        $entry->forceFill($info);
+        $entry->save();
+
+        if ($entity instanceof Book) {
+            $this->recordForBookChildren($entity);
+        }
+    }
+
+    protected function recordForBookChildren(Book $book): void
+    {
+        $query = EntityTable::query()
+            ->select(['type', 'id', 'slug', DB::raw("'{$book->slug}' as parent_slug"), DB::raw('now() as created_at'), DB::raw('now() as updated_at')])
+            ->where('book_id', '=', $book->id)
+            ->whereNotNull('book_id');
+
+        SlugHistoryModel::query()->insertUsing(
+            ['sluggable_type', 'sluggable_id', 'slug', 'parent_slug', 'created_at', 'updated_at'],
+            $query
+        );
+    }
+
+    /**
+     * Find the latest visible entry for an entity which uses the given slug(s) in the history.
+     */
+    public function lookupEntityIdUsingSlugs(string $type, string $slug, string $parentSlug = ''): ?int
+    {
+        $query = SlugHistoryModel::query()
+            ->where('sluggable_type', '=', $type)
+            ->where('slug', '=', $slug);
+
+        if ($parentSlug) {
+            $query->where('parent_slug', '=', $parentSlug);
+        }
+
+        $query = $this->permissions->restrictEntityRelationQuery($query, 'slug_history', 'sluggable_id', 'sluggable_type');
+
+        /** @var SlugHistoryModel|null $result */
+        $result = $query->orderBy('created_at', 'desc')->first();
+
+        return $result?->sluggable_id;
+    }
+
+    protected function getLatestEntryForEntity(Entity $entity): SlugHistoryModel|null
+    {
+        return SlugHistoryModel::query()
+            ->where('sluggable_type', '=', $entity->getMorphClass())
+            ->where('sluggable_id', '=', $entity->id)
+            ->orderBy('created_at', 'desc')
+            ->first();
+    }
+}
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index d457d4f48db..d265d42e66e 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -6,14 +6,16 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\EntityContainerData;
+use BookStack\Entities\Models\HasCoverInterface;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\CoverImageInterface;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\AttachmentService;
+use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
 use BookStack\Util\DatabaseTransaction;
 use Exception;
@@ -140,6 +142,7 @@ protected function ensureDeletable(Entity $entity): void
     protected function destroyShelf(Bookshelf $shelf): int
     {
         $this->destroyCommonRelations($shelf);
+        $shelf->books()->detach();
         $shelf->forceDelete();
 
         return 1;
@@ -167,6 +170,7 @@ protected function destroyBook(Book $book): int
         }
 
         $this->destroyCommonRelations($book);
+        $book->shelves()->detach();
         $book->forceDelete();
 
         return $count + 1;
@@ -202,6 +206,7 @@ protected function destroyPage(Page $page): int
     {
         $this->destroyCommonRelations($page);
         $page->allRevisions()->delete();
+        $page->updateDrafts()->delete();
 
         // Delete Attached Files
         $attachmentService = app()->make(AttachmentService::class);
@@ -209,15 +214,16 @@ protected function destroyPage(Page $page): int
             $attachmentService->deleteFile($attachment);
         }
 
-        // Remove book template usages
-        $this->queries->books->start()
+        // Remove use as a template
+        EntityContainerData::query()
             ->where('default_template_id', '=', $page->id)
             ->update(['default_template_id' => null]);
 
-        // Remove chapter template usages
-        $this->queries->chapters->start()
-            ->where('default_template_id', '=', $page->id)
-            ->update(['default_template_id' => null]);
+        // Nullify uploaded image relations
+        Image::query()
+            ->whereIn('type', ['gallery', 'drawio'])
+            ->where('uploaded_to', '=', $page->id)
+            ->update(['uploaded_to' => null]);
 
         $page->forceDelete();
 
@@ -268,8 +274,8 @@ public function destroyFromDeletion(Deletion $deletion): int
         // exists in the event it has already been destroyed during this request.
         $entity = $deletion->deletable()->first();
         $count = 0;
-        if ($entity) {
-            $count = $this->destroyEntity($deletion->deletable);
+        if ($entity instanceof Entity) {
+            $count = $this->destroyEntity($entity);
         }
         $deletion->delete();
 
@@ -353,6 +359,8 @@ protected function restoreEntity(Entity $entity): int
             $entity->chapters()->withTrashed()->withCount('deletions')->get()->each($restoreAction);
         }
 
+        $entity->rebuildPermissions();
+
         return $count;
     }
 
@@ -383,7 +391,7 @@ public function destroyEntity(Entity $entity): int
     /**
      * Update entity relations to remove or update outstanding connections.
      */
-    protected function destroyCommonRelations(Entity $entity)
+    protected function destroyCommonRelations(Entity $entity): void
     {
         Activity::removeEntity($entity);
         $entity->views()->delete();
@@ -397,10 +405,13 @@ protected function destroyCommonRelations(Entity $entity)
         $entity->watches()->delete();
         $entity->referencesTo()->delete();
         $entity->referencesFrom()->delete();
+        $entity->slugHistory()->delete();
 
-        if ($entity instanceof CoverImageInterface && $entity->cover()->exists()) {
+        if ($entity instanceof HasCoverInterface && $entity->coverInfo()->exists()) {
             $imageService = app()->make(ImageService::class);
-            $imageService->destroy($entity->cover()->first());
+            $imageService->destroy($entity->coverInfo()->getImage());
         }
+
+        $entity->relatedData()->delete();
     }
 }
diff --git a/app/Exceptions/ApiAuthException.php b/app/Exceptions/ApiAuthException.php
index 070f7a8df0b..55a6afae6a4 100644
--- a/app/Exceptions/ApiAuthException.php
+++ b/app/Exceptions/ApiAuthException.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-class ApiAuthException extends \Exception implements HttpExceptionInterface
+class ApiAuthException extends \Exception implements HttpExceptionInterface, ShowsApiExceptionMessage
 {
     protected int $status;
 
@@ -23,4 +23,9 @@ public function getHeaders(): array
     {
         return [];
     }
+
+    public function getMessageForApi(): string
+    {
+        return $this->getMessage();
+    }
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 08d326ad81c..eec50afb170 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -25,6 +25,7 @@ class Handler extends ExceptionHandler
     protected $dontReport = [
         NotFoundException::class,
         StoppedAuthenticationException::class,
+        NotifyException::class,
     ];
 
     /**
@@ -125,16 +126,25 @@ protected function renderApiException(Throwable $e): JsonResponse
             $headers = $e->getHeaders();
         }
 
-        if ($e instanceof ModelNotFoundException) {
-            $code = 404;
-        }
-
         $responseData = [
             'error' => [
-                'message' => $e->getMessage(),
+                'message' => 'An error occurred',
             ],
         ];
 
+        if ($e instanceof ModelNotFoundException) {
+            $responseData['error']['message'] = 'The requested resource could not be found.';
+            $code = 404;
+        }
+
+        if ($e instanceof ShowsApiExceptionMessage) {
+            $responseData['error']['message'] = $e->getMessageForApi();
+        }
+
+        if (app()->hasDebugModeEnabled()) {
+            $responseData['error']['message'] = $e->getMessage();
+        }
+
         if ($e instanceof ValidationException) {
             $responseData['error']['message'] = 'The given data was invalid.';
             $responseData['error']['validation'] = $e->errors();
@@ -159,14 +169,4 @@ protected function unauthenticated($request, AuthenticationException $exception)
 
         return redirect()->guest('login');
     }
-
-    /**
-     * Convert a validation exception into a JSON response.
-     *
-     * @param Request $request
-     */
-    protected function invalidJson($request, ValidationException $exception): JsonResponse
-    {
-        return response()->json($exception->errors(), $exception->status);
-    }
 }
diff --git a/app/Exceptions/NotifyException.php b/app/Exceptions/NotifyException.php
index b62b8fde646..b0514059d79 100644
--- a/app/Exceptions/NotifyException.php
+++ b/app/Exceptions/NotifyException.php
@@ -6,18 +6,22 @@
 use Illuminate\Contracts\Support\Responsable;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-class NotifyException extends Exception implements Responsable, HttpExceptionInterface
+/**
+ * An exception that is thrown to notify the user of something which went wrong.
+ * Typically, these should be translated messages since they will be shown to the end user
+ * via a pop-up notification error message in the UI.
+ *
+ * This exception is not intended to be used for internal system/application errors,
+ * and therefore will not be logged by the exception handler.
+ */
+class NotifyException extends Exception implements Responsable, HttpExceptionInterface, ShowsApiExceptionMessage
 {
-    public $message;
-    public string $redirectLocation;
-    protected int $status;
-
-    public function __construct(string $message, string $redirectLocation = '/', int $status = 500)
-    {
+    public function __construct(
+        string $message,
+        public string $redirectLocation = '/',
+        protected int $status = 500
+    ) {
         $this->message = $message;
-        $this->redirectLocation = $redirectLocation;
-        $this->status = $status;
-
         parent::__construct();
     }
 
@@ -57,4 +61,9 @@ public function toResponse($request)
 
         return redirect($this->redirectLocation);
     }
+
+    public function getMessageForApi(): string
+    {
+        return $this->getMessage();
+    }
 }
diff --git a/app/Exceptions/PermissionsException.php b/app/Exceptions/PermissionsException.php
index 64da55d21f4..ca5104df9a3 100644
--- a/app/Exceptions/PermissionsException.php
+++ b/app/Exceptions/PermissionsException.php
@@ -4,6 +4,10 @@
 
 use Exception;
 
-class PermissionsException extends Exception
+class PermissionsException extends Exception implements ShowsApiExceptionMessage
 {
+    public function getMessageForApi(): string
+    {
+        return $this->getMessage();
+    }
 }
diff --git a/app/Exceptions/PrettyException.php b/app/Exceptions/PrettyException.php
index 606085231f7..d8a9d315021 100644
--- a/app/Exceptions/PrettyException.php
+++ b/app/Exceptions/PrettyException.php
@@ -6,7 +6,7 @@
 use Illuminate\Contracts\Support\Responsable;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-class PrettyException extends Exception implements Responsable, HttpExceptionInterface
+class PrettyException extends Exception implements Responsable, HttpExceptionInterface, ShowsApiExceptionMessage
 {
     protected ?string $subtitle = null;
     protected ?string $details = null;
@@ -56,4 +56,16 @@ public function getHeaders(): array
     {
         return [];
     }
+
+    public function getMessageForApi(): string
+    {
+        $message = $this->getMessage() . '.';
+        if ($this->subtitle) {
+            $message .= " {$this->subtitle}.";
+        }
+        if ($this->details) {
+            $message .= " {$this->details}.";
+        }
+        return $message;
+    }
 }
diff --git a/app/Exceptions/ShowsApiExceptionMessage.php b/app/Exceptions/ShowsApiExceptionMessage.php
new file mode 100644
index 00000000000..66bf4388642
--- /dev/null
+++ b/app/Exceptions/ShowsApiExceptionMessage.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace BookStack\Exceptions;
+
+interface ShowsApiExceptionMessage
+{
+    /**
+     * Get the message to be shown to the API user for this exception.
+     * This is used for non-debug scenarios, so should not contain sensitive information.
+     * The original exception message will be used in debug scenarios.
+     */
+    public function getMessageForApi(): string;
+}
diff --git a/app/Exports/Controllers/BookExportApiController.php b/app/Exports/Controllers/BookExportApiController.php
index 21f276f8a4f..abcddfe679f 100644
--- a/app/Exports/Controllers/BookExportApiController.php
+++ b/app/Exports/Controllers/BookExportApiController.php
@@ -28,7 +28,7 @@ public function exportPdf(int $id)
         $book = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
-        return $this->download()->directly($pdfContent, $book->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $book->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ public function exportHtml(int $id)
         $book = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
-        return $this->download()->directly($htmlContent, $book->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $book->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ public function exportPlainText(int $id)
         $book = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
-        return $this->download()->directly($textContent, $book->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $book->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ public function exportMarkdown(int $id)
         $book = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->bookToMarkdown($book);
 
-        return $this->download()->directly($markdown, $book->slug . '.md');
+        return $this->createDownload()->directly($markdown, $book->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ public function exportZip(int $id, ZipExportBuilder $builder)
         $book = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $book->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $book->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/BookExportController.php b/app/Exports/Controllers/BookExportController.php
index f6bb66666dd..dc79ca44cab 100644
--- a/app/Exports/Controllers/BookExportController.php
+++ b/app/Exports/Controllers/BookExportController.php
@@ -30,7 +30,7 @@ public function pdf(string $bookSlug)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $pdfContent = $this->exportFormatter->bookToPdf($book);
 
-        return $this->download()->directly($pdfContent, $bookSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $bookSlug . '.pdf');
     }
 
     /**
@@ -43,7 +43,7 @@ public function html(string $bookSlug)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
 
-        return $this->download()->directly($htmlContent, $bookSlug . '.html');
+        return $this->createDownload()->directly($htmlContent, $bookSlug . '.html');
     }
 
     /**
@@ -54,7 +54,7 @@ public function plainText(string $bookSlug)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToPlainText($book);
 
-        return $this->download()->directly($textContent, $bookSlug . '.txt');
+        return $this->createDownload()->directly($textContent, $bookSlug . '.txt');
     }
 
     /**
@@ -65,7 +65,7 @@ public function markdown(string $bookSlug)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $textContent = $this->exportFormatter->bookToMarkdown($book);
 
-        return $this->download()->directly($textContent, $bookSlug . '.md');
+        return $this->createDownload()->directly($textContent, $bookSlug . '.md');
     }
 
     /**
@@ -77,6 +77,6 @@ public function zip(string $bookSlug, ZipExportBuilder $builder)
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $zip = $builder->buildForBook($book);
 
-        return $this->download()->streamedFileDirectly($zip, $bookSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $bookSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportApiController.php b/app/Exports/Controllers/ChapterExportApiController.php
index 7e5a23c7059..93c21b7c6be 100644
--- a/app/Exports/Controllers/ChapterExportApiController.php
+++ b/app/Exports/Controllers/ChapterExportApiController.php
@@ -28,7 +28,7 @@ public function exportPdf(int $id)
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
-        return $this->download()->directly($pdfContent, $chapter->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $chapter->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ public function exportHtml(int $id)
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->chapterToContainedHtml($chapter);
 
-        return $this->download()->directly($htmlContent, $chapter->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $chapter->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ public function exportPlainText(int $id)
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->chapterToPlainText($chapter);
 
-        return $this->download()->directly($textContent, $chapter->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $chapter->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ public function exportMarkdown(int $id)
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->chapterToMarkdown($chapter);
 
-        return $this->download()->directly($markdown, $chapter->slug . '.md');
+        return $this->createDownload()->directly($markdown, $chapter->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ public function exportZip(int $id, ZipExportBuilder $builder)
         $chapter = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapter->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $chapter->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/ChapterExportController.php b/app/Exports/Controllers/ChapterExportController.php
index fdb2bba9457..ba974bea0f1 100644
--- a/app/Exports/Controllers/ChapterExportController.php
+++ b/app/Exports/Controllers/ChapterExportController.php
@@ -31,7 +31,7 @@ public function pdf(string $bookSlug, string $chapterSlug)
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
 
-        return $this->download()->directly($pdfContent, $chapterSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
@@ -45,7 +45,7 @@ public function html(string $bookSlug, string $chapterSlug)
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $containedHtml = $this->exportFormatter->chapterToContainedHtml($chapter);
 
-        return $this->download()->directly($containedHtml, $chapterSlug . '.html');
+        return $this->createDownload()->directly($containedHtml, $chapterSlug . '.html');
     }
 
     /**
@@ -58,7 +58,7 @@ public function plainText(string $bookSlug, string $chapterSlug)
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToPlainText($chapter);
 
-        return $this->download()->directly($chapterText, $chapterSlug . '.txt');
+        return $this->createDownload()->directly($chapterText, $chapterSlug . '.txt');
     }
 
     /**
@@ -71,7 +71,7 @@ public function markdown(string $bookSlug, string $chapterSlug)
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $chapterText = $this->exportFormatter->chapterToMarkdown($chapter);
 
-        return $this->download()->directly($chapterText, $chapterSlug . '.md');
+        return $this->createDownload()->directly($chapterText, $chapterSlug . '.md');
     }
 
     /**
@@ -83,6 +83,6 @@ public function zip(string $bookSlug, string $chapterSlug, ZipExportBuilder $bui
         $chapter = $this->queries->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);
         $zip = $builder->buildForChapter($chapter);
 
-        return $this->download()->streamedFileDirectly($zip, $chapterSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $chapterSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportApiController.php b/app/Exports/Controllers/PageExportApiController.php
index c5b18628924..00a07e7a796 100644
--- a/app/Exports/Controllers/PageExportApiController.php
+++ b/app/Exports/Controllers/PageExportApiController.php
@@ -28,7 +28,7 @@ public function exportPdf(int $id)
         $page = $this->queries->findVisibleByIdOrFail($id);
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
-        return $this->download()->directly($pdfContent, $page->slug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $page->slug . '.pdf');
     }
 
     /**
@@ -41,7 +41,7 @@ public function exportHtml(int $id)
         $page = $this->queries->findVisibleByIdOrFail($id);
         $htmlContent = $this->exportFormatter->pageToContainedHtml($page);
 
-        return $this->download()->directly($htmlContent, $page->slug . '.html');
+        return $this->createDownload()->directly($htmlContent, $page->slug . '.html');
     }
 
     /**
@@ -52,7 +52,7 @@ public function exportPlainText(int $id)
         $page = $this->queries->findVisibleByIdOrFail($id);
         $textContent = $this->exportFormatter->pageToPlainText($page);
 
-        return $this->download()->directly($textContent, $page->slug . '.txt');
+        return $this->createDownload()->directly($textContent, $page->slug . '.txt');
     }
 
     /**
@@ -63,7 +63,7 @@ public function exportMarkdown(int $id)
         $page = $this->queries->findVisibleByIdOrFail($id);
         $markdown = $this->exportFormatter->pageToMarkdown($page);
 
-        return $this->download()->directly($markdown, $page->slug . '.md');
+        return $this->createDownload()->directly($markdown, $page->slug . '.md');
     }
 
     /**
@@ -74,6 +74,6 @@ public function exportZip(int $id, ZipExportBuilder $builder)
         $page = $this->queries->findVisibleByIdOrFail($id);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $page->slug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $page->slug . '.zip', true);
     }
 }
diff --git a/app/Exports/Controllers/PageExportController.php b/app/Exports/Controllers/PageExportController.php
index 9bc79f24751..ba3aabea181 100644
--- a/app/Exports/Controllers/PageExportController.php
+++ b/app/Exports/Controllers/PageExportController.php
@@ -34,7 +34,7 @@ public function pdf(string $bookSlug, string $pageSlug)
         $page->html = (new PageContent($page))->render();
         $pdfContent = $this->exportFormatter->pageToPdf($page);
 
-        return $this->download()->directly($pdfContent, $pageSlug . '.pdf');
+        return $this->createDownload()->directly($pdfContent, $pageSlug . '.pdf');
     }
 
     /**
@@ -49,7 +49,7 @@ public function html(string $bookSlug, string $pageSlug)
         $page->html = (new PageContent($page))->render();
         $containedHtml = $this->exportFormatter->pageToContainedHtml($page);
 
-        return $this->download()->directly($containedHtml, $pageSlug . '.html');
+        return $this->createDownload()->directly($containedHtml, $pageSlug . '.html');
     }
 
     /**
@@ -62,7 +62,7 @@ public function plainText(string $bookSlug, string $pageSlug)
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToPlainText($page);
 
-        return $this->download()->directly($pageText, $pageSlug . '.txt');
+        return $this->createDownload()->directly($pageText, $pageSlug . '.txt');
     }
 
     /**
@@ -75,7 +75,7 @@ public function markdown(string $bookSlug, string $pageSlug)
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $pageText = $this->exportFormatter->pageToMarkdown($page);
 
-        return $this->download()->directly($pageText, $pageSlug . '.md');
+        return $this->createDownload()->directly($pageText, $pageSlug . '.md');
     }
 
     /**
@@ -87,6 +87,6 @@ public function zip(string $bookSlug, string $pageSlug, ZipExportBuilder $builde
         $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $zip = $builder->buildForPage($page);
 
-        return $this->download()->streamedFileDirectly($zip, $pageSlug . '.zip', true);
+        return $this->createDownload()->streamedFileDirectly($zip, $pageSlug . '.zip', true);
     }
 }
diff --git a/app/Exports/ExportFormatter.php b/app/Exports/ExportFormatter.php
index 85ac7d2c9e9..61b7554f659 100644
--- a/app/Exports/ExportFormatter.php
+++ b/app/Exports/ExportFormatter.php
@@ -11,6 +11,7 @@
 use BookStack\Uploads\ImageService;
 use BookStack\Util\CspService;
 use BookStack\Util\HtmlDocument;
+use BookStack\Util\HtmlToPlainText;
 use DOMElement;
 use Exception;
 use Throwable;
@@ -208,7 +209,7 @@ protected function containHtml(string $htmlContent): string
         preg_match_all("/\<img.*?src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
 
         // Replace image src with base64 encoded image strings
-        if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
+        if (count($imageTagsOutput[0]) > 0) {
             foreach ($imageTagsOutput[0] as $index => $imgMatch) {
                 $oldImgTagString = $imgMatch;
                 $srcString = $imageTagsOutput[2][$index];
@@ -225,7 +226,7 @@ protected function containHtml(string $htmlContent): string
         preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $linksOutput);
 
         // Update relative links to be absolute, with instance url
-        if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
+        if (count($linksOutput[0]) > 0) {
             foreach ($linksOutput[0] as $index => $linkMatch) {
                 $oldLinkString = $linkMatch;
                 $srcString = $linksOutput[2][$index];
@@ -242,24 +243,13 @@ protected function containHtml(string $htmlContent): string
 
     /**
      * Converts the page contents into simple plain text.
-     * This method filters any bad looking content to provide a nice final output.
+     * We re-generate the plain text from HTML at this point, post-page-content rendering.
      */
     public function pageToPlainText(Page $page, bool $pageRendered = false, bool $fromParent = false): string
     {
         $html = $pageRendered ? $page->html : (new PageContent($page))->render();
-        // Add proceeding spaces before tags so spaces remain between
-        // text within elements after stripping tags.
-        $html = str_replace('<', " <", $html);
-        $text = trim(strip_tags($html));
-        // Replace multiple spaces with single spaces
-        $text = preg_replace('/ {2,}/', ' ', $text);
-        // Reduce multiple horrid whitespace characters.
-        $text = preg_replace('/(\x0A|\xA0|\x0A|\r|\n){2,}/su', "\n\n", $text);
-        $text = html_entity_decode($text);
-        // Add title
-        $text = $page->name . ($fromParent ? "\n" : "\n\n") . $text;
-
-        return $text;
+        $contentText = (new HtmlToPlainText())->convert($html);
+        return $page->name . ($fromParent ? "\n" : "\n\n") . $contentText;
     }
 
     /**
@@ -267,7 +257,7 @@ public function pageToPlainText(Page $page, bool $pageRendered = false, bool $fr
      */
     public function chapterToPlainText(Chapter $chapter): string
     {
-        $text = $chapter->name . "\n" . $chapter->description;
+        $text = $chapter->name . "\n" . $chapter->descriptionInfo()->getPlain();
         $text = trim($text) . "\n\n";
 
         $parts = [];
@@ -284,7 +274,7 @@ public function chapterToPlainText(Chapter $chapter): string
     public function bookToPlainText(Book $book): string
     {
         $bookTree = (new BookContents($book))->getTree(false, true);
-        $text = $book->name . "\n" . $book->description;
+        $text = $book->name . "\n" . $book->descriptionInfo()->getPlain();
         $text = rtrim($text) . "\n\n";
 
         $parts = [];
@@ -318,12 +308,12 @@ public function chapterToMarkdown(Chapter $chapter): string
     {
         $text = '# ' . $chapter->name . "\n\n";
 
-        $description = (new HtmlToMarkdown($chapter->descriptionHtml()))->convert();
+        $description = (new HtmlToMarkdown($chapter->descriptionInfo()->getHtml()))->convert();
         if ($description) {
             $text .= $description . "\n\n";
         }
 
-        foreach ($chapter->pages as $page) {
+        foreach ($chapter->getVisiblePages() as $page) {
             $text .= $this->pageToMarkdown($page) . "\n\n";
         }
 
@@ -338,7 +328,7 @@ public function bookToMarkdown(Book $book): string
         $bookTree = (new BookContents($book))->getTree(false, true);
         $text = '# ' . $book->name . "\n\n";
 
-        $description = (new HtmlToMarkdown($book->descriptionHtml()))->convert();
+        $description = (new HtmlToMarkdown($book->descriptionInfo()->getHtml()))->convert();
         if ($description) {
             $text .= $description . "\n\n";
         }
diff --git a/app/Exports/ImportRepo.php b/app/Exports/ImportRepo.php
index 79db69fca8f..ed631409be3 100644
--- a/app/Exports/ImportRepo.php
+++ b/app/Exports/ImportRepo.php
@@ -3,6 +3,8 @@
 namespace BookStack\Exports;
 
 use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\FileUploadException;
@@ -119,6 +121,9 @@ public function runImport(Import $import, ?string $parent = null): Entity
         $parentModel = null;
         if ($import->type === 'page' || $import->type === 'chapter') {
             $parentModel = $parent ? $this->entityQueries->findVisibleByStringIdentifier($parent) : null;
+            if ($parentModel && !($parentModel instanceof Book || $parentModel instanceof Chapter)) {
+                throw new ZipImportException(['Selected parent is not a book or chapter']);
+            }
         }
 
         DB::beginTransaction();
diff --git a/app/Exports/PdfGenerator.php b/app/Exports/PdfGenerator.php
index f31d8aad078..5506fe74065 100644
--- a/app/Exports/PdfGenerator.php
+++ b/app/Exports/PdfGenerator.php
@@ -4,6 +4,8 @@
 
 use BookStack\Exceptions\PdfExportException;
 use Dompdf\Dompdf;
+use FontLib\Font;
+use Illuminate\Support\Str;
 use Knp\Snappy\Pdf as SnappyPdf;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
@@ -60,12 +62,65 @@ protected function renderUsingDomPdf(string $html): string
         $domPdf = new Dompdf($options);
         $domPdf->setBasePath(base_path('public'));
 
+        $fontMetrics = $domPdf->getFontMetrics();
+        $userFontfamilies = $this->getUserDomPdfFontFamilies();
+        foreach ($userFontfamilies as $fontFamily => $fonts) {
+            try {
+                $fontMetrics->setFontFamily($fontFamily, $fonts);
+            } catch (\Exception $exception) {
+                $expectedPath = storage_path('fonts/dompdf');
+                throw new PdfExportException("Failed to create required font data in {$expectedPath}, Ensure all content in this location is writable by the web server");
+            }
+        }
+
         $domPdf->loadHTML($this->convertEntities($html));
         $domPdf->render();
 
         return (string) $domPdf->output();
     }
 
+    /**
+     * @return array<string, array<string, string>>
+     */
+    protected function getUserDomPdfFontFamilies(): array
+    {
+        $fontStore = storage_path('fonts/dompdf');
+        if (!is_dir($fontStore)) {
+            return [];
+        }
+
+        $fontFamilies = [];
+        $fontFiles = glob($fontStore . DIRECTORY_SEPARATOR . '*.ttf');
+        foreach ($fontFiles as $fontFile) {
+            $fontFileName = basename($fontFile, '.ttf');
+            $expectedUfm = $fontStore . DIRECTORY_SEPARATOR . $fontFileName . '.ufm';
+            if (!file_exists($expectedUfm)) {
+                $font = Font::load($fontFile);
+                $font->parse();
+                try {
+                    $font->saveAdobeFontMetrics($expectedUfm);
+                } catch (\Exception $exception) {
+                    throw new PdfExportException("Failed to create required font data at $expectedUfm, Ensure this location is writable by the web server");
+                }
+            }
+
+            $nameParts = explode('-', $fontFileName);
+            if (count($nameParts) === 1 || $nameParts[1] === 'Regular') {
+                $nameParts[1] = 'Normal';
+            }
+
+            $family = trim(strtolower(preg_replace('/([A-Z])/', ' $1', $nameParts[0])));
+            $variation = Str::snake($nameParts[1]);
+            if (!isset($fontFamilies[$family])) {
+                $fontFamilies[$family] = [];
+            }
+
+            $fontFamilies[$family][$variation] = $fontStore . DIRECTORY_SEPARATOR . $fontFileName;
+        }
+
+        return $fontFamilies;
+    }
+
     /**
      * @throws PdfExportException
      */
diff --git a/app/Exports/ZipExports/Models/ZipExportAttachment.php b/app/Exports/ZipExports/Models/ZipExportAttachment.php
index 97995738ffe..1611866875b 100644
--- a/app/Exports/ZipExports/Models/ZipExportAttachment.php
+++ b/app/Exports/ZipExports/Models/ZipExportAttachment.php
@@ -45,7 +45,7 @@ public static function validate(ZipValidationHelper $context, array $data): arra
         $rules = [
             'id'    => ['nullable', 'int', $context->uniqueIdRule('attachment')],
             'name'  => ['required', 'string', 'min:1'],
-            'link'  => ['required_without:file', 'nullable', 'string'],
+            'link'  => ['required_without:file', 'nullable', 'string', 'max:2000', 'safe_url'],
             'file'  => ['required_without:link', 'nullable', 'string', $context->fileReferenceRule()],
         ];
 
diff --git a/app/Exports/ZipExports/Models/ZipExportBook.php b/app/Exports/ZipExports/Models/ZipExportBook.php
index 6c51ea3379c..006a6b2d2f5 100644
--- a/app/Exports/ZipExports/Models/ZipExportBook.php
+++ b/app/Exports/ZipExports/Models/ZipExportBook.php
@@ -55,10 +55,10 @@ public static function fromModel(Book $model, ZipExportFiles $files): self
         $instance = new self();
         $instance->id = $model->id;
         $instance->name = $model->name;
-        $instance->description_html = $model->descriptionHtml();
+        $instance->description_html = $model->descriptionInfo()->getHtml();
 
-        if ($model->cover) {
-            $instance->cover = $files->referenceForImage($model->cover);
+        if ($model->coverInfo()->exists()) {
+            $instance->cover = $files->referenceForImage($model->coverInfo()->getImage());
         }
 
         $instance->tags = ZipExportTag::fromModelArray($model->tags()->get()->all());
@@ -87,7 +87,7 @@ public static function validate(ZipValidationHelper $context, array $data): arra
             'id'    => ['nullable', 'int', $context->uniqueIdRule('book')],
             'name'  => ['required', 'string', 'min:1'],
             'description_html' => ['nullable', 'string'],
-            'cover' => ['nullable', 'string', $context->fileReferenceRule()],
+            'cover' => ['nullable', 'string', $context->imageFileReferenceRule()],
             'tags' => ['array'],
             'pages' => ['array'],
             'chapters' => ['array'],
diff --git a/app/Exports/ZipExports/Models/ZipExportChapter.php b/app/Exports/ZipExports/Models/ZipExportChapter.php
index 260191a3e78..906ce3d8185 100644
--- a/app/Exports/ZipExports/Models/ZipExportChapter.php
+++ b/app/Exports/ZipExports/Models/ZipExportChapter.php
@@ -40,7 +40,7 @@ public static function fromModel(Chapter $model, ZipExportFiles $files): self
         $instance = new self();
         $instance->id = $model->id;
         $instance->name = $model->name;
-        $instance->description_html = $model->descriptionHtml();
+        $instance->description_html = $model->descriptionInfo()->getHtml();
         $instance->priority = $model->priority;
         $instance->tags = ZipExportTag::fromModelArray($model->tags()->get()->all());
 
diff --git a/app/Exports/ZipExports/Models/ZipExportImage.php b/app/Exports/ZipExports/Models/ZipExportImage.php
index 4c71af0c3a2..1432e6cf0d8 100644
--- a/app/Exports/ZipExports/Models/ZipExportImage.php
+++ b/app/Exports/ZipExports/Models/ZipExportImage.php
@@ -32,11 +32,10 @@ public function metadataOnly(): void
 
     public static function validate(ZipValidationHelper $context, array $data): array
     {
-        $acceptedImageTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp'];
         $rules = [
             'id'    => ['nullable', 'int', $context->uniqueIdRule('image')],
             'name'  => ['required', 'string', 'min:1'],
-            'file'  => ['required', 'string', $context->fileReferenceRule($acceptedImageTypes)],
+            'file'  => ['required', 'string', $context->imageFileReferenceRule()],
             'type'  => ['required', 'string', Rule::in(['gallery', 'drawio'])],
         ];
 
diff --git a/app/Exports/ZipExports/ZipExportFiles.php b/app/Exports/ZipExports/ZipExportFiles.php
index 8f0a6bd4031..0386d8278f9 100644
--- a/app/Exports/ZipExports/ZipExportFiles.php
+++ b/app/Exports/ZipExports/ZipExportFiles.php
@@ -80,7 +80,7 @@ protected function getAllFileNames(): array
     }
 
     /**
-     * Extract each of the ZIP export tracked files.
+     * Extract each of the ZIP export-tracked files.
      * Calls the given callback for each tracked file, passing a temporary
      * file reference of the file contents, and the zip-local tracked reference.
      */
diff --git a/app/Exports/ZipExports/ZipExportReader.php b/app/Exports/ZipExports/ZipExportReader.php
index c3d5c23cfec..cb8e85db643 100644
--- a/app/Exports/ZipExports/ZipExportReader.php
+++ b/app/Exports/ZipExports/ZipExportReader.php
@@ -58,8 +58,20 @@ public function readData(): array
     {
         $this->open();
 
+        $info = $this->zip->statName('data.json');
+        if ($info === false) {
+            throw new ZipExportException(trans('errors.import_zip_cant_decode_data'));
+        }
+
+        $maxSize = max(intval(config()->get('app.upload_limit')), 1) * 1000000;
+        $dataSize = $info['size'];
+        if ($dataSize > $maxSize) {
+            throw new ZipExportException(trans('errors.import_zip_data_too_large'));
+        }
+
         // Validate json data exists, including metadata
-        $jsonData = $this->zip->getFromName('data.json') ?: '';
+        // The read data size is bound to at least 1 byte to prevent passing 0, which would read without a limit
+        $jsonData = $this->zip->getFromName('data.json', max($dataSize, 1)) ?: '';
         $importData = json_decode($jsonData, true);
         if (!$importData) {
             throw new ZipExportException(trans('errors.import_zip_cant_decode_data'));
@@ -73,6 +85,36 @@ public function fileExists(string $fileName): bool
         return $this->zip->statName("files/{$fileName}") !== false;
     }
 
+    /**
+     * Get the DECLARED (not actual) uncompressed size of a file within the ZIP.
+     * Returns -1 if the file does not exist.
+     */
+    public function fileSize(string $fileName): int
+    {
+        $fileInfo = $this->zip->statName("files/{$fileName}");
+        if ($fileInfo === false) {
+            return -1;
+        }
+
+        return $fileInfo['size'];
+    }
+
+    /**
+     * Check that the file of given name within the ZIP is within the app file size limit.
+     * WARNING: This only checks the declared size of the file, not the actual size of the file.
+     * You will then need to ensure the file is read/streamed/copied out with the size as a limit.
+     */
+    public function fileWithinSizeLimit(string $fileName): bool
+    {
+        $fileSize = $this->fileSize($fileName);
+        if ($fileSize < 0) {
+            return false;
+        }
+
+        $maxSize = max(intval(config()->get('app.upload_limit')), 1) * 1000000;
+        return $fileSize <= $maxSize;
+    }
+
     /**
      * @return false|resource
      */
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.php
index 64107cf21aa..90056a23eb4 100644
--- a/app/Exports/ZipExports/ZipExportReferences.php
+++ b/app/Exports/ZipExports/ZipExportReferences.php
@@ -12,9 +12,9 @@
 use BookStack\Exports\ZipExports\Models\ZipExportImage;
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
 use BookStack\Exports\ZipExports\Models\ZipExportPage;
-use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageService;
 
 class ZipExportReferences
 {
@@ -33,6 +33,7 @@ class ZipExportReferences
 
     public function __construct(
         protected ZipReferenceParser $parser,
+        protected ImageService $imageService,
     ) {
     }
 
@@ -133,10 +134,17 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
                 return "[[bsexport:image:{$model->id}]]";
             }
 
-            // Find and include images if in visibility
+            // Get the page which we'll reference this image upon
             $page = $model->getPage();
-            $pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);
-            if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan(Permission::PageView, $page))) {
+            $pageExportModel = null;
+            if ($page && isset($this->pages[$page->id])) {
+                $pageExportModel = $this->pages[$page->id];
+            } elseif ($exportModel instanceof ZipExportPage) {
+                $pageExportModel = $exportModel;
+            }
+
+            // Add the image to the export if it's accessible or just return the existing reference if already added
+            if (isset($this->images[$model->id]) || ($pageExportModel && $this->imageService->imageAccessible($model))) {
                 if (!isset($this->images[$model->id])) {
                     $exportImage = ZipExportImage::fromModel($model, $files);
                     $this->images[$model->id] = $exportImage;
@@ -144,6 +152,7 @@ protected function handleModelReference(Model $model, ZipExportModel $exportMode
                 }
                 return "[[bsexport:image:{$model->id}]]";
             }
+
             return null;
         }
 
diff --git a/app/Exports/ZipExports/ZipFileReferenceRule.php b/app/Exports/ZipExports/ZipFileReferenceRule.php
index 90e78c060b0..01d703a1d0a 100644
--- a/app/Exports/ZipExports/ZipFileReferenceRule.php
+++ b/app/Exports/ZipExports/ZipFileReferenceRule.php
@@ -13,7 +13,6 @@ public function __construct(
     ) {
     }
 
-
     /**
      * @inheritDoc
      */
@@ -23,6 +22,13 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
             $fail('validation.zip_file')->translate();
         }
 
+        if (!$this->context->zipReader->fileWithinSizeLimit($value)) {
+            $fail('validation.zip_file_size')->translate([
+                'attribute' => $value,
+                'size' => config('app.upload_limit'),
+            ]);
+        }
+
         if (!empty($this->acceptedMimes)) {
             $fileMime = $this->context->zipReader->sniffFileMime($value);
             if (!in_array($fileMime, $this->acceptedMimes)) {
diff --git a/app/Exports/ZipExports/ZipImportRunner.php b/app/Exports/ZipExports/ZipImportRunner.php
index eafb527e87e..c531ef05321 100644
--- a/app/Exports/ZipExports/ZipImportRunner.php
+++ b/app/Exports/ZipExports/ZipImportRunner.php
@@ -48,7 +48,7 @@ public function __construct(
      * Returns the top-level entity item which was imported.
      * @throws ZipImportException
      */
-    public function run(Import $import, ?Entity $parent = null): Entity
+    public function run(Import $import, Book|Chapter|null $parent = null): Entity
     {
         $zipPath = $this->getZipPath($import);
         $reader = new ZipExportReader($zipPath);
@@ -82,10 +82,8 @@ public function run(Import $import, ?Entity $parent = null): Entity
             $entity = $this->importBook($exportModel, $reader);
         } else if ($exportModel instanceof ZipExportChapter) {
             $entity = $this->importChapter($exportModel, $parent, $reader);
-        } else if ($exportModel instanceof ZipExportPage) {
-            $entity = $this->importPage($exportModel, $parent, $reader);
         } else {
-            throw new ZipImportException(['No importable data found in import data.']);
+            $entity = $this->importPage($exportModel, $parent, $reader);
         }
 
         $this->references->replaceReferences();
@@ -98,7 +96,7 @@ public function run(Import $import, ?Entity $parent = null): Entity
 
     /**
      * Revert any files which have been stored during this import process.
-     * Considers files only, and avoids the database under the
+     * Considers files only and avoids the database under the
      * assumption that the database may already have been
      * reverted as part of a transaction rollback.
      */
@@ -131,12 +129,12 @@ protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader
         $book = $this->bookRepo->create([
             'name' => $exportBook->name,
             'description_html' => $exportBook->description_html ?? '',
-            'image' => $exportBook->cover ? $this->zipFileToUploadedFile($exportBook->cover, $reader) : null,
-            'tags' => $this->exportTagsToInputArray($exportBook->tags ?? []),
+            'image' => $exportBook->cover ? $this->zipFileToUploadedFile($exportBook->cover, $reader, true) : null,
+            'tags' => $this->exportTagsToInputArray($exportBook->tags),
         ]);
 
-        if ($book->cover) {
-            $this->references->addImage($book->cover, null);
+        if ($book->coverInfo()->getImage()) {
+            $this->references->addImage($book->coverInfo()->getImage(), null);
         }
 
         $children = [
@@ -151,7 +149,7 @@ protected function importBook(ZipExportBook $exportBook, ZipExportReader $reader
         foreach ($children as $child) {
             if ($child instanceof ZipExportChapter) {
                 $this->importChapter($child, $book, $reader);
-            } else if ($child instanceof ZipExportPage) {
+            } else {
                 $this->importPage($child, $book, $reader);
             }
         }
@@ -166,7 +164,7 @@ protected function importChapter(ZipExportChapter $exportChapter, Book $parent,
         $chapter = $this->chapterRepo->create([
             'name' => $exportChapter->name,
             'description_html' => $exportChapter->description_html ?? '',
-            'tags' => $this->exportTagsToInputArray($exportChapter->tags ?? []),
+            'tags' => $this->exportTagsToInputArray($exportChapter->tags),
         ], $parent);
 
         $exportPages = $exportChapter->pages;
@@ -197,9 +195,9 @@ protected function importPage(ZipExportPage $exportPage, Book|Chapter $parent, Z
 
         $this->pageRepo->publishDraft($page, [
             'name' => $exportPage->name,
-            'markdown' => $exportPage->markdown,
-            'html' => $exportPage->html,
-            'tags' => $this->exportTagsToInputArray($exportPage->tags ?? []),
+            'markdown' => $exportPage->markdown ?? '',
+            'html' => $exportPage->html ?? '',
+            'tags' => $this->exportTagsToInputArray($exportPage->tags),
         ]);
 
         $this->references->addPage($page, $exportPage);
@@ -229,18 +227,11 @@ protected function importAttachment(ZipExportAttachment $exportAttachment, Page
 
     protected function importImage(ZipExportImage $exportImage, Page $page, ZipExportReader $reader): Image
     {
-        $mime = $reader->sniffFileMime($exportImage->file);
-        $extension = explode('/', $mime)[1];
-
-        $file = $this->zipFileToUploadedFile($exportImage->file, $reader);
+        $file = $this->zipFileToUploadedFile($exportImage->file, $reader, true);
         $image = $this->imageService->saveNewFromUpload(
             $file,
             $exportImage->type,
             $page->id,
-            null,
-            null,
-            true,
-            $exportImage->name . '.' . $extension,
         );
 
         $image->name = $exportImage->name;
@@ -263,17 +254,40 @@ protected function exportTagsToInputArray(array $exportTags): array
         return $tags;
     }
 
-    protected function zipFileToUploadedFile(string $fileName, ZipExportReader $reader): UploadedFile
+    protected function zipFileToUploadedFile(string $fileName, ZipExportReader $reader, bool $forceExtensionFromMime = false): UploadedFile
     {
+        if (!$reader->fileWithinSizeLimit($fileName)) {
+            throw new ZipImportException([
+                "File $fileName exceeds app upload limit."
+            ]);
+        }
+
         $tempPath = tempnam(sys_get_temp_dir(), 'bszipextract');
+        $fileSize = $reader->fileSize($fileName);
         $fileStream = $reader->streamFile($fileName);
         $tempStream = fopen($tempPath, 'wb');
-        stream_copy_to_stream($fileStream, $tempStream);
+        $copied = stream_copy_to_stream($fileStream, $tempStream, $fileSize + 5);
         fclose($tempStream);
 
         $this->tempFilesToCleanup[] = $tempPath;
 
-        return new UploadedFile($tempPath, $fileName);
+        // Raise an error if actual file size exceeds the reported size
+        if ($copied > $fileSize) {
+            throw new ZipImportException([
+                "File $fileName exceeded the file size reported in the ZIP archive."
+            ]);
+        }
+
+        $intendedUploadName = $fileName;
+        if ($forceExtensionFromMime) {
+            $mime = $reader->sniffFileMime($fileName);
+            $extension = explode('/', $mime)[1];
+            if (!str_ends_with(strtolower($intendedUploadName), '.' . $extension)) {
+                $intendedUploadName .= '.' . $extension;
+            }
+        }
+
+        return new UploadedFile($tempPath, $intendedUploadName);
     }
 
     /**
@@ -296,7 +310,7 @@ protected function ensurePermissionsPermitImport(ZipExportPage|ZipExportChapter|
             array_push($chapters, ...$exportModel->chapters);
         } else if ($exportModel instanceof ZipExportChapter) {
             $chapters[] = $exportModel;
-        } else if ($exportModel instanceof ZipExportPage) {
+        } else {
             $pages[] = $exportModel;
         }
 
diff --git a/app/Exports/ZipExports/ZipReferenceParser.php b/app/Exports/ZipExports/ZipReferenceParser.php
index a6560e3f289..9bb069ab7f1 100644
--- a/app/Exports/ZipExports/ZipReferenceParser.php
+++ b/app/Exports/ZipExports/ZipReferenceParser.php
@@ -68,10 +68,6 @@ public function parseReferences(string $content, callable $handler): string
         $matches = [];
         preg_match_all($referenceRegex, $content, $matches);
 
-        if (count($matches) < 3) {
-            return $content;
-        }
-
         for ($i = 0; $i < count($matches[0]); $i++) {
             $referenceText = $matches[0][$i];
             $type = strtolower($matches[1][$i]);
diff --git a/app/Exports/ZipExports/ZipValidationHelper.php b/app/Exports/ZipExports/ZipValidationHelper.php
index fd9cd784472..2bcb5fb9747 100644
--- a/app/Exports/ZipExports/ZipValidationHelper.php
+++ b/app/Exports/ZipExports/ZipValidationHelper.php
@@ -3,6 +3,7 @@
 namespace BookStack\Exports\ZipExports;
 
 use BookStack\Exports\ZipExports\Models\ZipExportModel;
+use BookStack\Uploads\ImageService;
 use Illuminate\Validation\Factory;
 
 class ZipValidationHelper
@@ -38,6 +39,11 @@ public function fileReferenceRule(array $acceptedMimes = []): ZipFileReferenceRu
         return new ZipFileReferenceRule($this, $acceptedMimes);
     }
 
+    public function imageFileReferenceRule(): ZipFileReferenceRule
+    {
+        return new ZipFileReferenceRule($this, ImageService::getSupportedMimeTypes());
+    }
+
     public function uniqueIdRule(string $type): ZipUniqueIdRule
     {
         return new ZipUniqueIdRule($this, $type);
diff --git a/app/Http/ApiController.php b/app/Http/ApiController.php
index 1a92afa3380..f1b74783f8a 100644
--- a/app/Http/ApiController.php
+++ b/app/Http/ApiController.php
@@ -8,16 +8,26 @@
 
 abstract class ApiController extends Controller
 {
+    /**
+     * The validation rules for this controller.
+     * Can alternative be defined in a rules() method is they need to be dynamic.
+     *
+     * @var array<string, array<string, string[]>>
+     */
     protected array $rules = [];
 
     /**
      * Provide a paginated listing JSON response in a standard format
      * taking into account any pagination parameters passed by the user.
      */
-    protected function apiListingResponse(Builder $query, array $fields, array $modifiers = []): JsonResponse
+    protected function apiListingResponse(Builder $query, array $fields, array $modifiers = [], array $filterableFields = []): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields);
 
+        if (count($filterableFields) > 0) {
+            $listing->setFilterableFields($filterableFields);
+        }
+
         foreach ($modifiers as $modifier) {
             $listing->modifyResults($modifier);
         }
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 5d3be4951ca..97936174d8f 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -7,6 +7,7 @@
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
 use BookStack\Permissions\Permission;
+use BookStack\Users\Models\OwnableInterface;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\JsonResponse;
@@ -62,7 +63,7 @@ protected function showPermissionError(string $redirectLocation = '/'): never
      */
     protected function checkPermission(string|Permission $permission): void
     {
-        if (!user() || !user()->can($permission)) {
+        if (!user()->can($permission)) {
             $this->showPermissionError();
         }
     }
@@ -80,7 +81,7 @@ protected function preventGuestAccess(): void
     /**
      * Check the current user's permissions against an ownable item otherwise throw an exception.
      */
-    protected function checkOwnablePermission(string|Permission $permission, Model $ownable, string $redirectLocation = '/'): void
+    protected function checkOwnablePermission(string|Permission $permission, Model&OwnableInterface $ownable, string $redirectLocation = '/'): void
     {
         if (!userCan($permission, $ownable)) {
             $this->showPermissionError($redirectLocation);
@@ -120,7 +121,7 @@ protected function jsonError(string $messageText = '', int $statusCode = 500): J
     /**
      * Create and return a new download response factory using the current request.
      */
-    protected function download(): DownloadResponseFactory
+    protected function createDownload(): DownloadResponseFactory
     {
         return new DownloadResponseFactory(request());
     }
@@ -167,14 +168,26 @@ protected function getImageValidationRules(): array
 
     /**
      * Redirect to the URL provided in the request as a '_return' parameter.
-     * Will check that the parameter leads to a URL under the root path of the system.
+     * Will check that the parameter leads to a URL under the same origin as the application.
      */
     protected function redirectToRequest(Request $request): RedirectResponse
     {
         $basePath = url('/');
         $returnUrl = $request->input('_return') ?? $basePath;
 
-        if (!str_starts_with($returnUrl, $basePath)) {
+        // Only allow use of _return on requests where we expect CSRF to be active
+        // to prevent it potentially being used as an open redirect
+        $allowedMethods = ['POST', 'PUT', 'PATCH', 'DELETE'];
+        if (!in_array($request->getMethod(), $allowedMethods)) {
+            return redirect($basePath);
+        }
+
+        $intendedUrl = parse_url($returnUrl);
+        $baseUrl = parse_url($basePath);
+        $isSameOrigin = ($intendedUrl['host'] ?? '') === ($baseUrl['host'] ?? '')
+            && ($intendedUrl['scheme'] ?? '') === ($baseUrl['scheme'] ?? '')
+            && ($intendedUrl['port'] ?? 0) === ($baseUrl['port'] ?? 0);
+        if (!$isSameOrigin) {
             return redirect($basePath);
         }
 
diff --git a/app/Http/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
index 8384484ad62..1b6256c00ef 100644
--- a/app/Http/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -102,12 +102,15 @@ public function streamedFileInline(string $filePath, ?string $fileName = null):
     protected function getHeaders(string $fileName, int $fileSize, string $mime = 'application/octet-stream'): array
     {
         $disposition = ($mime === 'application/octet-stream') ? 'attachment' : 'inline';
-        $downloadName = str_replace('"', '', $fileName);
+
+        $downloadName = str_replace(['"', '/', '\\', '$'], '', $fileName);
+        $downloadName = preg_replace('/[\x00-\x1F\x7F]/', '', $downloadName);
+        $encodedDownloadName = rawurlencode($downloadName);
 
         return [
             'Content-Type'           => $mime,
             'Content-Length'         => $fileSize,
-            'Content-Disposition'    => "{$disposition}; filename=\"{$downloadName}\"",
+            'Content-Disposition'    => "{$disposition}; filename*=UTF-8''{$encodedDownloadName}",
             'X-Content-Type-Options' => 'nosniff',
         ];
     }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 00bf8cbe1c5..ff01f3707bd 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -32,12 +32,14 @@ class Kernel extends HttpKernel
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \BookStack\Http\Middleware\StartSessionExtended::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \BookStack\Http\Middleware\VerifyCsrfToken::class,
+            \BookStack\Http\Middleware\PreventRequestForgery::class,
             \BookStack\Http\Middleware\CheckEmailConfirmed::class,
             \BookStack\Http\Middleware\RunThemeActions::class,
             \BookStack\Http\Middleware\Localization::class,
+            \BookStack\Http\Middleware\ClearPerRequestCaches::class,
         ],
         'api' => [
+            \BookStack\Http\Middleware\ApplyCspRules::class,
             \BookStack\Http\Middleware\ThrottleApiRequests::class,
             \BookStack\Http\Middleware\EncryptCookies::class,
             \BookStack\Http\Middleware\StartSessionIfCookieExists::class,
diff --git a/app/Http/Middleware/ApiAuthenticate.php b/app/Http/Middleware/ApiAuthenticate.php
index 15b5a325a10..bfee87f6c65 100644
--- a/app/Http/Middleware/ApiAuthenticate.php
+++ b/app/Http/Middleware/ApiAuthenticate.php
@@ -17,7 +17,7 @@ class ApiAuthenticate
     public function handle(Request $request, Closure $next)
     {
         // Validate the token and it's users API access
-        $this->ensureAuthorizedBySessionOrToken();
+        $this->ensureAuthorizedBySessionOrToken($request);
 
         return $next($request);
     }
@@ -28,22 +28,28 @@ public function handle(Request $request, Closure $next)
      *
      * @throws ApiAuthException
      */
-    protected function ensureAuthorizedBySessionOrToken(): void
+    protected function ensureAuthorizedBySessionOrToken(Request $request): void
     {
-        // Return if the user is already found to be signed in via session-based auth.
-        // This is to make it easy to browser the API via browser after just logging into the system.
-        if (!user()->isGuest() || session()->isStarted()) {
+        // Use the active user session already exists.
+        // This is to make it easy to explore API endpoints via the UI.
+        if (session()->isStarted()) {
+            // Ensure the user has API access permission
             if (!$this->sessionUserHasApiAccess()) {
                 throw new ApiAuthException(trans('errors.api_user_no_api_permission'), 403);
             }
 
+            // Only allow GET requests for cookie-based API usage
+            if ($request->method() !== 'GET') {
+                throw new ApiAuthException(trans('errors.api_cookie_auth_only_get'), 403);
+            }
+
             return;
         }
 
         // Set our api guard to be the default for this request lifecycle.
         auth()->shouldUse('api');
 
-        // Validate the token and it's users API access
+        // Validate the token and its users API access
         auth()->authenticate();
     }
 
diff --git a/app/Http/Middleware/ApplyCspRules.php b/app/Http/Middleware/ApplyCspRules.php
index 9f3a8d1d84f..088ee7e43d2 100644
--- a/app/Http/Middleware/ApplyCspRules.php
+++ b/app/Http/Middleware/ApplyCspRules.php
@@ -8,25 +8,18 @@
 
 class ApplyCspRules
 {
-    protected CspService $cspService;
-
-    public function __construct(CspService $cspService)
-    {
-        $this->cspService = $cspService;
+    public function __construct(
+        protected CspService $cspService
+    ) {
     }
 
     /**
      * Handle an incoming request.
-     *
-     * @param Request $request
-     * @param Closure $next
-     *
-     * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next): mixed
     {
         view()->share('cspNonce', $this->cspService->getNonce());
-        if ($this->cspService->allowedIFrameHostsConfigured()) {
+        if ($this->cspService->allowedIFrameHostsConfigured() && !$request->is('api/*')) {
             config()->set('session.same_site', 'none');
         }
 
diff --git a/app/Http/Middleware/ClearPerRequestCaches.php b/app/Http/Middleware/ClearPerRequestCaches.php
new file mode 100644
index 00000000000..5210062e7ce
--- /dev/null
+++ b/app/Http/Middleware/ClearPerRequestCaches.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace BookStack\Http\Middleware;
+
+use BookStack\View\ViewBlockManager;
+use Closure;
+use Illuminate\Http\Request;
+
+/**
+ * Custom middleware to clear any local caches in the app which are created on a
+ * per-request basis. While this can be somewhat redundant in the normal PHP request
+ * lifecycle (since in memory caches are cleared on each request), this can be useful
+ * in testing and to prepare for future long-serving PHP runtimes.
+ */
+class ClearPerRequestCaches
+{
+    public function __construct(
+        protected ViewBlockManager $viewBlockManager,
+    ) {
+    }
+
+    public function handle(Request $request, Closure $next)
+    {
+        $this->clearCaches();
+
+        return $next($request);
+    }
+
+    protected function clearCaches(): void
+    {
+        $this->viewBlockManager->clearLocalCache();
+    }
+}
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/PreventRequestForgery.php
similarity index 74%
rename from app/Http/Middleware/VerifyCsrfToken.php
rename to app/Http/Middleware/PreventRequestForgery.php
index 7c8689b8bcd..463664e6d94 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/PreventRequestForgery.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestForgery as Middleware;
 
-class VerifyCsrfToken extends Middleware
+class PreventRequestForgery extends Middleware
 {
     /**
      * Indicates whether the XSRF-TOKEN cookie should be set on the response.
diff --git a/app/Http/Middleware/StartSessionExtended.php b/app/Http/Middleware/StartSessionExtended.php
index 26cd250ac34..8c5c7cf18b9 100644
--- a/app/Http/Middleware/StartSessionExtended.php
+++ b/app/Http/Middleware/StartSessionExtended.php
@@ -14,7 +14,10 @@
 class StartSessionExtended extends Middleware
 {
     protected static array $pathPrefixesExcludedFromHistory = [
-        'uploads/images/'
+        'uploads/images/',
+        'dist/',
+        'manifest.json',
+        'opensearch.xml',
     ];
 
     /**
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index ec5725d67c7..a7596d4ac5d 100644
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -15,5 +15,6 @@ class TrimStrings extends Middleware
         'password',
         'password_confirmation',
         'password-confirm',
+        'password-current',
     ];
 }
diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 56b22ad1604..101e3a00f29 100644
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -61,8 +61,7 @@ public function rebuildForEntity(Entity $entity): void
             return;
         }
 
-        /** @var BookChild $entity */
-        if ($entity->book) {
+        if ($entity instanceof BookChild) {
             $entities[] = $entity->book;
         }
 
@@ -71,7 +70,11 @@ public function rebuildForEntity(Entity $entity): void
         }
 
         if ($entity instanceof Chapter) {
-            foreach ($entity->pages as $page) {
+            $childPages = $entity->pages()
+                ->withTrashed()
+                ->select(['id', 'owned_by', 'book_id', 'chapter_id'])
+                ->get();
+            foreach ($childPages as $page) {
                 $entities[] = $page;
             }
         }
@@ -102,6 +105,7 @@ public function rebuildForRole(Role $role)
 
     /**
      * Get a query for fetching a book with its children.
+     * @return Builder<Book>
      */
     protected function bookFetchQuery(): Builder
     {
@@ -118,9 +122,11 @@ protected function bookFetchQuery(): Builder
 
     /**
      * Build joint permissions for the given book and role combinations.
+     * @param EloquentCollection<int, Book> $books
      */
     protected function buildJointPermissionsForBooks(EloquentCollection $books, array $roles, bool $deleteOld = false): void
     {
+        /** @var EloquentCollection<int, Entity> $entities */
         $entities = clone $books;
 
         /** @var Book $book */
diff --git a/app/Permissions/Permission.php b/app/Permissions/Permission.php
index a434e54fd61..0fbe9693dcb 100644
--- a/app/Permissions/Permission.php
+++ b/app/Permissions/Permission.php
@@ -48,9 +48,7 @@ enum Permission: string
     case AttachmentUpdateAll = 'attachment-update-all';
     case AttachmentUpdateOwn = 'attachment-update-own';
 
-    case CommentCreate = 'comment-create';
     case CommentCreateAll = 'comment-create-all';
-    case CommentCreateOwn = 'comment-create-own';
     case CommentDelete = 'comment-delete';
     case CommentDeleteAll = 'comment-delete-all';
     case CommentDeleteOwn = 'comment-delete-own';
@@ -120,6 +118,8 @@ enum Permission: string
     case PageViewAll = 'page-view-all';
     case PageViewOwn = 'page-view-own';
 
+    case RevisionViewAll = 'revision-view-all';
+
     /**
      * Get the generic permissions which may be queried for entities.
      */
diff --git a/app/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php
index 23fdcfda9e5..0ba210d371b 100644
--- a/app/Permissions/PermissionApplicator.php
+++ b/app/Permissions/PermissionApplicator.php
@@ -40,10 +40,6 @@ public function checkOwnableUserAccess(Model&OwnableInterface $ownable, string|P
         $ownerField = $ownable->getOwnerFieldName();
         $ownableFieldVal = $ownable->getAttribute($ownerField);
 
-        if (is_null($ownableFieldVal)) {
-            throw new InvalidArgumentException("{$ownerField} field used but has not been loaded");
-        }
-
         $isOwner = $user->id === $ownableFieldVal;
         $hasRolePermission = $allRolePermission || ($isOwner && $ownRolePermission);
 
@@ -144,10 +140,10 @@ public function restrictEntityRelationQuery(Builder $query, string $tableName, s
                 /** @var Builder $query */
                 $query->where($tableDetails['entityTypeColumn'], '!=', $pageMorphClass)
                 ->orWhereExists(function (QueryBuilder $query) use ($tableDetails, $pageMorphClass) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
+                    $query->select('page_id')->from('entity_page_data')
+                        ->whereColumn('entity_page_data.page_id', '=', $tableDetails['tableName'] . '.' . $tableDetails['entityIdColumn'])
                         ->where($tableDetails['tableName'] . '.' . $tableDetails['entityTypeColumn'], '=', $pageMorphClass)
-                        ->where('pages.draft', '=', false);
+                        ->where('entity_page_data.draft', '=', false);
                 });
             });
     }
@@ -197,18 +193,19 @@ public function restrictPageRelationQuery(Builder $query, string $tableName, str
     {
         $fullPageIdColumn = $tableName . '.' . $pageIdColumn;
         return $this->restrictEntityQuery($query)
-            ->where(function ($query) use ($fullPageIdColumn) {
-                /** @var Builder $query */
-                $query->whereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $fullPageIdColumn)
-                        ->where('pages.draft', '=', false);
-                })->orWhereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
-                    $query->select('id')->from('pages')
-                        ->whereColumn('pages.id', '=', $fullPageIdColumn)
-                        ->where('pages.draft', '=', true)
-                        ->where('pages.created_by', '=', $this->currentUser()->id);
-                });
+            ->whereExists(function (QueryBuilder $query) use ($fullPageIdColumn) {
+                $query->select('id')->from('entities')
+                    ->leftJoin('entity_page_data', 'entities.id', '=', 'entity_page_data.page_id')
+                    ->whereColumn('entities.id', '=', $fullPageIdColumn)
+                    ->where('entities.type', '=', 'page')
+                    ->whereNull('entities.deleted_at')
+                    ->where(function (QueryBuilder $query) {
+                        $query->where('entity_page_data.draft', '=', false)
+                            ->orWhere(function (QueryBuilder $query) {
+                                $query->where('entity_page_data.draft', '=', true)
+                                    ->where('entities.created_by', '=', $this->currentUser()->id);
+                            });
+                    });
             });
     }
 
diff --git a/app/References/Reference.php b/app/References/Reference.php
index df8a3a78932..602e19eab59 100644
--- a/app/References/Reference.php
+++ b/app/References/Reference.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References;
 
+use BookStack\App\Model;
 use BookStack\Permissions\Models\JointPermission;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
diff --git a/app/References/ReferenceChangeContext.php b/app/References/ReferenceChangeContext.php
new file mode 100644
index 00000000000..27de0e2d24c
--- /dev/null
+++ b/app/References/ReferenceChangeContext.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace BookStack\References;
+
+use BookStack\Entities\Models\Entity;
+
+class ReferenceChangeContext
+{
+    /**
+     * Entity pairs where the first is the old entity and the second is the new entity.
+     * @var array<array{0: Entity, 1: Entity}>
+     */
+    protected array $changes = [];
+
+    public function add(Entity $oldEntity, Entity $newEntity): void
+    {
+        $this->changes[] = [$oldEntity, $newEntity];
+    }
+
+    /**
+     * Get all the new entities from the changes.
+     */
+    public function getNewEntities(): array
+    {
+        return array_column($this->changes, 1);
+    }
+
+    /**
+     * Get all the old entities from the changes.
+     */
+    public function getOldEntities(): array
+    {
+        return array_column($this->changes, 0);
+    }
+
+    public function getNewForOld(Entity $oldEntity): ?Entity
+    {
+        foreach ($this->changes as [$old, $new]) {
+            if ($old->id === $oldEntity->id && $old->type === $oldEntity->type) {
+                return $new;
+            }
+        }
+        return null;
+    }
+}
diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.php
index 1c9664f45a9..0c76b46982c 100644
--- a/app/References/ReferenceFetcher.php
+++ b/app/References/ReferenceFetcher.php
@@ -20,10 +20,11 @@ public function __construct(
      * Query and return the references pointing to the given entity.
      * Loads the commonly required relations while taking permissions into account.
      */
-    public function getReferencesToEntity(Entity $entity): Collection
+    public function getReferencesToEntity(Entity $entity, bool $withContents = false): Collection
     {
+        /** @var Collection<int, Reference> $references */
         $references = $this->queryReferencesToEntity($entity)->get();
-        $this->mixedEntityListLoader->loadIntoRelations($references->all(), 'from', true);
+        $this->mixedEntityListLoader->loadIntoRelations($references->all(), 'from', false, $withContents);
 
         return $references;
     }
@@ -37,6 +38,9 @@ public function getReferenceCountToEntity(Entity $entity): int
         return $this->queryReferencesToEntity($entity)->count();
     }
 
+    /**
+     * @return Builder<Reference>
+     */
     protected function queryReferencesToEntity(Entity $entity): Builder
     {
         $baseQuery = Reference::query()
diff --git a/app/References/ReferenceUpdater.php b/app/References/ReferenceUpdater.php
index 5f1d711e9c6..835746ddf7b 100644
--- a/app/References/ReferenceUpdater.php
+++ b/app/References/ReferenceUpdater.php
@@ -3,9 +3,8 @@
 namespace BookStack\References;
 
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\HasDescriptionInterface;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\HtmlDescriptionInterface;
-use BookStack\Entities\Models\HtmlDescriptionTrait;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\RevisionRepo;
 use BookStack\Util\HtmlDocument;
@@ -30,13 +29,54 @@ public function updateEntityReferences(Entity $entity, string $oldLink): void
         }
     }
 
+    /**
+     * Change existing references for a range of entities using the given context.
+     */
+    public function changeReferencesUsingContext(ReferenceChangeContext $context): void
+    {
+        $bindings = [];
+        foreach ($context->getOldEntities() as $old) {
+            $bindings[] = $old->getMorphClass();
+            $bindings[] = $old->id;
+        }
+
+        // No targets to update within the context, so no need to continue.
+        if (count($bindings) < 2) {
+            return;
+        }
+
+        $toReferenceQuery = '(to_type, to_id) IN (' . rtrim(str_repeat('(?,?),', count($bindings) / 2), ',') . ')';
+
+        // Cycle each new entity in the context
+        foreach ($context->getNewEntities() as $new) {
+            // For each, get all references from it which lead to other items within the context of the change
+            $newReferencesInContext = $new->referencesFrom()->whereRaw($toReferenceQuery, $bindings)->get();
+            // For each reference, update the URL and the reference entry
+            foreach ($newReferencesInContext as $reference) {
+                $oldToEntity = $reference->to;
+                $newToEntity = $context->getNewForOld($oldToEntity);
+                if ($newToEntity === null) {
+                    continue;
+                }
+
+                $this->updateReferencesWithinEntity($new, $oldToEntity->getUrl(), $newToEntity->getUrl());
+                if ($newToEntity instanceof Page && $oldToEntity instanceof Page) {
+                    $this->updateReferencesWithinEntity($new, $oldToEntity->getPermalink(), $newToEntity->getPermalink());
+                }
+                $reference->to_id = $newToEntity->id;
+                $reference->to_type = $newToEntity->getMorphClass();
+                $reference->save();
+            }
+        }
+    }
+
     /**
      * @return Reference[]
      */
     protected function getReferencesToUpdate(Entity $entity): array
     {
         /** @var Reference[] $references */
-        $references = $this->referenceFetcher->getReferencesToEntity($entity)->values()->all();
+        $references = $this->referenceFetcher->getReferencesToEntity($entity, true)->values()->all();
 
         if ($entity instanceof Book) {
             $pages = $entity->pages()->get(['id']);
@@ -44,7 +84,7 @@ protected function getReferencesToUpdate(Entity $entity): array
             $children = $pages->concat($chapters);
             foreach ($children as $bookChild) {
                 /** @var Reference[] $childRefs */
-                $childRefs = $this->referenceFetcher->getReferencesToEntity($bookChild)->values()->all();
+                $childRefs = $this->referenceFetcher->getReferencesToEntity($bookChild, true)->values()->all();
                 array_push($references, ...$childRefs);
             }
         }
@@ -64,16 +104,16 @@ protected function updateReferencesWithinEntity(Entity $entity, string $oldLink,
             $this->updateReferencesWithinPage($entity, $oldLink, $newLink);
         }
 
-        if ($entity instanceof HtmlDescriptionInterface) {
+        if ($entity instanceof HasDescriptionInterface) {
             $this->updateReferencesWithinDescription($entity, $oldLink, $newLink);
         }
     }
 
-    protected function updateReferencesWithinDescription(Entity&HtmlDescriptionInterface $entity, string $oldLink, string $newLink): void
+    protected function updateReferencesWithinDescription(Entity&HasDescriptionInterface $entity, string $oldLink, string $newLink): void
     {
-        $entity = (clone $entity)->refresh();
-        $html = $this->updateLinksInHtml($entity->descriptionHtml(true) ?: '', $oldLink, $newLink);
-        $entity->setDescriptionHtml($html);
+        $description = $entity->descriptionInfo();
+        $html = $this->updateLinksInHtml($description->getHtml(true) ?: '', $oldLink, $newLink);
+        $description->set($html);
         $entity->save();
     }
 
@@ -85,7 +125,7 @@ protected function updateReferencesWithinPage(Page $page, string $oldLink, strin
 
         $page->html = $html;
         $page->markdown = $markdown;
-        $page->revision_count++;
+        $page->incrementRevisionCount();
         $page->save();
 
         $summary = trans('entities.pages_references_update_revision');
diff --git a/app/Search/SearchApiController.php b/app/Search/SearchApiController.php
index cd4a14a3931..35816ac1454 100644
--- a/app/Search/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -1,11 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BookStack\Search;
 
 use BookStack\Api\ApiEntityListFormatter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Http\ApiController;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 
 class SearchApiController extends ApiController
 {
@@ -15,6 +19,16 @@ class SearchApiController extends ApiController
             'page'  => ['integer', 'min:1'],
             'count' => ['integer', 'min:1', 'max:100'],
         ],
+        'book' => [
+            'query' => ['required'],
+            'page'  => ['integer', 'min:1'],
+            'count' => ['integer', 'min:1', 'max:100'],
+        ],
+        'chapter' => [
+            'query' => ['required'],
+            'page'  => ['integer', 'min:1'],
+            'count' => ['integer', 'min:1', 'max:100'],
+        ],
     ];
 
     public function __construct(
@@ -31,19 +45,72 @@ public function __construct(
      * between: bookshelf, book, chapter & page.
      *
      * The paging parameters and response format emulates a standard listing endpoint
-     * but standard sorting and filtering cannot be done on this endpoint. If a count value
-     * is provided this will only be taken as a suggestion. The results in the response
-     * may currently be up to 4x this value.
+     * but standard sorting and filtering cannot be done on this endpoint.
      */
-    public function all(Request $request)
+    public function all(Request $request): JsonResponse
     {
         $this->validate($request, $this->rules['all']);
 
-        $options = SearchOptions::fromString($request->get('query') ?? '');
-        $page = intval($request->get('page', '0')) ?: 1;
-        $count = min(intval($request->get('count', '0')) ?: 20, 100);
-
+        [$options, $page, $count] = $this->getRequestData($request);
         $results = $this->searchRunner->searchEntities($options, 'all', $page, $count);
+
+        return $this->resultsResponse($results, $options);
+    }
+
+    /**
+     * Run a search query against the contents of a single book, searching its pages and chapters.
+     * Takes the same input as the 'all' endpoint, and the same input as the search box
+     * shown within a book in the BookStack interface.
+     *
+     * Only pages and chapters are searched, since those are what a book contains. A
+     * {type:...} term in the query can narrow that further but cannot widen it.
+     */
+    public function book(Request $request, string $id): JsonResponse
+    {
+        $this->validate($request, $this->rules['book']);
+
+        [$options, $page, $count] = $this->getRequestData($request);
+        $results = $this->searchRunner->searchBook(intval($id), $options, $page, $count);
+
+        return $this->resultsResponse($results, $options);
+    }
+
+    /**
+     * Run a search query against the contents of a single chapter.
+     * Takes the same input as the 'all' endpoint, and the same input as the search box
+     * shown within a chapter in the BookStack interface.
+     *
+     * Only pages are searched, since those are what a chapter contains.
+     */
+    public function chapter(Request $request, string $id): JsonResponse
+    {
+        $this->validate($request, $this->rules['chapter']);
+
+        [$options, $page, $count] = $this->getRequestData($request);
+        $results = $this->searchRunner->searchChapter(intval($id), $options, $page, $count);
+
+        return $this->resultsResponse($results, $options);
+    }
+
+    /**
+     * Get common search request data.
+     * @return array{0: SearchOptions, 1: int, 2: int}
+     */
+    protected function getRequestData(Request $request): array
+    {
+        $options = SearchOptions::fromString($request->input('query') ?? '');
+        $page = intval($request->input('page', '0')) ?: 1;
+        $count = min(intval($request->input('count', '0')) ?: 20, 100);
+        return [$options, $page, $count];
+    }
+
+    /**
+     * Format a set of search results into the standard API response shape.
+     *
+     * @param array{total: int, results: Collection} $results
+     */
+    protected function resultsResponse(array $results, SearchOptions $options): JsonResponse
+    {
         $this->resultsFormatter->format($results['results']->all(), $options);
 
         $data = (new ApiEntityListFormatter($results['results']->all()))
diff --git a/app/Search/SearchController.php b/app/Search/SearchController.php
index 2fce6a3d53f..476d153a304 100644
--- a/app/Search/SearchController.php
+++ b/app/Search/SearchController.php
@@ -7,6 +7,7 @@
 use BookStack\Entities\Tools\SiblingFetcher;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
 
 class SearchController extends Controller
 {
@@ -23,20 +24,22 @@ public function search(Request $request, SearchResultsFormatter $formatter)
     {
         $searchOpts = SearchOptions::fromRequest($request);
         $fullSearchString = $searchOpts->toString();
-        $this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));
-
-        $page = intval($request->get('page', '0')) ?: 1;
-        $nextPageLink = url('/search?term=' . urlencode($fullSearchString) . '&page=' . ($page + 1));
+        $page = intval($request->input('page', '0')) ?: 1;
+        $count = setting()->getInteger('lists-page-count-search', 18, 1, 1000);
 
-        $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, 20);
+        $results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, $count);
         $formatter->format($results['results']->all(), $searchOpts);
+        $paginator = new LengthAwarePaginator($results['results'], $results['total'], $count, $page);
+        $paginator->setPath(url('/search'));
+        $paginator->appends($request->except('page'));
+
+        $this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));
 
         return view('search.all', [
             'entities'     => $results['results'],
             'totalResults' => $results['total'],
+            'paginator'    => $paginator,
             'searchTerm'   => $fullSearchString,
-            'hasNextPage'  => $results['has_more'],
-            'nextPageLink' => $nextPageLink,
             'options'      => $searchOpts,
         ]);
     }
@@ -46,10 +49,10 @@ public function search(Request $request, SearchResultsFormatter $formatter)
      */
     public function searchBook(Request $request, int $bookId)
     {
-        $term = $request->get('term', '');
-        $results = $this->searchRunner->searchBook($bookId, $term);
+        $term = $request->input('term', '');
+        $results = $this->searchRunner->searchBook($bookId, SearchOptions::fromString($term));
 
-        return view('entities.list', ['entities' => $results]);
+        return view('entities.list', ['entities' => $results['results']]);
     }
 
     /**
@@ -57,10 +60,10 @@ public function searchBook(Request $request, int $bookId)
      */
     public function searchChapter(Request $request, int $chapterId)
     {
-        $term = $request->get('term', '');
-        $results = $this->searchRunner->searchChapter($chapterId, $term);
+        $term = $request->input('term', '');
+        $results = $this->searchRunner->searchChapter($chapterId, SearchOptions::fromString($term));
 
-        return view('entities.list', ['entities' => $results]);
+        return view('entities.list', ['entities' => $results['results']]);
     }
 
     /**
@@ -69,14 +72,15 @@ public function searchChapter(Request $request, int $chapterId)
      */
     public function searchForSelector(Request $request, QueryPopular $queryPopular)
     {
-        $entityTypes = $request->filled('types') ? explode(',', $request->get('types')) : ['page', 'chapter', 'book'];
-        $searchTerm = $request->get('term', false);
-        $permission = $request->get('permission', 'view');
+        $entityTypes = $request->filled('types') ? explode(',', $request->input('types')) : ['page', 'chapter', 'book'];
+        $searchTerm = $request->input('term', false);
+        $permission = $request->input('permission', 'view');
 
         // Search for entities otherwise show most popular
         if ($searchTerm !== false) {
-            $searchTerm .= ' {type:' . implode('|', $entityTypes) . '}';
-            $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 20)['results'];
+            $options = SearchOptions::fromString($searchTerm);
+            $options->setFilter('type', implode('|', $entityTypes));
+            $entities = $this->searchRunner->searchEntities($options, 'all', 1, 20)['results'];
         } else {
             $entities = $queryPopular->run(20, 0, $entityTypes);
         }
@@ -89,7 +93,7 @@ public function searchForSelector(Request $request, QueryPopular $queryPopular)
      */
     public function templatesForSelector(Request $request)
     {
-        $searchTerm = $request->get('term', false);
+        $searchTerm = $request->input('term', false);
 
         if ($searchTerm !== false) {
             $searchOptions = SearchOptions::fromString($searchTerm);
@@ -115,7 +119,7 @@ public function templatesForSelector(Request $request)
      */
     public function searchSuggestions(Request $request)
     {
-        $searchTerm = $request->get('term', '');
+        $searchTerm = $request->input('term', '');
         $entities = $this->searchRunner->searchEntities(SearchOptions::fromString($searchTerm), 'all', 1, 5)['results'];
 
         foreach ($entities as $entity) {
@@ -128,12 +132,12 @@ public function searchSuggestions(Request $request)
     }
 
     /**
-     * Search siblings items in the system.
+     * Search sibling items in the system.
      */
     public function searchSiblings(Request $request, SiblingFetcher $siblingFetcher)
     {
-        $type = $request->get('entity_type', null);
-        $id = $request->get('entity_id', null);
+        $type = $request->input('entity_type', null);
+        $id = $request->input('entity_id', null);
 
         $entities = $siblingFetcher->fetch($type, $id);
 
diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index 117d069ea77..e2a4a21a472 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -119,14 +119,14 @@ protected function insertTerms(array $terms): void
      * Create a scored term array from the given text, where the keys are the terms
      * and the values are their scores.
      *
-     * @return array<string, int>
+     * @return array<string, float>
      */
     protected function generateTermScoreMapFromText(string $text, float $scoreAdjustment = 1): array
     {
         $termMap = $this->textToTermCountMap($text);
 
         foreach ($termMap as $term => $count) {
-            $termMap[$term] = floor($count * $scoreAdjustment);
+            $termMap[$term] = intval($count * $scoreAdjustment);
         }
 
         return $termMap;
@@ -136,7 +136,7 @@ protected function generateTermScoreMapFromText(string $text, float $scoreAdjust
      * Create a scored term array from the given HTML, where the keys are the terms
      * and the values are their scores.
      *
-     * @return array<string, int>
+     * @return array<string, float>
      */
     protected function generateTermScoreMapFromHtml(string $html): array
     {
@@ -177,7 +177,7 @@ protected function generateTermScoreMapFromHtml(string $html): array
      *
      * @param Tag[] $tags
      *
-     * @return array<string, int>
+     * @return array<string, float>
      */
     protected function generateTermScoreMapFromTags(array $tags): array
     {
@@ -277,9 +277,9 @@ protected function entityToTermDataArray(Entity $entity): array
      * For the given term data arrays, Merge their contents by term
      * while combining any scores.
      *
-     * @param array<string, int>[] ...$scoreMaps
+     * @param array<string, float>[] ...$scoreMaps
      *
-     * @return array<string, int>
+     * @return array<string, float>
      */
     protected function mergeTermScoreMaps(...$scoreMaps): array
     {
diff --git a/app/Search/SearchOptionSet.php b/app/Search/SearchOptionSet.php
index 844d145e6fc..19f1c550976 100644
--- a/app/Search/SearchOptionSet.php
+++ b/app/Search/SearchOptionSet.php
@@ -82,4 +82,12 @@ public function nonNegated(): self
         $values = array_values(array_filter($this->options, fn (SearchOption $option) => !$option->negated));
         return new self($values);
     }
+
+    /**
+     * @return self<T>
+     */
+    public function limit(int $limit): self
+    {
+        return new self(array_slice(array_values($this->options), 0, $limit));
+    }
 }
diff --git a/app/Search/SearchOptions.php b/app/Search/SearchOptions.php
index bf527d9c305..f3eb58b6b04 100644
--- a/app/Search/SearchOptions.php
+++ b/app/Search/SearchOptions.php
@@ -35,6 +35,7 @@ public static function fromString(string $search): self
     {
         $instance = new self();
         $instance->addOptionsFromString($search);
+        $instance->limitOptions();
         return $instance;
     }
 
@@ -50,7 +51,7 @@ public static function fromRequest(Request $request): self
         }
 
         if ($request->has('term')) {
-            return static::fromString($request->get('term'));
+            return static::fromString($request->input('term'));
         }
 
         $instance = new SearchOptions();
@@ -87,6 +88,8 @@ public static function fromRequest(Request $request): self
             $instance->filters = $instance->filters->merge($extras->filters);
         }
 
+        $instance->limitOptions();
+
         return $instance;
     }
 
@@ -118,13 +121,11 @@ protected function addOptionsFromString(string $searchString): void
         foreach ($patterns as $termType => $pattern) {
             $matches = [];
             preg_match_all($pattern, $searchString, $matches);
-            if (count($matches) > 0) {
-                foreach ($matches[1] as $index => $value) {
-                    $negated = str_starts_with($matches[0][$index], '-');
-                    $terms[$termType][] = $constructors[$termType]($value, $negated);
-                }
-                $searchString = preg_replace($pattern, '', $searchString);
+            foreach ($matches[1] as $index => $value) {
+                $negated = str_starts_with($matches[0][$index], '-');
+                $terms[$termType][] = $constructors[$termType]($value, $negated);
             }
+            $searchString = preg_replace($pattern, '', $searchString);
         }
 
         // Unescape exacts and backslash escapes
@@ -147,6 +148,25 @@ protected function addOptionsFromString(string $searchString): void
         $this->filters = $this->filters->merge(new SearchOptionSet($terms['filters']));
     }
 
+    /**
+     * Limit the amount of search options to reasonable levels.
+     * Provides higher limits to logged-in users since that signals a slightly
+     * higher level of trust.
+     */
+    protected function limitOptions(): void
+    {
+        $userLoggedIn = !user()->isGuest();
+        $searchLimit = $userLoggedIn ? 10 : 5;
+        $exactLimit = $userLoggedIn ? 4 : 2;
+        $tagLimit = $userLoggedIn ? 8 : 4;
+        $filterLimit = $userLoggedIn ? 10 : 5;
+
+        $this->searches = $this->searches->limit($searchLimit);
+        $this->exacts = $this->exacts->limit($exactLimit);
+        $this->tags = $this->tags->limit($tagLimit);
+        $this->filters = $this->filters->limit($filterLimit);
+    }
+
     /**
      * Decode backslash escaping within the input string.
      */
@@ -239,7 +259,7 @@ public function getAdditionalOptionsString(): string
         $userFilters = ['updated_by', 'created_by', 'owned_by'];
         $unsupportedFilters = ['is_template', 'sort_by'];
         foreach ($this->filters->all() as $filter) {
-            if (in_array($filter->getKey(), $userFilters, true) && $filter->value !== null && $filter->value !== 'me') {
+            if (in_array($filter->getKey(), $userFilters, true) && $filter->value && $filter->value !== 'me') {
                 $options[] = $filter;
             } else if (in_array($filter->getKey(), $unsupportedFilters, true)) {
                 $options[] = $filter;
diff --git a/app/Search/SearchResultsFormatter.php b/app/Search/SearchResultsFormatter.php
index b06f81e0e05..7bb5e03cc65 100644
--- a/app/Search/SearchResultsFormatter.php
+++ b/app/Search/SearchResultsFormatter.php
@@ -91,7 +91,7 @@ protected function getMatchPositions(string $text, array $terms): array
             $offset = 0;
             $term = mb_strtolower($term);
             $pos = mb_strpos($text, $term, $offset);
-            while ($pos !== false) {
+            while ($pos !== false && count($matchRefs) < 25) {
                 $end = $pos + mb_strlen($term);
                 $matchRefs[$pos] = $end;
                 $offset = $end;
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index c14d1c642d9..dba6361b8d6 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -4,16 +4,16 @@
 
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
-use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\EntityTable;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Entities\Tools\EntityHydrator;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Search\Options\TagSearchOption;
 use BookStack\Users\Models\User;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -22,7 +22,7 @@
 class SearchRunner
 {
     /**
-     * Retain a cache of score adjusted terms for specific search options.
+     * Retain a cache of score-adjusted terms for specific search options.
      */
     protected WeakMap $termAdjustmentCache;
 
@@ -30,16 +30,15 @@ public function __construct(
         protected EntityProvider $entityProvider,
         protected PermissionApplicator $permissions,
         protected EntityQueries $entityQueries,
+        protected EntityHydrator $entityHydrator,
     ) {
         $this->termAdjustmentCache = new WeakMap();
     }
 
     /**
      * Search all entities in the system.
-     * The provided count is for each entity to search,
-     * Total returned could be larger and not guaranteed.
      *
-     * @return array{total: int, count: int, has_more: bool, results: Collection<Entity>}
+     * @return array{total: int, results: Collection<Entity>}
      */
     public function searchEntities(SearchOptions $searchOpts, string $entityType = 'all', int $page = 1, int $count = 20): array
     {
@@ -53,112 +52,94 @@ public function searchEntities(SearchOptions $searchOpts, string $entityType = '
             $entityTypesToSearch = explode('|', $filterMap['type']);
         }
 
-        $results = collect();
-        $total = 0;
-        $hasMore = false;
-
-        foreach ($entityTypesToSearch as $entityType) {
-            if (!in_array($entityType, $entityTypes)) {
-                continue;
-            }
-
-            $searchQuery = $this->buildQuery($searchOpts, $entityType);
-            $entityTotal = $searchQuery->count();
-            $searchResults = $this->getPageOfDataFromQuery($searchQuery, $entityType, $page, $count);
-
-            if ($entityTotal > ($page * $count)) {
-                $hasMore = true;
-            }
-
-            $total += $entityTotal;
-            $results = $results->merge($searchResults);
-        }
+        $searchQuery = $this->buildQuery($searchOpts, $entityTypesToSearch);
+        $total = $searchQuery->count();
+        $results = $this->getPageOfDataFromQuery($searchQuery, $page, $count);
 
         return [
             'total'    => $total,
-            'count'    => count($results),
-            'has_more' => $hasMore,
-            'results'  => $results->sortByDesc('score')->values(),
+            'results'  => $results->values(),
         ];
     }
 
     /**
      * Search a book for entities.
+     *
+     * @return array{total: int, results: Collection<Entity>}
      */
-    public function searchBook(int $bookId, string $searchString): Collection
+    public function searchBook(int $bookId, SearchOptions $searchOpts, int $page = 1, int $count = 20): array
     {
-        $opts = SearchOptions::fromString($searchString);
         $entityTypes = ['page', 'chapter'];
-        $filterMap = $opts->filters->toValueMap();
+        $filterMap = $searchOpts->filters->toValueMap();
         $entityTypesToSearch = isset($filterMap['type']) ? explode('|', $filterMap['type']) : $entityTypes;
 
-        $results = collect();
-        foreach ($entityTypesToSearch as $entityType) {
-            if (!in_array($entityType, $entityTypes)) {
-                continue;
-            }
-
-            $search = $this->buildQuery($opts, $entityType)->where('book_id', '=', $bookId)->take(20)->get();
-            $results = $results->merge($search);
-        }
+        $filteredTypes = array_intersect($entityTypesToSearch, $entityTypes);
+        $query = $this->buildQuery($searchOpts, $filteredTypes)->where('book_id', '=', $bookId);
 
-        return $results->sortByDesc('score')->take(20);
+        return [
+            'total'   => $query->count(),
+            'results' => $this->getPageOfDataFromQuery($query, $page, $count)->sortByDesc('score')->values(),
+        ];
     }
 
     /**
      * Search a chapter for entities.
+     *
+     * @return array{total: int, results: Collection<Entity>}
      */
-    public function searchChapter(int $chapterId, string $searchString): Collection
+    public function searchChapter(int $chapterId, SearchOptions $searchOpts, int $page = 1, int $count = 20): array
     {
-        $opts = SearchOptions::fromString($searchString);
-        $pages = $this->buildQuery($opts, 'page')->where('chapter_id', '=', $chapterId)->take(20)->get();
+        $query = $this->buildQuery($searchOpts, ['page'])->where('chapter_id', '=', $chapterId);
 
-        return $pages->sortByDesc('score');
+        return [
+            'total'   => $query->count(),
+            'results' => $this->getPageOfDataFromQuery($query, $page, $count)->sortByDesc('score')->values(),
+        ];
     }
 
     /**
      * Get a page of result data from the given query based on the provided page parameters.
+     * @param EloquentBuilder<EntityTable> $query
+     * @return Collection<Entity>
      */
-    protected function getPageOfDataFromQuery(EloquentBuilder $query, string $entityType, int $page = 1, int $count = 20): EloquentCollection
+    protected function getPageOfDataFromQuery(EloquentBuilder $query, int $page, int $count): Collection
     {
-        $relations = ['tags'];
-
-        if ($entityType === 'page' || $entityType === 'chapter') {
-            $relations['book'] = function (BelongsTo $query) {
-                $query->scopes('visible');
-            };
-        }
-
-        if ($entityType === 'page') {
-            $relations['chapter'] = function (BelongsTo $query) {
-                $query->scopes('visible');
-            };
-        }
-
-        return $query->clone()
-            ->with(array_filter($relations))
+        $entities = $query->clone()
             ->skip(($page - 1) * $count)
             ->take($count)
             ->get();
+
+        $hydrated = $this->entityHydrator->hydrate($entities->all(), true, true);
+
+        return collect($hydrated);
     }
 
     /**
      * Create a search query for an entity.
+     * @param string[] $entityTypes
+     * @return EloquentBuilder<EntityTable>
      */
-    protected function buildQuery(SearchOptions $searchOpts, string $entityType): EloquentBuilder
+    protected function buildQuery(SearchOptions $searchOpts, array $entityTypes): EloquentBuilder
     {
-        $entityModelInstance = $this->entityProvider->get($entityType);
-        $entityQuery = $this->entityQueries->visibleForList($entityType);
+        $entityQuery = $this->entityQueries->visibleForList()
+            ->whereIn('type', $entityTypes);
 
         // Handle normal search terms
-        $this->applyTermSearch($entityQuery, $searchOpts, $entityType);
+        $this->applyTermSearch($entityQuery, $searchOpts, $entityTypes);
 
         // Handle exact term matching
         foreach ($searchOpts->exacts->all() as $exact) {
-            $filter = function (EloquentBuilder $query) use ($exact, $entityModelInstance) {
+            $filter = function (EloquentBuilder $query) use ($exact) {
                 $inputTerm = str_replace('\\', '\\\\', $exact->value);
                 $query->where('name', 'like', '%' . $inputTerm . '%')
-                    ->orWhere($entityModelInstance->textField, 'like', '%' . $inputTerm . '%');
+                    ->orWhere(function (EloquentBuilder $query) use ($inputTerm) {
+                        $query->whereNotNull('description')
+                            ->where('description', 'like', '%' . $inputTerm . '%');
+                    })
+                    ->orWhere(function (EloquentBuilder $query) use ($inputTerm) {
+                        $query->whereNotNull('text')
+                            ->where('text', 'like', '%' . $inputTerm . '%');
+                    });
             };
 
             $exact->negated ? $entityQuery->whereNot($filter) : $entityQuery->where($filter);
@@ -173,7 +154,7 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
         foreach ($searchOpts->filters->all() as $filterOption) {
             $functionName = Str::camel('filter_' . $filterOption->getKey());
             if (method_exists($this, $functionName)) {
-                $this->$functionName($entityQuery, $entityModelInstance, $filterOption->value, $filterOption->negated);
+                $this->$functionName($entityQuery, $filterOption->value, $filterOption->negated);
             }
         }
 
@@ -183,7 +164,7 @@ protected function buildQuery(SearchOptions $searchOpts, string $entityType): El
     /**
      * For the given search query, apply the queries for handling the regular search terms.
      */
-    protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $options, string $entityType): void
+    protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $options, array $entityTypes): void
     {
         $terms = $options->searches->toValueArray();
         if (count($terms) === 0) {
@@ -200,8 +181,6 @@ protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $
         ]);
 
         $subQuery->addBinding($scoreSelect['bindings'], 'select');
-
-        $subQuery->where('entity_type', '=', $entityType);
         $subQuery->where(function (Builder $query) use ($terms) {
             foreach ($terms as $inputTerm) {
                 $escapedTerm = str_replace('\\', '\\\\', $inputTerm);
@@ -210,7 +189,10 @@ protected function applyTermSearch(EloquentBuilder $entityQuery, SearchOptions $
         });
         $subQuery->groupBy('entity_type', 'entity_id');
 
-        $entityQuery->joinSub($subQuery, 's', 'id', '=', 'entity_id');
+        $entityQuery->joinSub($subQuery, 's', function (JoinClause $join) {
+            $join->on('s.entity_id', '=', 'entities.id')
+                ->on('s.entity_type', '=', 'entities.type');
+        });
         $entityQuery->addSelect('s.score');
         $entityQuery->orderBy('score', 'desc');
     }
@@ -320,7 +302,7 @@ protected function applyTagSearch(EloquentBuilder $query, TagSearchOption $optio
                 $query->where('name', '=', $tagParts['name']);
             }
 
-            if (is_numeric($tagParts['value']) && $tagParts['operator'] !== 'like') {
+            if (is_numeric($tagParts['value']) && is_finite(floatval($tagParts['value'])) && $tagParts['operator'] !== 'like') {
                 // We have to do a raw sql query for this since otherwise PDO will quote the value and MySQL will
                 // search the value as a string which prevents being able to do number-based operations
                 // on the tag values. We ensure it has a numeric value and then cast it just to be sure.
@@ -338,7 +320,7 @@ protected function applyTagSearch(EloquentBuilder $query, TagSearchOption $optio
         $option->negated ? $query->whereDoesntHave('tags', $filter) : $query->whereHas('tags', $filter);
     }
 
-    protected function applyNegatableWhere(EloquentBuilder $query, bool $negated, string $column, string $operator, mixed $value): void
+    protected function applyNegatableWhere(EloquentBuilder $query, bool $negated, string|callable $column, string|null $operator, mixed $value): void
     {
         if ($negated) {
             $query->whereNot($column, $operator, $value);
@@ -350,31 +332,31 @@ protected function applyNegatableWhere(EloquentBuilder $query, bool $negated, st
     /**
      * Custom entity search filters.
      */
-    protected function filterUpdatedAfter(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
+    protected function filterUpdatedAfter(EloquentBuilder $query, string $input, bool $negated): void
     {
         $date = date_create($input);
         $this->applyNegatableWhere($query, $negated, 'updated_at', '>=', $date);
     }
 
-    protected function filterUpdatedBefore(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
+    protected function filterUpdatedBefore(EloquentBuilder $query, string $input, bool $negated): void
     {
         $date = date_create($input);
         $this->applyNegatableWhere($query, $negated, 'updated_at', '<', $date);
     }
 
-    protected function filterCreatedAfter(EloquentBuilder $query, Entity $model, string $input, bool $negated): void
+    protected function filterCreatedAfter(EloquentBuilder $query, string $input, bool $negated): void
     {
         $date = date_create($input);
         $this->applyNegatableWhere($query, $negated, 'created_at', '>=', $date);
     }
 
-    protected function filterCreatedBefore(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterCreatedBefore(EloquentBuilder $query, string $input, bool $negated)
     {
         $date = date_create($input);
         $this->applyNegatableWhere($query, $negated, 'created_at', '<', $date);
     }
 
-    protected function filterCreatedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterCreatedBy(EloquentBuilder $query, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
@@ -383,7 +365,7 @@ protected function filterCreatedBy(EloquentBuilder $query, Entity $model, string
         }
     }
 
-    protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterUpdatedBy(EloquentBuilder $query, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
@@ -392,7 +374,7 @@ protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, string
         }
     }
 
-    protected function filterOwnedBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterOwnedBy(EloquentBuilder $query, string $input, bool $negated)
     {
         $userSlug = $input === 'me' ? user()->slug : trim($input);
         $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
@@ -401,27 +383,30 @@ protected function filterOwnedBy(EloquentBuilder $query, Entity $model, string $
         }
     }
 
-    protected function filterInName(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterInName(EloquentBuilder $query, string $input, bool $negated)
     {
         $this->applyNegatableWhere($query, $negated, 'name', 'like', '%' . $input . '%');
     }
 
-    protected function filterInTitle(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterInTitle(EloquentBuilder $query, string $input, bool $negated)
     {
-        $this->filterInName($query, $model, $input, $negated);
+        $this->filterInName($query, $input, $negated);
     }
 
-    protected function filterInBody(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterInBody(EloquentBuilder $query, string $input, bool $negated)
     {
-        $this->applyNegatableWhere($query, $negated, $model->textField, 'like', '%' . $input . '%');
+        $this->applyNegatableWhere($query, $negated, function (EloquentBuilder $query) use ($input) {
+            $query->where('description', 'like', '%' . $input . '%')
+                ->orWhere('text', 'like', '%' . $input . '%');
+        }, null, null);
     }
 
-    protected function filterIsRestricted(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterIsRestricted(EloquentBuilder $query, string $input, bool $negated)
     {
         $negated ? $query->whereDoesntHave('permissions') : $query->whereHas('permissions');
     }
 
-    protected function filterViewedByMe(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterViewedByMe(EloquentBuilder $query, string $input, bool $negated)
     {
         $filter = function ($query) {
             $query->where('user_id', '=', user()->id);
@@ -430,7 +415,7 @@ protected function filterViewedByMe(EloquentBuilder $query, Entity $model, strin
         $negated ? $query->whereDoesntHave('views', $filter) : $query->whereHas('views', $filter);
     }
 
-    protected function filterNotViewedByMe(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterNotViewedByMe(EloquentBuilder $query, string $input, bool $negated)
     {
         $filter = function ($query) {
             $query->where('user_id', '=', user()->id);
@@ -439,31 +424,30 @@ protected function filterNotViewedByMe(EloquentBuilder $query, Entity $model, st
         $negated ? $query->whereHas('views', $filter) : $query->whereDoesntHave('views', $filter);
     }
 
-    protected function filterIsTemplate(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterIsTemplate(EloquentBuilder $query, string $input, bool $negated)
     {
-        if ($model instanceof Page) {
-            $this->applyNegatableWhere($query, $negated, 'template', '=', true);
-        }
+        $this->applyNegatableWhere($query, $negated, 'template', '=', true);
     }
 
-    protected function filterSortBy(EloquentBuilder $query, Entity $model, string $input, bool $negated)
+    protected function filterSortBy(EloquentBuilder $query, string $input, bool $negated)
     {
         $functionName = Str::camel('sort_by_' . $input);
         if (method_exists($this, $functionName)) {
-            $this->$functionName($query, $model, $negated);
+            $this->$functionName($query, $negated);
         }
     }
 
     /**
      * Sorting filter options.
      */
-    protected function sortByLastCommented(EloquentBuilder $query, Entity $model, bool $negated)
+    protected function sortByLastCommented(EloquentBuilder $query, bool $negated)
     {
         $commentsTable = DB::getTablePrefix() . 'comments';
-        $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
-        $commentQuery = DB::raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \'' . $morphClass . '\' AND c2.created_at IS NULL) as comments');
+        $commentQuery = DB::raw('(SELECT c1.commentable_id, c1.commentable_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.commentable_id = c2.commentable_id AND c1.commentable_type = c2.commentable_type AND c1.created_at < c2.created_at) WHERE c2.created_at IS NULL) as comments');
 
-        $query->join($commentQuery, $model->getTable() . '.id', '=', DB::raw('comments.entity_id'))
-            ->orderBy('last_commented', $negated ? 'asc' : 'desc');
+        $query->join($commentQuery, function (JoinClause $join) {
+            $join->on('entities.id', '=', 'comments.commentable_id')
+                ->on('entities.type', '=', 'comments.commentable_type');
+        })->orderBy('last_commented', $negated ? 'asc' : 'desc');
     }
 }
diff --git a/app/Settings/AppSettingsStore.php b/app/Settings/AppSettingsStore.php
index e6fc466baa2..9c370ca272a 100644
--- a/app/Settings/AppSettingsStore.php
+++ b/app/Settings/AppSettingsStore.php
@@ -14,7 +14,7 @@ public function __construct(
     ) {
     }
 
-    public function storeFromUpdateRequest(Request $request, string $category)
+    public function storeFromUpdateRequest(Request $request, string $category): void
     {
         $this->storeSimpleSettings($request);
         if ($category === 'customization') {
@@ -44,7 +44,7 @@ protected function updateAppIcon(Request $request): void
         }
 
         // Clear icon image if requested
-        if ($request->get('app_icon_reset')) {
+        if ($request->input('app_icon_reset')) {
             $this->destroyExistingSettingImage('app-icon');
             setting()->remove('app-icon');
             foreach ($sizes as $size) {
@@ -67,7 +67,7 @@ protected function updateAppLogo(Request $request): void
         }
 
         // Clear logo image if requested
-        if ($request->get('app_logo_reset')) {
+        if ($request->input('app_logo_reset')) {
             $this->destroyExistingSettingImage('app-logo');
             setting()->remove('app-logo');
         }
@@ -76,7 +76,7 @@ protected function updateAppLogo(Request $request): void
     protected function storeSimpleSettings(Request $request): void
     {
         foreach ($request->all() as $name => $value) {
-            if (strpos($name, 'setting-') !== 0) {
+            if (!str_starts_with($name, 'setting-')) {
                 continue;
             }
 
@@ -85,7 +85,7 @@ protected function storeSimpleSettings(Request $request): void
         }
     }
 
-    protected function destroyExistingSettingImage(string $settingKey)
+    protected function destroyExistingSettingImage(string $settingKey): void
     {
         $existingVal = setting()->get($settingKey);
         if ($existingVal) {
diff --git a/app/Settings/MaintenanceController.php b/app/Settings/MaintenanceController.php
index b2b2226bf98..64e6c011187 100644
--- a/app/Settings/MaintenanceController.php
+++ b/app/Settings/MaintenanceController.php
@@ -38,7 +38,7 @@ public function cleanupImages(Request $request, ImageService $imageService)
         $this->checkPermission(Permission::SettingsManage);
         $this->logActivity(ActivityType::MAINTENANCE_ACTION_RUN, 'cleanup-images');
 
-        $checkRevisions = !($request->get('ignore_revisions', 'false') === 'true');
+        $checkRevisions = !($request->input('ignore_revisions', 'false') === 'true');
         $dryRun = !($request->has('confirm'));
 
         $imagesToDelete = $imageService->deleteUnusedImages($checkRevisions, $dryRun);
diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index 31debdaea85..e3112e9c7d9 100644
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -28,6 +28,21 @@ public function get(string $key, $default = null): mixed
         return $this->formatValue($value, $default);
     }
 
+    /**
+     * Get a setting from the database as an integer.
+     * Returns the default value if not found or not an integer, and clamps the value to the given min/max range.
+     */
+    public function getInteger(string $key, int $default, int $min = 0, int $max = PHP_INT_MAX): int
+    {
+        $value = $this->get($key, $default);
+        if (!is_numeric($value)) {
+            return $default;
+        }
+
+        $int = intval($value);
+        return max($min, min($max, $int));
+    }
+
     /**
      * Get a value from the session instead of the main store option.
      */
@@ -228,9 +243,9 @@ public function putForCurrentUser(string $key, string $value): bool
     /**
      * Convert a setting key into a user-specific key.
      */
-    protected function userKey(string $userId, string $key = ''): string
+    protected function userKey(int $userId, string $key = ''): string
     {
-        return 'user:' . $userId . ':' . $key;
+        return 'user:' . strval($userId) . ':' . $key;
     }
 
     /**
@@ -249,10 +264,18 @@ public function remove(string $key): void
         }
     }
 
+    /**
+     * Remove a user-specific setting from the database, for the current access user.
+     */
+    public function removeForCurrentUser(string $key): void
+    {
+        $this->remove($this->userKey(user()->id, $key));
+    }
+
     /**
      * Delete settings for a given user id.
      */
-    public function deleteUserSettings(string $userId): void
+    public function deleteUserSettings(int $userId): void
     {
         Setting::query()
             ->where('setting_key', 'like', $this->userKey($userId) . '%')
diff --git a/app/Settings/UserNotificationPreferences.php b/app/Settings/UserNotificationPreferences.php
index 5b267b533cb..752d92de64d 100644
--- a/app/Settings/UserNotificationPreferences.php
+++ b/app/Settings/UserNotificationPreferences.php
@@ -26,9 +26,14 @@ public function notifyOnCommentReplies(): bool
         return $this->getNotificationSetting('comment-replies');
     }
 
+    public function notifyOnCommentMentions(): bool
+    {
+        return $this->getNotificationSetting('comment-mentions');
+    }
+
     public function updateFromSettingsArray(array $settings)
     {
-        $allowList = ['own-page-changes', 'own-page-comments', 'comment-replies'];
+        $allowList = ['own-page-changes', 'own-page-comments', 'comment-replies', 'comment-mentions'];
         foreach ($settings as $setting => $status) {
             if (!in_array($setting, $allowList)) {
                 continue;
diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index 7e2ee5465df..4ddbb14bc70 100644
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -58,7 +58,7 @@ public function update(Request $request, BookSorter $sorter, string $bookSlug)
         // Sort via map
         if ($request->filled('sort-tree')) {
             (new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) {
-                $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
+                $sortMap = BookSortMap::fromJson($request->input('sort-tree'));
                 $booksInvolved = $sorter->sortUsingMap($sortMap);
 
                 // Add activity for involved books.
@@ -72,7 +72,7 @@ public function update(Request $request, BookSorter $sorter, string $bookSlug)
         }
 
         if ($request->filled('auto-sort')) {
-            $sortSetId = intval($request->get('auto-sort')) ?: null;
+            $sortSetId = intval($request->input('auto-sort')) ?: null;
             if ($sortSetId && SortRule::query()->find($sortSetId) === null) {
                 $sortSetId = null;
             }
diff --git a/app/Sorting/BookSortMapItem.php b/app/Sorting/BookSortMapItem.php
index 8f517edd6ff..40137fc49fa 100644
--- a/app/Sorting/BookSortMapItem.php
+++ b/app/Sorting/BookSortMapItem.php
@@ -4,37 +4,12 @@
 
 class BookSortMapItem
 {
-    /**
-     * @var int
-     */
-    public $id;
-
-    /**
-     * @var int
-     */
-    public $sort;
-
-    /**
-     * @var ?int
-     */
-    public $parentChapterId;
-
-    /**
-     * @var string
-     */
-    public $type;
-
-    /**
-     * @var int
-     */
-    public $parentBookId;
-
-    public function __construct(int $id, int $sort, ?int $parentChapterId, string $type, int $parentBookId)
-    {
-        $this->id = $id;
-        $this->sort = $sort;
-        $this->parentChapterId = $parentChapterId;
-        $this->type = $type;
-        $this->parentBookId = $parentBookId;
+    public function __construct(
+        public int $id,
+        public int $sort,
+        public int|null $parentChapterId,
+        public string $type,
+        public int $parentBookId,
+    ) {
     }
 }
diff --git a/app/Sorting/BookSorter.php b/app/Sorting/BookSorter.php
index 1152101d293..63c66b0fd7a 100644
--- a/app/Sorting/BookSorter.php
+++ b/app/Sorting/BookSorter.php
@@ -8,12 +8,14 @@
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Entities\Tools\ParentChanger;
 use BookStack\Permissions\Permission;
 
 class BookSorter
 {
     public function __construct(
         protected EntityQueries $queries,
+        protected ParentChanger $parentChanger,
     ) {
     }
 
@@ -33,22 +35,22 @@ public function runBookAutoSortForAllWithSet(SortRule $set): void
      */
     public function runBookAutoSort(Book $book): void
     {
-        $set = $book->sortRule;
-        if (!$set) {
+        $rule = $book->sortRule()->first();
+        if (!($rule instanceof SortRule)) {
             return;
         }
 
         $sortFunctions = array_map(function (SortRuleOperation $op) {
             return $op->getSortFunction();
-        }, $set->getOperations());
+        }, $rule->getOperations());
 
         $chapters = $book->chapters()
-            ->with('pages:id,name,priority,created_at,updated_at,chapter_id')
+            ->with('pages:id,name,book_id,chapter_id,priority,created_at,updated_at')
             ->get(['id', 'name', 'priority', 'created_at', 'updated_at']);
 
         /** @var (Chapter|Book)[] $topItems */
         $topItems = [
-            ...$book->directPages()->get(['id', 'name', 'priority', 'created_at', 'updated_at']),
+            ...$book->directPages()->get(['id', 'book_id', 'name', 'priority', 'created_at', 'updated_at']),
             ...$chapters,
         ];
 
@@ -123,9 +125,8 @@ public function sortUsingMap(BookSortMap $sortMap): array
      */
     protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMap): void
     {
-        /** @var BookChild $model */
         $model = $modelMap[$sortMapItem->type . ':' . $sortMapItem->id] ?? null;
-        if (!$model) {
+        if (!($model instanceof BookChild)) {
             return;
         }
 
@@ -155,18 +156,19 @@ protected function applySortUpdates(BookSortMapItem $sortMapItem, array $modelMa
 
         // Action the required changes
         if ($bookChanged) {
-            $model->changeBook($newBook->id);
+            $this->parentChanger->changeBook($model, $newBook->id);
         }
 
         if ($model instanceof Page && $chapterChanged) {
             $model->chapter_id = $newChapter->id ?? 0;
+            $model->unsetRelation('chapter');
         }
 
         if ($priorityChanged) {
             $model->priority = $sortMapItem->sort;
         }
 
-        if ($chapterChanged || $priorityChanged) {
+        if ($priorityChanged || $chapterChanged) {
             $model::withoutTimestamps(fn () => $model->save());
         }
     }
diff --git a/app/Sorting/SortRule.php b/app/Sorting/SortRule.php
index 45e5514fd5f..ffe2d411534 100644
--- a/app/Sorting/SortRule.php
+++ b/app/Sorting/SortRule.php
@@ -38,21 +38,35 @@ public function setOperations(array $options): void
         $this->sequence = implode(',', $values);
     }
 
+    /**
+     * @inheritDoc
+     */
     public function logDescriptor(): string
     {
         return "({$this->id}) {$this->name}";
     }
 
+    /**
+     * Get the URL to where this rule can be managed.
+     */
     public function getUrl(): string
     {
         return url("/settings/sorting/rules/{$this->id}");
     }
 
+    /**
+     * Get the books which are specifically set to use this sort rule.
+     * @return HasMany<Book, $this>
+     */
     public function books(): HasMany
     {
-        return $this->hasMany(Book::class);
+        return $this->hasMany(Book::class, 'entity_container_data.sort_rule_id', 'id');
     }
 
+    /**
+     * Get all the available sort rules, ordered by name, with the number of books using each.
+     * @return Collection<SortRule>
+     */
     public static function allByName(): Collection
     {
         return static::query()
diff --git a/app/Sorting/SortRuleController.php b/app/Sorting/SortRuleController.php
index bb5540a2a50..65e1cba098a 100644
--- a/app/Sorting/SortRuleController.php
+++ b/app/Sorting/SortRuleController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Sorting;
 
 use BookStack\Activity\ActivityType;
+use BookStack\Entities\Models\EntityContainerData;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
 use Illuminate\Http\Request;
@@ -88,7 +89,9 @@ public function destroy(string $id, Request $request)
 
         if ($booksAssigned > 0) {
             if ($confirmed) {
-                $rule->books()->update(['sort_rule_id' => null]);
+                EntityContainerData::query()
+                    ->where('sort_rule_id', $rule->id)
+                    ->update(['sort_rule_id' => null]);
             } else {
                 $warnings[] = trans('settings.sort_rule_delete_warn_books', ['count' => $booksAssigned]);
             }
diff --git a/app/Sorting/SortRuleOperation.php b/app/Sorting/SortRuleOperation.php
index 27bb9e3c0e2..53f1337c644 100644
--- a/app/Sorting/SortRuleOperation.php
+++ b/app/Sorting/SortRuleOperation.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Sorting;
 
-use Closure;
 use Illuminate\Support\Str;
 
 enum SortRuleOperation: string
diff --git a/app/Theming/CustomHtmlHeadContentProvider.php b/app/Theming/CustomHtmlHeadContentProvider.php
index 95d9ff5ad74..209070997a3 100644
--- a/app/Theming/CustomHtmlHeadContentProvider.php
+++ b/app/Theming/CustomHtmlHeadContentProvider.php
@@ -4,25 +4,17 @@
 
 use BookStack\Util\CspService;
 use BookStack\Util\HtmlContentFilter;
+use BookStack\Util\HtmlContentFilterConfig;
 use BookStack\Util\HtmlNonceApplicator;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 class CustomHtmlHeadContentProvider
 {
-    /**
-     * @var CspService
-     */
-    protected $cspService;
-
-    /**
-     * @var Cache
-     */
-    protected $cache;
-
-    public function __construct(CspService $cspService, Cache $cache)
-    {
-        $this->cspService = $cspService;
-        $this->cache = $cache;
+    public function __construct(
+        protected CspService $cspService,
+        protected Cache $cache,
+        protected ThemeService $themeService,
+    ) {
     }
 
     /**
@@ -32,8 +24,9 @@ public function __construct(CspService $cspService, Cache $cache)
     public function forWeb(): string
     {
         $content = $this->getSourceContent();
-        $hash = md5($content);
+        $hash = md5($content) . ':' . $this->themeService->getModulesHash();
         $html = $this->cache->remember('custom-head-web:' . $hash, 86400, function () use ($content) {
+            $content .= "\n" . $this->getModuleHeadContent();
             return HtmlNonceApplicator::prepare($content);
         });
 
@@ -50,7 +43,8 @@ public function forExport(): string
         $hash = md5($content);
 
         return $this->cache->remember('custom-head-export:' . $hash, 86400, function () use ($content) {
-            return HtmlContentFilter::removeScriptsFromHtmlString($content);
+            $config = new HtmlContentFilterConfig(filterOutNonContentElements: false, useAllowListFilter: false);
+            return (new HtmlContentFilter($config))->filterString($content);
         });
     }
 
@@ -61,4 +55,23 @@ protected function getSourceContent(): string
     {
         return setting('app-custom-head', '');
     }
+
+    /**
+     * Get any custom head content from installed modules.
+     */
+    protected function getModuleHeadContent(): string
+    {
+        $content = '';
+        foreach ($this->themeService->getModules() as $module) {
+            $headContentPath = $module->path('head');
+            if (file_exists($headContentPath) && is_dir($headContentPath)) {
+                $htmlFiles = glob($headContentPath . '/*.html');
+                foreach ($htmlFiles as $file) {
+                    $content .= file_get_contents($file);
+                }
+            }
+        }
+
+        return $content;
+    }
 }
diff --git a/app/Theming/ThemeController.php b/app/Theming/ThemeController.php
index 1eecc697428..208c8d57a87 100644
--- a/app/Theming/ThemeController.php
+++ b/app/Theming/ThemeController.php
@@ -5,25 +5,26 @@
 use BookStack\Facades\Theme;
 use BookStack\Http\Controller;
 use BookStack\Util\FilePathNormalizer;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ThemeController extends Controller
 {
     /**
      * Serve a public file from the configured theme.
      */
-    public function publicFile(string $theme, string $path)
+    public function publicFile(string $theme, string $path): StreamedResponse
     {
         $cleanPath = FilePathNormalizer::normalize($path);
         if ($theme !== Theme::getTheme() || !$cleanPath) {
             abort(404);
         }
 
-        $filePath = theme_path("public/{$cleanPath}");
-        if (!file_exists($filePath)) {
+        $filePath = Theme::findFirstFile("public/{$cleanPath}");
+        if (!$filePath) {
             abort(404);
         }
 
-        $response = $this->download()->streamedFileInline($filePath);
+        $response = $this->createDownload()->streamedFileInline($filePath);
         $response->setMaxAge(86400);
 
         return $response;
diff --git a/app/Theming/ThemeEvents.php b/app/Theming/ThemeEvents.php
index 44630acaeb1..46fa7c2c08f 100644
--- a/app/Theming/ThemeEvents.php
+++ b/app/Theming/ThemeEvents.php
@@ -87,6 +87,17 @@ class ThemeEvents
      */
     const COMMONMARK_ENVIRONMENT_CONFIGURE = 'commonmark_environment_configure';
 
+    /**
+     * OIDC auth pre-redirect event.
+     * Runs just before BookStack redirects the user to the identity provider for authentication.
+     * Provides the redirect URL that will be used.
+     * If the listener returns a string value, that will be used as the redirect URL instead.
+     *
+     * @param string $redirectUrl
+     * @return string|null
+     */
+    const OIDC_AUTH_PRE_REDIRECT = 'oidc_auth_pre_redirect';
+
     /**
      * OIDC ID token pre-validate event.
      * Runs just before BookStack validates the user ID token data upon login.
@@ -100,6 +111,31 @@ class ThemeEvents
      */
     const OIDC_ID_TOKEN_PRE_VALIDATE = 'oidc_id_token_pre_validate';
 
+    /**
+     * Page content post-render event.
+     * Runs after any display rendering of page content, typically when page content is being processed for viewing.
+     * Rendering typically includes parsing of page includes, and content filtering.
+     * Provides the HTML content about to be shown, along with the related page instance.
+     * If the listener returns a string value, that will be used as the HTML content instead.
+     *
+     * @param string $html
+     * @param \BookStack\Entities\Models\Page $page
+     * @return string|null
+     */
+    const PAGE_CONTENT_POST_RENDER = 'page_content_post_render';
+
+    /**
+     * Page content pre-store event.
+     * Runs just before page HTML is stored in the database, after BookStack's own processing.
+     * Provides the HTML content about to be stored, along with the related page instance.
+     * If the listener returns a string value, that will be used as the HTML content instead.
+     *
+     * @param string $html
+     * @param \BookStack\Entities\Models\Page $page
+     * @return string|null
+     */
+    const PAGE_CONTENT_PRE_STORE = 'page_content_pre_store';
+
     /**
      * Page include parse event.
      * Runs when a page include tag is being parsed, typically when page content is being processed for viewing.
@@ -134,6 +170,25 @@ class ThemeEvents
      */
     const ROUTES_REGISTER_WEB_AUTH = 'routes_register_web_auth';
 
+
+    /**
+     * Theme register views event.
+     * Called by the theme system when a theme is active, so that custom view templates can be registered
+     * to be rendered in addition to existing app views.
+     *
+     * @param \BookStack\Theming\ThemeViews $themeViews
+     */
+    const THEME_REGISTER_VIEWS = 'theme_register_views';
+
+    /**
+     * View blocks register event.
+     * Runs once a ViewBlockManager instance is available so that custom blocks can be registered
+     * for use within user-configurable layouts in the system.
+     *
+     * @param \BookStack\View\ViewBlockManager $manager
+     */
+    const VIEW_BLOCKS_REGISTER = 'view_blocks_register';
+
     /**
      * Web before middleware action.
      * Runs before the request is handled but after all other middleware apart from those
diff --git a/app/Theming/ThemeModule.php b/app/Theming/ThemeModule.php
new file mode 100644
index 00000000000..ab5fc6145db
--- /dev/null
+++ b/app/Theming/ThemeModule.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace BookStack\Theming;
+
+readonly class ThemeModule
+{
+    public function __construct(
+        public string $name,
+        public string $description,
+        public string $version,
+        public string $folderName,
+    ) {
+    }
+
+    /**
+     * Create a ThemeModule instance from JSON data.
+     *
+     * @throws ThemeModuleException
+     */
+    public static function fromJson(array $data, string $folderName): self
+    {
+        if (empty($data['name']) || !is_string($data['name'])) {
+            throw new ThemeModuleException("Module in folder \"{$folderName}\" is missing a valid 'name' property");
+        }
+
+        if (!isset($data['description']) || !is_string($data['description'])) {
+            throw new ThemeModuleException("Module in folder \"{$folderName}\" is missing a valid 'description' property");
+        }
+
+        if (!isset($data['version']) || !is_string($data['version'])) {
+            throw new ThemeModuleException("Module in folder \"{$folderName}\" is missing a valid 'version' property");
+        }
+
+        if (!preg_match('/^v?\d+\.\d+\.\d+(-.*)?$/', $data['version'])) {
+            throw new ThemeModuleException("Module in folder \"{$folderName}\" has an invalid 'version' format. Expected semantic version format like '1.0.0' or 'v1.0.0'");
+        }
+
+        return new self(
+            name: $data['name'],
+            description: $data['description'],
+            version: $data['version'],
+            folderName: $folderName,
+        );
+    }
+
+    /**
+     * Get a path for a file within this module.
+     */
+    public function path($path = ''): string
+    {
+        $component = trim($path, '/');
+        return theme_path("modules/{$this->folderName}/{$component}");
+    }
+
+    public function getVersion(): string
+    {
+        return str_starts_with($this->version, 'v') ? $this->version : 'v' . $this->version;
+    }
+}
diff --git a/app/Theming/ThemeModuleException.php b/app/Theming/ThemeModuleException.php
new file mode 100644
index 00000000000..4d296a64fa1
--- /dev/null
+++ b/app/Theming/ThemeModuleException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace BookStack\Theming;
+
+class ThemeModuleException extends \Exception
+{
+}
diff --git a/app/Theming/ThemeModuleManager.php b/app/Theming/ThemeModuleManager.php
new file mode 100644
index 00000000000..ed33014ebf4
--- /dev/null
+++ b/app/Theming/ThemeModuleManager.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace BookStack\Theming;
+
+use Illuminate\Support\Str;
+
+class ThemeModuleManager
+{
+    /** @var array<string, ThemeModule>|null */
+    protected array|null $loadedModules = null;
+
+    public function __construct(
+        protected string $modulesFolderPath
+    ) {
+    }
+
+    /**
+     * @return array<string, ThemeModule>
+     */
+    public function getByName(string $name): array
+    {
+        return array_filter($this->load(), fn(ThemeModule $module) => $module->name === $name);
+    }
+
+    public function deleteModuleFolder(string $moduleFolderName): void
+    {
+        $modules = $this->load();
+        $module = $modules[$moduleFolderName] ?? null;
+        if (!$module) {
+            return;
+        }
+
+        $moduleFolderPath = $module->path('');
+        if (!file_exists($moduleFolderPath)) {
+            return;
+        }
+
+        $this->deleteDirectoryRecursively($moduleFolderPath);
+        unset($this->loadedModules[$moduleFolderName]);
+    }
+
+    /**
+     * @throws ThemeModuleException
+     */
+    public function addFromZip(string $name, ThemeModuleZip $zip): ThemeModule
+    {
+        $baseFolderName = Str::limit(Str::slug($name), 40, '');
+        $folderName = $baseFolderName;
+        while (!$baseFolderName || file_exists($this->modulesFolderPath . DIRECTORY_SEPARATOR . $folderName)) {
+            $folderName = ($baseFolderName ?: 'mod') . '-' . Str::random(4);
+        }
+
+        $folderPath = $this->modulesFolderPath . DIRECTORY_SEPARATOR . $folderName;
+        try {
+            $zip->extractTo($folderPath);
+        } catch (ThemeModuleException $exception) {
+            if (is_dir($folderPath)) {
+                $this->deleteDirectoryRecursively($folderPath);
+            }
+            throw new ThemeModuleException("Failed to load extract files from module ZIP with error: {$exception->getMessage()}");
+        }
+
+        $module = $this->loadFromFolder($folderName);
+        if (!$module) {
+            throw new ThemeModuleException("Failed to load module from zip file after extraction");
+        }
+
+        return $module;
+    }
+
+    protected function deleteDirectoryRecursively(string $path): void
+    {
+        $items = array_diff(scandir($path), ['.', '..']);
+        foreach ($items as $item) {
+            $itemPath = $path . DIRECTORY_SEPARATOR . $item;
+            if (is_dir($itemPath)) {
+                $this->deleteDirectoryRecursively($itemPath);
+            } else {
+                $deleted = unlink($itemPath);
+                if (!$deleted) {
+                    throw new ThemeModuleException("Failed to delete file at \"{$itemPath}\"");
+                }
+            }
+        }
+        rmdir($path);
+    }
+
+    public function load(): array
+    {
+        if ($this->loadedModules !== null) {
+            return $this->loadedModules;
+        }
+
+        if (!is_dir($this->modulesFolderPath)) {
+            return [];
+        }
+
+        $subFolders = array_filter(scandir($this->modulesFolderPath), function ($item) {
+            return $item !== '.' && $item !== '..' && is_dir($this->modulesFolderPath . DIRECTORY_SEPARATOR . $item);
+        });
+
+        $modules = [];
+
+        foreach ($subFolders as $folderName) {
+            $module = $this->loadFromFolder($folderName);
+            if ($module) {
+                $modules[$folderName] = $module;
+            }
+        }
+
+        $this->loadedModules = $modules;
+
+        return $modules;
+    }
+
+    protected function loadFromFolder(string $folderName): ThemeModule|null
+    {
+        $moduleJsonFile = $this->modulesFolderPath . DIRECTORY_SEPARATOR . $folderName . DIRECTORY_SEPARATOR . 'bookstack-module.json';
+        if (!file_exists($moduleJsonFile)) {
+            return null;
+        }
+
+        try {
+            $jsonContent = file_get_contents($moduleJsonFile);
+            $jsonData = json_decode($jsonContent, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                throw new ThemeModuleException("Invalid JSON in module file at \"{$moduleJsonFile}\": " . json_last_error_msg());
+            }
+
+            $module = ThemeModule::fromJson($jsonData, $folderName);
+        } catch (ThemeModuleException $exception) {
+            throw $exception;
+        } catch (\Exception $exception) {
+            throw new ThemeModuleException("Failed loading module from \"{$moduleJsonFile}\" with error: {$exception->getMessage()}");
+        }
+
+        return $module;
+    }
+}
diff --git a/app/Theming/ThemeModuleZip.php b/app/Theming/ThemeModuleZip.php
new file mode 100644
index 00000000000..7e94074c8e6
--- /dev/null
+++ b/app/Theming/ThemeModuleZip.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace BookStack\Theming;
+
+use BookStack\Util\FilePathNormalizer;
+use ZipArchive;
+
+readonly class ThemeModuleZip
+{
+    public function __construct(
+        protected string $path
+    ) {
+    }
+
+    public function extractTo(string $destinationPath): void
+    {
+        $zip = new ZipArchive();
+        $zip->open($this->path);
+        $prefix = $this->getZipContentPrefix($zip);
+
+        for ($i = 0; $i < $zip->numFiles; $i++) {
+            $name = $zip->getNameIndex($i);
+            $entryIsDir = str_ends_with($name, "/");
+            if ($entryIsDir) {
+                continue;
+            }
+
+            $stream = $zip->getStreamIndex($i);
+
+            if ($prefix) {
+                if (!str_starts_with($name, $prefix) || $name === $prefix) {
+                    continue;
+                }
+                $name = str_replace($prefix, '', $name);
+            }
+
+            try {
+                $targetPath = $destinationPath . DIRECTORY_SEPARATOR . FilePathNormalizer::normalize($name);
+            } catch (\Exception $exception) {
+                throw new ThemeModuleException("Bad file path found in module ZIP file: {$name}");
+            }
+
+            $targetPathDir = dirname($targetPath);
+            if (!is_dir($targetPathDir)) {
+                $dirCreated = mkdir($targetPathDir, 0777, true);
+                if (!$dirCreated) {
+                    throw new ThemeModuleException("Failed to create directory {$targetPathDir} when extracting module files");
+                }
+            }
+
+            $targetFile = fopen($targetPath, 'w');
+            $written = stream_copy_to_stream($stream, $targetFile);
+            if (!$written) {
+                throw new ThemeModuleException("Failed to write to {$targetPath} when extracting module files");
+            }
+            fclose($targetFile);
+        }
+
+        $zip->close();
+    }
+
+    /**
+     * Read the module's JSON metadata to read it into a ThemeModule instance.
+     * @throws ThemeModuleException
+     */
+    public function getModuleInstance(): ThemeModule
+    {
+        $zip = new ZipArchive();
+        $open = $zip->open($this->path);
+        if ($open !== true) {
+            throw new ThemeModuleException("Unable to open zip file at {$this->path}");
+        }
+
+        $prefix = $this->getZipContentPrefix($zip);
+        $moduleJsonText = $zip->getFromName("{$prefix}bookstack-module.json");
+        $zip->close();
+
+        if ($moduleJsonText === false) {
+            throw new ThemeModuleException("bookstack-module.json not found within module ZIP at {$this->path}");
+        }
+
+        $moduleJson = json_decode($moduleJsonText, true);
+        if ($moduleJson === null) {
+            throw new ThemeModuleException("Could not read JSON from bookstack-module.json within module ZIP at {$this->path}");
+        }
+
+        return ThemeModule::fromJson($moduleJson, '_temp');
+    }
+
+    /**
+     * Get the path to the zip file.
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * Check if the zip file exists and that it appears to be a valid zip file.
+     */
+    public function exists(): bool
+    {
+        if (!file_exists($this->path)) {
+            return false;
+        }
+
+        $zip = new ZipArchive();
+        $open = $zip->open($this->path, ZipArchive::RDONLY);
+        if ($open === true) {
+            $zip->close();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the total size of the zip file contents when uncompressed.
+     */
+    public function getContentsSize(): int
+    {
+        $zip = new ZipArchive();
+
+        if ($zip->open($this->path) !== true) {
+            return 0;
+        }
+
+        $totalSize = 0;
+        for ($i = 0; $i < $zip->numFiles; $i++) {
+            $stat = $zip->statIndex($i);
+            if ($stat !== false) {
+                $totalSize += $stat['size'];
+            }
+        }
+
+        $zip->close();
+
+        return $totalSize;
+    }
+
+    protected function getZipContentPrefix(ZipArchive $zip): string
+    {
+        $index = $zip->locateName('bookstack-module.json', ZipArchive::FL_NODIR);
+        if ($index === false) {
+            return '';
+        }
+
+        $location = $zip->getNameIndex($index);
+        $pathParts = explode('/', $location);
+        if (count($pathParts) !== 2) {
+            return '';
+        }
+
+        return $pathParts[0] . '/';
+    }
+}
diff --git a/app/Theming/ThemeService.php b/app/Theming/ThemeService.php
index 4bdb6836b02..26963102394 100644
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@ -15,6 +15,11 @@ class ThemeService
      */
     protected array $listeners = [];
 
+    /**
+     * @var array<string, ThemeModule>
+     */
+    protected array $modules = [];
+
     /**
      * Get the currently configured theme.
      * Returns an empty string if not configured.
@@ -76,18 +81,83 @@ public function registerCommand(Command $command): void
     }
 
     /**
-     * Read any actions from the set theme path if the 'functions.php' file exists.
+     * Read any actions from the 'functions.php' file of the active theme or its modules.
      */
     public function readThemeActions(): void
     {
-        $themeActionsFile = theme_path('functions.php');
-        if ($themeActionsFile && file_exists($themeActionsFile)) {
+        $moduleFunctionFiles = array_map(function (ThemeModule $module): string {
+            return $module->path('functions.php');
+        }, $this->modules);
+        $allFunctionFiles = array_merge(array_values($moduleFunctionFiles), [theme_path('functions.php')]);
+        $filteredFunctionFiles = array_filter($allFunctionFiles, function (string $file): bool {
+            return $file && file_exists($file);
+        });
+
+        foreach ($filteredFunctionFiles as $functionFile) {
             try {
-                require $themeActionsFile;
+                require $functionFile;
             } catch (\Error $exception) {
-                throw new ThemeException("Failed loading theme functions file at \"{$themeActionsFile}\" with error: {$exception->getMessage()}");
+                throw new ThemeException("Failed loading theme functions file at \"{$functionFile}\" with error: {$exception->getMessage()}");
+            }
+        }
+    }
+
+    /**
+     * Read the modules folder and load in any valid theme modules.
+     * @throws ThemeModuleException
+     */
+    public function loadModules(): void
+    {
+        $modulesFolder = theme_path('modules');
+        if (!$modulesFolder) {
+            return;
+        }
+
+        $this->modules = (new ThemeModuleManager($modulesFolder))->load();
+    }
+
+    /**
+     * Get all loaded theme modules.
+     * @return array<string, ThemeModule>
+     */
+    public function getModules(): array
+    {
+        return $this->modules;
+    }
+
+    /**
+     * Get a hash to represent the currently loaded modules.
+     */
+    public function getModulesHash(): string
+    {
+        $key = "";
+
+        foreach ($this->modules as $module) {
+            $key .= $module->name . ':' . $module->version . ';';
+        }
+
+        return md5($key);
+    }
+
+    /**
+     * Look for a specific file within the theme or its modules.
+     * Returns the first file found or null if not found.
+     */
+    public function findFirstFile(string $path): ?string
+    {
+        $themePath = theme_path($path);
+        if (file_exists($themePath)) {
+            return $themePath;
+        }
+
+        foreach ($this->modules as $module) {
+            $customizedFile = $module->path($path);
+            if (file_exists($customizedFile)) {
+                return $customizedFile;
             }
         }
+
+        return null;
     }
 
     /**
diff --git a/app/Theming/ThemeViews.php b/app/Theming/ThemeViews.php
new file mode 100644
index 00000000000..630ff9d8dad
--- /dev/null
+++ b/app/Theming/ThemeViews.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace BookStack\Theming;
+
+use BookStack\Exceptions\ThemeException;
+use Illuminate\View\FileViewFinder;
+
+class ThemeViews
+{
+    /**
+     * @var array<string, array<string, int>>
+     */
+    protected array $beforeViews = [];
+
+    /**
+     * @var array<string, array<string, int>>
+     */
+    protected array $afterViews = [];
+
+    public function __construct(
+        protected FileViewFinder $finder
+    ) {
+    }
+
+    /**
+     * Register any extra paths for where we may expect views to be located
+     * with the FileViewFinder, to make custom views available for use.
+     * @param ThemeModule[] $modules
+     */
+    public function registerViewPathsForTheme(array $modules): void
+    {
+        foreach ($modules as $module) {
+            $moduleViewsPath = $module->path('views');
+            if (file_exists($moduleViewsPath) && is_dir($moduleViewsPath)) {
+                $this->finder->prependLocation($moduleViewsPath);
+            }
+        }
+
+        $this->finder->prependLocation(theme_path());
+    }
+
+    /**
+     * Provide the response for a blade template view include.
+     */
+    public function handleViewInclude(string $viewPath, array $data = [], array $mergeData = []): string
+    {
+        if (!$this->hasRegisteredViews()) {
+            return view()->make($viewPath, $data, $mergeData)->render();
+        }
+
+        if (str_contains('book-tree', $viewPath)) {
+            dd($viewPath, $data);
+        }
+
+        $viewsContent = [
+            ...$this->renderViewSets($this->beforeViews[$viewPath] ?? [], $data, $mergeData),
+            view()->make($viewPath, $data, $mergeData)->render(),
+            ...$this->renderViewSets($this->afterViews[$viewPath] ?? [], $data, $mergeData),
+        ];
+
+        return implode("\n", $viewsContent);
+    }
+
+    /**
+     * Register a custom view to be rendered before the given target view is included in the template system.
+     */
+    public function renderBefore(string $targetView, string $localView, int $priority = 50): void
+    {
+        $this->registerAdjacentView($this->beforeViews, $targetView, $localView, $priority);
+    }
+
+    /**
+     * Register a custom view to be rendered after the given target view is included in the template system.
+     */
+    public function renderAfter(string $targetView, string $localView, int $priority = 50): void
+    {
+        $this->registerAdjacentView($this->afterViews, $targetView, $localView, $priority);
+    }
+
+    public function hasRegisteredViews(): bool
+    {
+        return !empty($this->beforeViews) || !empty($this->afterViews);
+    }
+
+    protected function registerAdjacentView(array &$location, string $targetView, string $localView, int $priority = 50): void
+    {
+        try {
+            $viewPath = $this->finder->find($localView);
+        } catch (\InvalidArgumentException $exception) {
+            throw new ThemeException("Expected registered view file with name \"{$localView}\" could not be found.");
+        }
+
+        if (!isset($location[$targetView])) {
+            $location[$targetView] = [];
+        }
+
+        $location[$targetView][$viewPath] = $priority;
+    }
+
+    /**
+     * @param array<string, int> $viewSet
+     * @return string[]
+     */
+    protected function renderViewSets(array $viewSet, array $data, array $mergeData): array
+    {
+        $paths = array_keys($viewSet);
+        usort($paths, function (string $a, string $b) use ($viewSet) {
+            return $viewSet[$a] <=> $viewSet[$b];
+        });
+
+        return array_map(function (string $viewPath) use ($data, $mergeData) {
+            return view()->file($viewPath, $data, $mergeData)->render();
+        }, $paths);
+    }
+}
diff --git a/app/Translation/FileLoader.php b/app/Translation/FileLoader.php
index 1fec4d18bb1..6212506ddf6 100644
--- a/app/Translation/FileLoader.php
+++ b/app/Translation/FileLoader.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Translation;
 
+use BookStack\Facades\Theme;
 use Illuminate\Translation\FileLoader as BaseLoader;
 
 class FileLoader extends BaseLoader
@@ -12,11 +13,6 @@ class FileLoader extends BaseLoader
      * Extends Laravel's translation FileLoader to look in multiple directories
      * so that we can load in translation overrides from the theme file if wanted.
      *
-     * Note: As of using Laravel 10, this may now be redundant since Laravel's
-     * file loader supports multiple paths. This needs further testing though
-     * to confirm if Laravel works how we expect, since we specifically need
-     * the theme folder to be able to partially override core lang files.
-     *
      * @param string      $locale
      * @param string      $group
      * @param string|null $namespace
@@ -32,9 +28,18 @@ public function load($locale, $group, $namespace = null): array
         if (is_null($namespace) || $namespace === '*') {
             $themePath = theme_path('lang');
             $themeTranslations = $themePath ? $this->loadPaths([$themePath], $locale, $group) : [];
-            $originalTranslations = $this->loadPaths($this->paths, $locale, $group);
 
-            return array_merge($originalTranslations, $themeTranslations);
+            $modules = Theme::getModules();
+            $moduleTranslations = [];
+            foreach ($modules as $module) {
+                $modulePath = $module->path('lang');
+                if (file_exists($modulePath)) {
+                    $moduleTranslations = array_merge($moduleTranslations, $this->loadPaths([$modulePath], $locale, $group));
+                }
+            }
+
+            $originalTranslations = $this->loadPaths($this->paths, $locale, $group);
+            return array_merge($originalTranslations, $moduleTranslations, $themeTranslations);
         }
 
         return $this->loadNamespaced($locale, $group, $namespace);
diff --git a/app/Translation/LocaleManager.php b/app/Translation/LocaleManager.php
index d23c2361004..ea32976a887 100644
--- a/app/Translation/LocaleManager.php
+++ b/app/Translation/LocaleManager.php
@@ -64,6 +64,7 @@ class LocaleManager
         'sq'          => 'sq_AL',
         'sr'          => 'sr_RS',
         'sv'          => 'sv_SE',
+        'th'          => 'th_TH',
         'tk'          => 'tk_TM',
         'tr'          => 'tr_TR',
         'uk'          => 'uk_UA',
diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php
index 05227243a76..1619bebbcdd 100644
--- a/app/Uploads/Attachment.php
+++ b/app/Uploads/Attachment.php
@@ -10,6 +10,7 @@
 use BookStack\Users\Models\HasCreatorAndUpdater;
 use BookStack\Users\Models\OwnableInterface;
 use BookStack\Users\Models\User;
+use BookStack\Util\UrlFilter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -71,7 +72,7 @@ public function jointPermissions(): HasMany
     public function getUrl($openInline = false): string
     {
         if ($this->external && !str_starts_with($this->path, 'http')) {
-            return $this->path;
+            return (new UrlFilter($this->path))->clean();
         }
 
         return url('/attachments/' . $this->id . ($openInline ? '?open=true' : ''));
diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index dabd537292f..3de84bdd0a8 100644
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -102,7 +102,7 @@ public function saveNewFromLink(string $name, string $link, int $page_id): Attac
     /**
      * Updates the ordering for a listing of attached files.
      */
-    public function updateFileOrderWithinPage(array $attachmentOrder, string $pageId)
+    public function updateFileOrderWithinPage(array $attachmentOrder, int $pageId)
     {
         foreach ($attachmentOrder as $index => $attachmentId) {
             Attachment::query()->where('uploaded_to', '=', $pageId)
diff --git a/app/Uploads/Base64UriMimeRule.php b/app/Uploads/Base64UriMimeRule.php
new file mode 100644
index 00000000000..d49e6c1e0c2
--- /dev/null
+++ b/app/Uploads/Base64UriMimeRule.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace BookStack\Uploads;
+
+use BookStack\Util\WebSafeMimeSniffer;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Translation\PotentiallyTranslatedString;
+use InvalidArgumentException;
+
+class Base64UriMimeRule implements ValidationRule
+{
+    public function __construct(
+        protected string $requiredMime
+    ) {
+        if (empty($requiredMime)) {
+            throw new InvalidArgumentException('A required mime type must be provided');
+        }
+    }
+
+    /**
+     * Run the validation rule.
+     *
+     * @param  Closure(string, ?string=): PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $imageDataEncoded = explode(',', $value, 2)[1] ?? '';
+        if (empty($imageDataEncoded)) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+            return;
+        }
+
+        $imageData = base64_decode($imageDataEncoded);
+        if (empty($imageData)) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+            return;
+        }
+
+        $sniffer = new WebSafeMimeSniffer();
+        $mime = $sniffer->sniff($imageData);
+
+        if ($mime !== $this->requiredMime) {
+            $fail('validation.base64_uri_mime')->translate(['mime' => $this->requiredMime]);
+        }
+    }
+}
diff --git a/app/Uploads/Controllers/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
index b47d6ff8dd1..f540833f0d4 100644
--- a/app/Uploads/Controllers/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads\Controllers;
 
+use BookStack\Entities\EntityExistsRule;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Http\ApiController;
@@ -23,7 +24,7 @@ public function __construct(
 
     /**
      * Get a listing of attachments visible to the user.
-     * The external property indicates whether the attachment is simple a link.
+     * The external property indicates whether the attachment is simply a link.
      * A false value for the external property would indicate a file upload.
      */
     public function list()
@@ -38,7 +39,7 @@ public function list()
      * An uploaded_to value must be provided containing an ID of the page
      * that this upload will be related to.
      *
-     * If you're uploading a file the POST data should be provided via
+     * If you're uploading a file, the POST data should be provided via
      * a multipart/form-data type request instead of JSON.
      *
      * @throws ValidationException
@@ -49,7 +50,7 @@ public function create(Request $request)
         $this->checkPermission(Permission::AttachmentCreateAll);
         $requestData = $this->validate($request, $this->rules()['create']);
 
-        $pageId = $request->get('uploaded_to');
+        $pageId = $request->input('uploaded_to');
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
@@ -70,7 +71,7 @@ public function create(Request $request)
     }
 
     /**
-     * Get the details & content of a single attachment of the given ID.
+     * Get the details and content of a single attachment of the given ID.
      * The attachment link or file content is provided via a 'content' property.
      * For files the content will be base64 encoded.
      *
@@ -119,7 +120,7 @@ public function read(string $id)
 
     /**
      * Update the details of a single attachment.
-     * As per the create endpoint, if a file is being provided as the attachment content
+     * As per the create endpoint, if a file is being provided as the attachment content,
      * the request should be formatted as a multipart/form-data request instead of JSON.
      *
      * @throws ValidationException
@@ -133,9 +134,12 @@ public function update(Request $request, string $id)
 
         $page = $attachment->page;
         if ($requestData['uploaded_to'] ?? false) {
-            $pageId = $request->get('uploaded_to');
-            $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-            $attachment->uploaded_to = $requestData['uploaded_to'];
+            $pageId = intval($requestData['uploaded_to']);
+            if ($pageId !== $page->id) {
+                $this->checkOwnablePermission(Permission::PageUpdate, $page);
+                $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
+                $attachment->uploaded_to = $pageId;
+            }
         }
 
         $this->checkOwnablePermission(Permission::PageView, $page);
@@ -173,13 +177,13 @@ protected function rules(): array
         return [
             'create' => [
                 'name'        => ['required', 'string', 'min:1', 'max:255'],
-                'uploaded_to' => ['required', 'integer', 'exists:pages,id'],
+                'uploaded_to' => ['required', 'integer', new EntityExistsRule('page')],
                 'file'        => array_merge(['required_without:link'], $this->attachmentService->getFileValidationRules()),
                 'link'        => ['required_without:file', 'string', 'min:1', 'max:2000', 'safe_url'],
             ],
             'update' => [
                 'name'        => ['string', 'min:1', 'max:255'],
-                'uploaded_to' => ['integer', 'exists:pages,id'],
+                'uploaded_to' => ['integer', new EntityExistsRule('page')],
                 'file'        => $this->attachmentService->getFileValidationRules(),
                 'link'        => ['string', 'min:1', 'max:2000', 'safe_url'],
             ],
diff --git a/app/Uploads/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
index 0886193e46d..e1da0c72df6 100644
--- a/app/Uploads/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads\Controllers;
 
+use BookStack\Entities\EntityExistsRule;
 use BookStack\Entities\Queries\PageQueries;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\FileUploadException;
@@ -10,6 +11,7 @@
 use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
+use BookStack\Util\UrlFilter;
 use Exception;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Http\Request;
@@ -34,11 +36,11 @@ public function __construct(
     public function upload(Request $request)
     {
         $this->validate($request, [
-            'uploaded_to' => ['required', 'integer', 'exists:pages,id'],
+            'uploaded_to' => ['required', 'integer',  new EntityExistsRule('page')],
             'file'        => array_merge(['required'], $this->attachmentService->getFileValidationRules()),
         ]);
 
-        $pageId = $request->get('uploaded_to');
+        $pageId = $request->input('uploaded_to');
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
 
         $this->checkPermission(Permission::AttachmentCreateAll);
@@ -91,8 +93,9 @@ public function getUpdateForm(string $attachmentId)
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
 
+        $this->checkOwnablePermission(Permission::PageView, $attachment->page);
         $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
-        $this->checkOwnablePermission(Permission::AttachmentCreate, $attachment);
+        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
 
         return view('attachments.manager-edit-form', [
             'attachment' => $attachment,
@@ -106,6 +109,9 @@ public function update(Request $request, string $attachmentId)
     {
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
+        $this->checkOwnablePermission(Permission::PageView, $attachment->page);
+        $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
+        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
 
         try {
             $this->validate($request, [
@@ -119,13 +125,9 @@ public function update(Request $request, string $attachmentId)
             ]), 422);
         }
 
-        $this->checkOwnablePermission(Permission::PageView, $attachment->page);
-        $this->checkOwnablePermission(Permission::PageUpdate, $attachment->page);
-        $this->checkOwnablePermission(Permission::AttachmentUpdate, $attachment);
-
         $attachment = $this->attachmentService->updateFile($attachment, [
-            'name' => $request->get('attachment_edit_name'),
-            'link' => $request->get('attachment_edit_url'),
+            'name' => $request->input('attachment_edit_name'),
+            'link' => $request->input('attachment_edit_url'),
         ]);
 
         return view('attachments.manager-edit-form', [
@@ -140,11 +142,15 @@ public function update(Request $request, string $attachmentId)
      */
     public function attachLink(Request $request)
     {
-        $pageId = $request->get('attachment_link_uploaded_to');
+        $pageId = $request->input('attachment_link_uploaded_to');
+        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
+
+        $this->checkPermission(Permission::AttachmentCreateAll);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         try {
             $this->validate($request, [
-                'attachment_link_uploaded_to' => ['required', 'integer', 'exists:pages,id'],
+                'attachment_link_uploaded_to' => ['required', 'integer',  new EntityExistsRule('page')],
                 'attachment_link_name'        => ['required', 'string', 'min:1', 'max:255'],
                 'attachment_link_url'         => ['required', 'string', 'min:1', 'max:2000', 'safe_url'],
             ]);
@@ -155,13 +161,8 @@ public function attachLink(Request $request)
             ]), 422);
         }
 
-        $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
-
-        $this->checkPermission(Permission::AttachmentCreateAll);
-        $this->checkOwnablePermission(Permission::PageUpdate, $page);
-
-        $attachmentName = $request->get('attachment_link_name');
-        $link = $request->get('attachment_link_url');
+        $attachmentName = $request->input('attachment_link_name');
+        $link = $request->input('attachment_link_url');
         $this->attachmentService->saveNewFromLink($attachmentName, $link, intval($pageId));
 
         return view('attachments.manager-link-form', [
@@ -194,10 +195,11 @@ public function sortForPage(Request $request, int $pageId)
         $this->validate($request, [
             'order' => ['required', 'array'],
         ]);
+
         $page = $this->pageQueries->findVisibleByIdOrFail($pageId);
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
-        $attachmentOrder = $request->get('order');
+        $attachmentOrder = $request->input('order');
         $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId);
 
         return response()->json(['message' => trans('entities.attachments_order_updated')]);
@@ -220,21 +222,20 @@ public function get(Request $request, string $attachmentId)
             throw new NotFoundException(trans('errors.attachment_not_found'));
         }
 
-        $this->checkOwnablePermission(Permission::PageView, $page);
-
         if ($attachment->external) {
-            return redirect($attachment->path);
+            $url = (new UrlFilter($attachment->path))->clean();
+            return redirect($url);
         }
 
         $fileName = $attachment->getFileName();
         $attachmentStream = $this->attachmentService->streamAttachmentFromStorage($attachment);
         $attachmentSize = $this->attachmentService->getAttachmentFileSize($attachment);
 
-        if ($request->get('open') === 'true') {
-            return $this->download()->streamedInline($attachmentStream, $fileName, $attachmentSize);
+        if ($request->input('open') === 'true') {
+            return $this->createDownload()->streamedInline($attachmentStream, $fileName, $attachmentSize);
         }
 
-        return $this->download()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);
+        return $this->createDownload()->streamedDirectly($attachmentStream, $fileName, $attachmentSize);
     }
 
     /**
@@ -246,6 +247,13 @@ public function delete(string $attachmentId)
     {
         /** @var Attachment $attachment */
         $attachment = Attachment::query()->findOrFail($attachmentId);
+
+        try {
+            $this->pageQueries->findVisibleByIdOrFail($attachment->uploaded_to);
+        } catch (NotFoundException $exception) {
+            throw new NotFoundException(trans('errors.attachment_not_found'));
+        }
+
         $this->checkOwnablePermission(Permission::AttachmentDelete, $attachment);
         $this->attachmentService->deleteFile($attachment);
 
diff --git a/app/Uploads/Controllers/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
index f44acd997d2..3c2d9aa589c 100644
--- a/app/Uploads/Controllers/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -2,9 +2,11 @@
 
 namespace BookStack\Uploads\Controllers;
 
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
+use BookStack\Uploads\Base64UriMimeRule;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
 use BookStack\Util\OutOfMemoryHandler;
@@ -14,7 +16,8 @@
 class DrawioImageController extends Controller
 {
     public function __construct(
-        protected ImageRepo $imageRepo
+        protected ImageRepo $imageRepo,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -24,10 +27,10 @@ public function __construct(
      */
     public function list(Request $request, ImageResizer $resizer)
     {
-        $page = $request->get('page', 1);
-        $searchTerm = $request->get('search', null);
-        $uploadedToFilter = $request->get('uploaded_to', null);
-        $parentTypeFilter = $request->get('filter_type', null);
+        $page = $request->input('page', 1);
+        $searchTerm = $request->input('search', null);
+        $uploadedToFilter = $request->input('uploaded_to', null);
+        $parentTypeFilter = $request->input('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
         $viewData = [
@@ -53,16 +56,18 @@ public function list(Request $request, ImageResizer $resizer)
      */
     public function create(Request $request)
     {
-        $this->validate($request, [
-            'image'       => ['required', 'string'],
+        $this->checkPermission(Permission::ImageCreateAll);
+        $validated = $this->validate($request, [
+            'image'       => ['required', 'string', new Base64UriMimeRule('image/png')],
             'uploaded_to' => ['required', 'integer'],
         ]);
 
-        $this->checkPermission(Permission::ImageCreateAll);
-        $imageBase64Data = $request->get('image');
+        $imageBase64Data = $validated['image'];
+        $uploadedTo = $validated['uploaded_to'];
+        $targetPage = $this->pageQueries->findVisibleByIdOrFail($uploadedTo);
+        $this->checkOwnablePermission(Permission::PageUpdate, $targetPage);
 
         try {
-            $uploadedTo = $request->get('uploaded_to', 0);
             $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
diff --git a/app/Uploads/Controllers/GalleryImageController.php b/app/Uploads/Controllers/GalleryImageController.php
index 745efcde812..ca60f9f8e19 100644
--- a/app/Uploads/Controllers/GalleryImageController.php
+++ b/app/Uploads/Controllers/GalleryImageController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads\Controllers;
 
+use BookStack\Entities\Queries\PageQueries;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
@@ -14,7 +15,8 @@
 class GalleryImageController extends Controller
 {
     public function __construct(
-        protected ImageRepo $imageRepo
+        protected ImageRepo $imageRepo,
+        protected PageQueries $pageQueries,
     ) {
     }
 
@@ -24,10 +26,10 @@ public function __construct(
      */
     public function list(Request $request, ImageResizer $resizer)
     {
-        $page = $request->get('page', 1);
-        $searchTerm = $request->get('search', null);
-        $uploadedToFilter = $request->get('uploaded_to', null);
-        $parentTypeFilter = $request->get('filter_type', null);
+        $page = $request->input('page', 1);
+        $searchTerm = $request->input('search', null);
+        $uploadedToFilter = $request->input('uploaded_to', null);
+        $parentTypeFilter = $request->input('filter_type', null);
 
         $imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 30, $uploadedToFilter, $searchTerm);
         $viewData = [
@@ -56,20 +58,26 @@ public function create(Request $request)
         $this->checkPermission(Permission::ImageCreateAll);
 
         try {
-            $this->validate($request, [
+            $validated = $this->validate($request, [
                 'file' => $this->getImageValidationRules(),
+                'uploaded_to' => ['required', 'integer'],
             ]);
         } catch (ValidationException $exception) {
-            return $this->jsonError(implode("\n", $exception->errors()['file']));
+            $errors = $exception->errors();
+            $messages = array_merge($errors['file'] ?? [], $errors['uploaded_to'] ?? []);
+            return $this->jsonError(implode("\n", $messages));
         }
 
+        $uploadedTo = intval($validated['uploaded_to']);
+        $targetPage = $this->pageQueries->findVisibleByIdOrFail($uploadedTo);
+        $this->checkOwnablePermission(Permission::PageUpdate, $targetPage);
+
         new OutOfMemoryHandler(function () {
             return $this->jsonError(trans('errors.image_upload_memory_limit'));
         });
 
         try {
-            $imageUpload = $request->file('file');
-            $uploadedTo = $request->get('uploaded_to', 0);
+            $imageUpload = $validated['file'];
             $image = $this->imageRepo->saveNew($imageUpload, 'gallery', $uploadedTo);
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
diff --git a/app/Uploads/Controllers/ImageController.php b/app/Uploads/Controllers/ImageController.php
index da67639c16d..164d10e6bd6 100644
--- a/app/Uploads/Controllers/ImageController.php
+++ b/app/Uploads/Controllers/ImageController.php
@@ -153,7 +153,7 @@ public function rebuildThumbnails(string $id)
     }
 
     /**
-     * Check related page permission and ensure type is drawio or gallery.
+     * Check related page permission and ensure the type is drawio or gallery.
      * @throws NotifyException
      */
     protected function checkImagePermission(Image $image): void
diff --git a/app/Uploads/Controllers/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
index 59696dc9ae4..abaf6939ff5 100644
--- a/app/Uploads/Controllers/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -3,11 +3,13 @@
 namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Queries\PageQueries;
+use BookStack\Exceptions\NotFoundException;
 use BookStack\Http\ApiController;
 use BookStack\Permissions\Permission;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageResizer;
+use BookStack\Uploads\ImageService;
 use Illuminate\Http\Request;
 
 class ImageGalleryApiController extends ApiController
@@ -20,6 +22,7 @@ public function __construct(
         protected ImageRepo $imageRepo,
         protected ImageResizer $imageResizer,
         protected PageQueries $pageQueries,
+        protected ImageService $imageService,
     ) {
     }
 
@@ -32,6 +35,9 @@ protected function rules(): array
                 'image' => ['required', 'file', ...$this->getImageValidationRules()],
                 'name'  => ['string', 'max:180'],
             ],
+            'readDataForUrl' => [
+                'url' => ['required', 'string', 'url'],
+            ],
             'update' => [
                 'name'  => ['string', 'max:180'],
                 'image' => ['file', ...$this->getImageValidationRules()],
@@ -69,6 +75,7 @@ public function create(Request $request)
         $this->checkPermission(Permission::ImageCreateAll);
         $data = $this->validate($request, $this->rules()['create']);
         $page = $this->pageQueries->findVisibleByIdOrFail($data['uploaded_to']);
+        $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $image = $this->imageRepo->saveNew($data['image'], $data['type'], $page->id);
 
@@ -85,15 +92,47 @@ public function create(Request $request)
      * The "thumbs" response property contains links to scaled variants that BookStack may use in its UI.
      * The "content" response property provides HTML and Markdown content, in the format that BookStack
      * would typically use by default to add the image in page content, as a convenience.
-     * Actual image file data is not provided but can be fetched via the "url" response property.
+     * Actual image file data is not provided but can be fetched via the "url" response property or by
+     * using the "read-data" endpoint.
      */
     public function read(string $id)
     {
-        $image = Image::query()->scopes(['visible'])->findOrFail($id);
+        $image = $this->imageRepo->getVisiblePageImageById($id);
 
         return response()->json($this->formatForSingleResponse($image));
     }
 
+    /**
+     * Read the image file data for a single image in the system.
+     * The returned response will be a stream of image data instead of a JSON response.
+     */
+    public function readData(string $id)
+    {
+        $image = $this->imageRepo->getVisiblePageImageById($id);
+
+        return $this->imageService->streamImageFromStorageResponse('gallery', $image->path);
+    }
+
+    /**
+     * Read the image file data for a single image in the system, using the provided URL
+     * to identify the image instead of its ID, which is provided as a "URL" query parameter.
+     * The returned response will be a stream of image data instead of a JSON response.
+     */
+    public function readDataForUrl(Request $request)
+    {
+        $data = $this->validate($request, $this->rules()['readDataForUrl']);
+        $basePath = url('/uploads/images/');
+        $imagePath = str_replace($basePath, '', $data['url']);
+
+        if (!$this->imageService->pathAccessible($imagePath)) {
+            throw (new NotFoundException(trans('errors.image_not_found')))
+                ->setSubtitle(trans('errors.image_not_found_subtitle'))
+                ->setDetails(trans('errors.image_not_found_details'));
+        }
+
+        return $this->imageService->streamImageFromStorageResponse('gallery', $imagePath);
+    }
+
     /**
      * Update the details of an existing image in the system.
      * Since "image" is expected to be a file, this needs to be a 'multipart/form-data' type request if providing a
@@ -102,8 +141,7 @@ public function read(string $id)
     public function update(Request $request, string $id)
     {
         $data = $this->validate($request, $this->rules()['update']);
-        $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $image->getPage());
+        $image = $this->imageRepo->getVisiblePageImageById($id);
         $this->checkOwnablePermission(Permission::ImageUpdate, $image);
 
         $this->imageRepo->updateImageDetails($image, $data);
@@ -121,16 +159,16 @@ public function update(Request $request, string $id)
      */
     public function delete(string $id)
     {
-        $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission(Permission::PageView, $image->getPage());
+        $image = $this->imageRepo->getVisiblePageImageById($id);
         $this->checkOwnablePermission(Permission::ImageDelete, $image);
+
         $this->imageRepo->destroyImage($image);
 
         return response('', 204);
     }
 
     /**
-     * Format the given image model for single-result display.
+     * Format the given image model for a single-result display.
      */
     protected function formatForSingleResponse(Image $image): array
     {
diff --git a/app/Uploads/Image.php b/app/Uploads/Image.php
index ec8f8be0fb1..879e0043a1e 100644
--- a/app/Uploads/Image.php
+++ b/app/Uploads/Image.php
@@ -13,14 +13,14 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int    $id
- * @property string $name
- * @property string $url
- * @property string $path
- * @property string $type
- * @property int    $uploaded_to
- * @property int    $created_by
- * @property int    $updated_by
+ * @property int      $id
+ * @property string   $name
+ * @property string   $url
+ * @property string   $path
+ * @property string   $type
+ * @property int|null $uploaded_to
+ * @property int      $created_by
+ * @property int      $updated_by
  */
 class Image extends Model implements OwnableInterface
 {
@@ -39,10 +39,13 @@ public function jointPermissions(): HasMany
     /**
      * Scope the query to just the images visible to the user based upon the
      * user visibility of the uploaded_to page.
+     * This limits results to just page-based images (gallery and drawio types).
      */
     public function scopeVisible(Builder $query): Builder
     {
-        return app()->make(PermissionApplicator::class)->restrictPageRelationQuery($query, 'images', 'uploaded_to');
+        return app()->make(PermissionApplicator::class)
+            ->restrictPageRelationQuery($query, 'images', 'uploaded_to')
+            ->whereIn('type', ['gallery', 'drawio']);
     }
 
     /**
diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index a16b87bd75b..ef3ed9e1f89 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -27,6 +27,13 @@ public function getById($id): Image
         return Image::query()->findOrFail($id);
     }
 
+    public function getVisiblePageImageById($id): Image
+    {
+        return Image::query()
+            ->scopes('visible')
+            ->findOrFail($id);
+    }
+
     /**
      * Execute a paginated query, returning in a standard format.
      * Also runs the query through the restriction system.
@@ -91,7 +98,7 @@ public function getEntityFiltered(
             $parentFilter = function (Builder $query) use ($filterType, $contextPage) {
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
-                } else if ($filterType === 'book') {
+                } else {
                     $validPageIds = $contextPage->book->pages()
                         ->scopes('visible')
                         ->pluck('id')
diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index 8d7571c82d6..9ed0d0f75cd 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -55,7 +55,7 @@ public function loadGalleryThumbnailsForImage(Image $image, bool $shouldCreate):
 
     /**
      * Get the thumbnail for an image.
-     * If $keepRatio is true only the width will be used.
+     * If $keepRatio is true, only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
      *
      * @throws Exception
@@ -84,7 +84,7 @@ public function resizeToThumbnailUrl(
             return $this->storage->getPublicUrl($cachedThumbPath);
         }
 
-        // If thumbnail has already been generated, serve that and cache path
+        // If a thumbnail has already been generated, serve that and cache path
         $disk = $this->storage->getDisk($image->type);
         if (!$shouldCreate && $disk->exists($thumbFilePath)) {
             Cache::put($thumbCacheKey, $thumbFilePath, static::THUMBNAIL_CACHE_TIME);
@@ -110,7 +110,7 @@ public function resizeToThumbnailUrl(
     }
 
     /**
-     * Resize the image of given data to the specified size, and return the new image data.
+     * Resize the image of given data to the specified size and return the new image data.
      * Format will remain the same as the input format, unless specified.
      *
      * @throws ImageUploadException
@@ -125,6 +125,7 @@ public function resizeImageData(
         try {
             $thumb = $this->interventionFromImageData($imageData, $format);
         } catch (Exception $e) {
+            Log::error('Failed to resize image with error:' . $e->getMessage());
             throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
         }
 
@@ -154,17 +155,21 @@ public function resizeImageData(
 
     /**
      * Create an intervention image instance from the given image data.
-     * Performs some manual library usage to ensure image is specifically loaded
+     * Performs some manual library usage to ensure the image is specifically loaded
      * from given binary data instead of data being misinterpreted.
      */
     protected function interventionFromImageData(string $imageData, ?string $fileType): InterventionImage
     {
+        if (!extension_loaded('gd')) {
+            throw new ImageUploadException('The PHP "gd" extension is required to resize images, but is missing.');
+        }
+
         $manager = new ImageManager(
             new Driver(),
             autoOrientation: false,
         );
 
-        // Ensure gif images are decoded natively instead of deferring to intervention GIF
+        // Ensure GIF images are decoded natively instead of deferring to intervention GIF
         // handling since we don't need the added animation support.
         $isGif = $fileType === 'gif';
         $decoder = $isGif ? NativeObjectDecoder::class : BinaryImageDecoder::class;
@@ -223,7 +228,7 @@ protected function orientImageToOriginalExif(InterventionImage $image, string $o
     }
 
     /**
-     * Checks if the image is a gif. Returns true if it is, else false.
+     * Checks if the image is a GIF. Returns true if it is, else false.
      */
     protected function isGif(Image $image): bool
     {
@@ -250,7 +255,7 @@ protected function isApngData(string &$imageData): bool
 
     /**
      * Check if the given avif image data represents an animated image.
-     * This is based up the answer here: https://stackoverflow.com/a/79457313
+     * This is based upon the answer here: https://stackoverflow.com/a/79457313
      */
     protected function isAnimatedAvifData(string &$imageData): bool
     {
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 458f0102d77..e2285656663 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -4,7 +4,10 @@
 
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Exceptions\ImageUploadException;
+use BookStack\Exceptions\PrettyException;
+use BookStack\Http\DownloadResponseFactory;
 use Exception;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
@@ -34,9 +37,8 @@ public function saveNewFromUpload(
         ?int $resizeWidth = null,
         ?int $resizeHeight = null,
         bool $keepRatio = true,
-        string $imageName = '',
     ): Image {
-        $imageName = $imageName ?: $uploadedFile->getClientOriginalName();
+        $imageName = $uploadedFile->getClientOriginalName();
         $imageData = file_get_contents($uploadedFile->getRealPath());
 
         if ($resizeWidth !== null || $resizeHeight !== null) {
@@ -148,7 +150,7 @@ public function getImageStream(Image $image): mixed
     }
 
     /**
-     * Destroy an image along with its revisions, thumbnails and remaining folders.
+     * Destroy an image along with its revisions, thumbnails, and remaining folders.
      *
      * @throws Exception
      */
@@ -184,7 +186,7 @@ public function deleteUnusedImages(bool $checkRevisions = true, bool $dryRun = t
                 /** @var Image $image */
                 foreach ($images as $image) {
                     $searchQuery = '%' . basename($image->path) . '%';
-                    $inPage = DB::table('pages')
+                    $inPage = DB::table('entity_page_data')
                             ->where('html', 'like', $searchQuery)->count() > 0;
 
                     $inRevision = false;
@@ -193,7 +195,16 @@ public function deleteUnusedImages(bool $checkRevisions = true, bool $dryRun = t
                                 ->where('html', 'like', $searchQuery)->count() > 0;
                     }
 
-                    if (!$inPage && !$inRevision) {
+                    $inDraft = false;
+                    if ($checkRevisions) {
+                        $inDraft = DB::table('page_update_drafts')
+                            ->where(function (Builder $query) use ($searchQuery) {
+                                $query->where('html', 'like', $searchQuery)
+                                    ->orWhere('markdown', 'like', $searchQuery);
+                            })->count() > 0;
+                    }
+
+                    if (!$inPage && !$inRevision && !$inDraft) {
                         $deletedPaths[] = $image->path;
                         if (!$dryRun) {
                             $this->destroy($image);
@@ -252,16 +263,59 @@ public function pathAccessibleInLocalSecure(string $imagePath): bool
     {
         $disk = $this->storage->getDisk('gallery');
 
+        return $disk->usingSecureImages() && $this->pathAccessible($imagePath);
+    }
+
+    /**
+     * Check if the given path exists and is accessible depending on the current settings.
+     */
+    public function pathAccessible(string $imagePath): bool
+    {
         if ($this->storage->usingSecureRestrictedImages() && !$this->checkUserHasAccessToRelationOfImageAtPath($imagePath)) {
             return false;
         }
 
-        // Check local_secure is active
-        return $disk->usingSecureImages()
-            // Check the image file exists
-            && $disk->exists($imagePath)
-            // Check the file is likely an image file
-            && str_starts_with($disk->mimeType($imagePath), 'image/');
+        if ($this->blockedBySecureImages()) {
+            return false;
+        }
+
+        return $this->imageFileExists($imagePath, 'gallery');
+    }
+
+    /**
+     * Check if the given image should be accessible to the current user.
+     */
+    public function imageAccessible(Image $image): bool
+    {
+        if ($this->storage->usingSecureRestrictedImages() && !$this->checkUserHasAccessToRelationOfImage($image)) {
+            return false;
+        }
+
+        if ($this->blockedBySecureImages()) {
+            return false;
+        }
+
+        return $this->imageFileExists($image->path, $image->type);
+    }
+
+    /**
+     * Check if the current user should be blocked from accessing images based on if secure images are enabled
+     * and if public access is enabled for the application.
+     */
+    protected function blockedBySecureImages(): bool
+    {
+        $enforced = $this->storage->usingSecureImages() && !setting('app-public');
+
+        return $enforced && user()->isGuest();
+    }
+
+    /**
+     * Check if the given image path exists for the given image type and that it is likely an image file.
+     */
+    protected function imageFileExists(string $imagePath, string $imageType): bool
+    {
+        $disk = $this->storage->getDisk($imageType);
+        return $disk->exists($imagePath) && str_starts_with($disk->mimeType($imagePath), 'image/');
     }
 
     /**
@@ -290,6 +344,11 @@ protected function checkUserHasAccessToRelationOfImageAtPath(string $path): bool
             return false;
         }
 
+        return $this->checkUserHasAccessToRelationOfImage($image);
+    }
+
+    protected function checkUserHasAccessToRelationOfImage(Image $image): bool
+    {
         $imageType = $image->type;
 
         // Allow user or system (logo) images
@@ -320,7 +379,18 @@ public function streamImageFromStorageResponse(string $imageType, string $path):
     {
         $disk = $this->storage->getDisk($imageType);
 
-        return $disk->response($path);
+        $stream = $disk->stream($path);
+        $fileSize = $disk->size($path);
+        $imageName = basename($path);
+        $downloadResponseFactory = new DownloadResponseFactory(request());
+        $response = $downloadResponseFactory->streamedInline($stream, $imageName, $fileSize);
+
+        $contentType = $response->headers->get('Content-Type');
+        if (!str_starts_with($contentType, 'image/')) {
+            throw new PrettyException('Invalid non-image file type when streaming from storage', 415);
+        }
+
+        return $response;
     }
 
     /**
@@ -330,6 +400,14 @@ public function streamImageFromStorageResponse(string $imageType, string $path):
      */
     public static function isExtensionSupported(string $extension): bool
     {
-        return in_array($extension, static::$supportedExtensions);
+        return in_array(strtolower($extension), static::$supportedExtensions);
+    }
+
+    /**
+     * Get all mime-types for images formats which BookStack supports.
+     */
+    public static function getSupportedMimeTypes(): array
+    {
+        return array_map(fn($ext) => 'image/' . $ext, static::$supportedExtensions);
     }
 }
diff --git a/app/Uploads/ImageStorage.php b/app/Uploads/ImageStorage.php
index ddaa26a9400..43f448ff1bb 100644
--- a/app/Uploads/ImageStorage.php
+++ b/app/Uploads/ImageStorage.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Uploads;
 
+use BookStack\Exceptions\ImageUploadException;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Support\Str;
 
@@ -34,8 +35,18 @@ public function usingSecureRestrictedImages(): bool
         return config('filesystems.images') === 'local_secure_restricted';
     }
 
+    /**
+     * Check if "local secure" (Fetched behind auth, either with or without permissions enforced)
+     * is currently active in the instance.
+     */
+    public function usingSecureImages(): bool
+    {
+        return config('filesystems.images') === 'local_secure' || $this->usingSecureRestrictedImages();
+    }
+
     /**
      * Clean up an image file name to be both URL and storage safe.
+     * @throws ImageUploadException
      */
     public function cleanImageFileName(string $name): string
     {
@@ -45,6 +56,10 @@ public function cleanImageFileName(string $name): string
         $name = implode('-', $nameParts);
         $name = Str::slug($name);
 
+        if (!ImageService::isExtensionSupported($extension)) {
+            throw new ImageUploadException('Non supported image extension used when storing image: ' . $extension);
+        }
+
         if (strlen($name) === 0) {
             $name = Str::random(10);
         }
@@ -65,7 +80,7 @@ protected function getDiskName(string $imageType): string
             return 'local';
         }
 
-        // Rename local_secure options to get our image specific storage driver which
+        // Rename local_secure options to get our image-specific storage driver, which
         // is scoped to the relevant image directories.
         if ($localSecureInUse) {
             return 'local_secure_images';
diff --git a/app/Uploads/ImageStorageDisk.php b/app/Uploads/ImageStorageDisk.php
index 36d6721de6c..ad314c5c89b 100644
--- a/app/Uploads/ImageStorageDisk.php
+++ b/app/Uploads/ImageStorageDisk.php
@@ -68,6 +68,14 @@ public function stream(string $path): mixed
         return $this->filesystem->readStream($this->adjustPathForDisk($path));
     }
 
+    /**
+     * Get the size of the file at the given path.
+     */
+    public function size(string $path): int
+    {
+        return $this->filesystem->size($this->adjustPathForDisk($path));
+    }
+
     /**
      * Save the given image data at the given path. Can choose to set
      * the image as public which will update its visibility after saving.
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index 0cc640f225c..8fcf6358008 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -148,7 +148,7 @@ protected function getAvatarImageData(string $url): string
                 $responseCount++;
                 $isRedirect = ($response->getStatusCode() === 301 || $response->getStatusCode() === 302);
                 $url = $response->getHeader('Location')[0] ?? '';
-            } while ($responseCount < 3 && $isRedirect && is_string($url) && str_starts_with($url, 'http'));
+            } while ($responseCount < 3 && $isRedirect && str_starts_with($url, 'http'));
 
             if ($responseCount === 3) {
                 throw new HttpFetchException("Failed to fetch image, max redirect limit of 3 tries reached. Last fetched URL: {$url}");
diff --git a/app/Users/Controllers/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
index 93ecc549bb4..6f0c59651a5 100644
--- a/app/Users/Controllers/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -87,7 +87,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
         $this->singleFormatter($role);
 
         return response()->json($role);
diff --git a/app/Users/Controllers/RoleController.php b/app/Users/Controllers/RoleController.php
index 549f6e0ac8f..56a6c7416ca 100644
--- a/app/Users/Controllers/RoleController.php
+++ b/app/Users/Controllers/RoleController.php
@@ -55,7 +55,7 @@ public function create(Request $request)
         /** @var ?Role $role */
         $role = null;
         if ($request->has('copy_from')) {
-            $role = Role::query()->find($request->get('copy_from'));
+            $role = Role::query()->find($request->input('copy_from'));
         }
 
         if ($role) {
@@ -94,7 +94,7 @@ public function store(Request $request)
     public function edit(string $id)
     {
         $this->checkPermission(Permission::UserRolesManage);
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
 
         $this->setPageTitle(trans('settings.role_edit'));
 
@@ -129,7 +129,7 @@ public function update(Request $request, string $id)
     public function showDelete(string $id)
     {
         $this->checkPermission(Permission::UserRolesManage);
-        $role = $this->permissionsRepo->getRoleById($id);
+        $role = $this->permissionsRepo->getRoleById(intval($id));
         $roles = $this->permissionsRepo->getAllRolesExcept($role);
         $blankRole = $role->newInstance(['display_name' => trans('settings.role_delete_no_migration')]);
         $roles->prepend($blankRole);
@@ -150,8 +150,8 @@ public function delete(Request $request, string $id)
         $this->checkPermission(Permission::UserRolesManage);
 
         try {
-            $migrateRoleId = intval($request->get('migrate_role_id') ?: "0");
-            $this->permissionsRepo->deleteRole($id, $migrateRoleId);
+            $migrateRoleId = intval($request->input('migrate_role_id') ?: "0");
+            $this->permissionsRepo->deleteRole(intval($id), $migrateRoleId);
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
 
diff --git a/app/Users/Controllers/UserAccountController.php b/app/Users/Controllers/UserAccountController.php
index a8baba5294b..8a5fd53129c 100644
--- a/app/Users/Controllers/UserAccountController.php
+++ b/app/Users/Controllers/UserAccountController.php
@@ -10,6 +10,7 @@
 use BookStack\Settings\UserShortcutMap;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Users\UserRepo;
+use BookStack\View\ViewBlockManager;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rules\Password;
@@ -106,8 +107,8 @@ public function showShortcuts()
      */
     public function updateShortcuts(Request $request)
     {
-        $enabled = $request->get('enabled') === 'true';
-        $providedShortcuts = $request->get('shortcut', []);
+        $enabled = $request->input('enabled') === 'true';
+        $providedShortcuts = $request->input('shortcut', []);
         $shortcuts = new UserShortcutMap($providedShortcuts);
 
         setting()->putForCurrentUser('ui-shortcuts', $shortcuts->toJson());
@@ -159,6 +160,37 @@ public function updateNotifications(Request $request)
         return redirect('/my-account/notifications');
     }
 
+    /**
+     * Show the view for the "Interface Preferences" user account area.
+     */
+    public function showInterface(ViewBlockManager $viewBlockManager)
+    {
+        $this->setPageTitle(trans('preferences.interface'));
+
+        return view('users.account.interface', [
+            'category'       => 'interface',
+            'namedLocations' => $viewBlockManager->getNamedLocations(),
+        ]);
+    }
+
+    /**
+     * Handle the submission of the interface preferences form.
+     */
+    public function updateInterface(Request $request)
+    {
+        $this->preventAccessInDemoMode();
+
+        $user = user();
+        $validated = $this->validate($request, [
+            'language' => ['string', 'max:15', 'alpha_dash'],
+            'display_mode' => ['string', 'max:15', 'alpha_dash'],
+        ]);
+
+        $this->userRepo->update($user, $validated, userCan(Permission::UsersManage));
+
+        return redirect('/my-account/interface');
+    }
+
     /**
      * Show the view for the "Access & Security" account options.
      */
@@ -188,8 +220,9 @@ public function updatePassword(Request $request)
         }
 
         $validated = $this->validate($request, [
-            'password'         => ['required_with:password_confirm', Password::default()],
-            'password-confirm' => ['same:password', 'required_with:password'],
+            'password'         => ['required', Password::default()],
+            'password-confirm' => ['required', 'same:password'],
+            'password-current' => ['required', 'current_password:standard'],
         ]);
 
         $this->userRepo->update(user(), $validated, false);
@@ -218,7 +251,7 @@ public function destroy(Request $request)
     {
         $this->preventAccessInDemoMode();
 
-        $requestNewOwnerId = intval($request->get('new_owner_id')) ?: null;
+        $requestNewOwnerId = intval($request->input('new_owner_id')) ?: null;
         $newOwnerId = userCan(Permission::UsersManage) ? $requestNewOwnerId : null;
 
         $this->userRepo->destroy(user(), $newOwnerId);
diff --git a/app/Users/Controllers/UserApiController.php b/app/Users/Controllers/UserApiController.php
index 9134b3cc13b..6a9d905cb95 100644
--- a/app/Users/Controllers/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -109,7 +109,7 @@ public function create(Request $request)
      */
     public function read(string $id)
     {
-        $user = $this->userRepo->getById($id);
+        $user = $this->userRepo->getById(intval($id));
         $this->singleFormatter($user);
 
         return response()->json($user);
@@ -123,8 +123,8 @@ public function read(string $id)
      */
     public function update(Request $request, string $id)
     {
-        $data = $this->validate($request, $this->rules($id)['update']);
-        $user = $this->userRepo->getById($id);
+        $data = $this->validate($request, $this->rules(intval($id))['update']);
+        $user = $this->userRepo->getById(intval($id));
         $this->userRepo->update($user, $data, userCan(Permission::UsersManage));
         $this->singleFormatter($user);
 
@@ -139,8 +139,8 @@ public function update(Request $request, string $id)
      */
     public function delete(Request $request, string $id)
     {
-        $user = $this->userRepo->getById($id);
-        $newOwnerId = $request->get('migrate_ownership_id', null);
+        $user = $this->userRepo->getById(intval($id));
+        $newOwnerId = $request->input('migrate_ownership_id', null);
 
         $this->userRepo->destroy($user, $newOwnerId);
 
diff --git a/app/Users/Controllers/UserController.php b/app/Users/Controllers/UserController.php
index 494221b143e..f7310438122 100644
--- a/app/Users/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -4,6 +4,7 @@
 
 use BookStack\Access\SocialDriverManager;
 use BookStack\Access\UserInviteException;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Http\Controller;
@@ -77,7 +78,7 @@ public function store(Request $request)
         $this->checkPermission(Permission::UsersManage);
 
         $authMethod = config('auth.method');
-        $sendInvite = ($request->get('send_invite', 'false') === 'true');
+        $sendInvite = ($request->input('send_invite', 'false') === 'true');
         $externalAuth = $authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'oidc';
         $passwordRequired = ($authMethod === 'standard' && !$sendInvite);
 
@@ -202,10 +203,26 @@ public function destroy(Request $request, int $id)
         $this->checkPermission(Permission::UsersManage);
 
         $user = $this->userRepo->getById($id);
-        $newOwnerId = intval($request->get('new_owner_id')) ?: null;
+        $newOwnerId = intval($request->input('new_owner_id')) ?: null;
 
         $this->userRepo->destroy($user, $newOwnerId);
 
         return redirect('/settings/users');
     }
+
+    /**
+     * Reset MFA for the specified user.
+     */
+    public function resetMfa(Request $request, int $id)
+    {
+        $this->preventAccessInDemoMode();
+        $this->checkPermission(Permission::UsersManage);
+
+        $user = $this->userRepo->getById($id);
+        $user->mfaValues()->delete();
+
+        $this->logActivity(ActivityType::USER_MFA_RESET, $user);
+
+        return redirect("/settings/users/{$user->id}");
+    }
 }
diff --git a/app/Users/Controllers/UserPreferencesController.php b/app/Users/Controllers/UserPreferencesController.php
index 0bed2d22a43..f4a56b7bf0e 100644
--- a/app/Users/Controllers/UserPreferencesController.php
+++ b/app/Users/Controllers/UserPreferencesController.php
@@ -23,7 +23,7 @@ public function changeView(Request $request, string $type)
             return $this->redirectToRequest($request);
         }
 
-        $view = $request->get('view');
+        $view = $request->input('view');
         if (!in_array($view, ['grid', 'list'])) {
             $view = 'list';
         }
@@ -44,8 +44,8 @@ public function changeSort(Request $request, string $type)
             return $this->redirectToRequest($request);
         }
 
-        $sort = substr($request->get('sort') ?: 'name', 0, 50);
-        $order = $request->get('order') === 'desc' ? 'desc' : 'asc';
+        $sort = substr($request->input('sort') ?: 'name', 0, 50);
+        $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
 
         $sortKey = $type . '_sort';
         $orderKey = $type . '_sort_order';
@@ -76,7 +76,7 @@ public function changeExpansion(Request $request, string $type)
             return response('Invalid key', 500);
         }
 
-        $newState = $request->get('expand', 'false');
+        $newState = $request->input('expand', 'false');
         setting()->putForCurrentUser('section_expansion#' . $type, $newState);
 
         return response('', 204);
diff --git a/app/Users/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.php
index a2543b7eed3..9734255e7e0 100644
--- a/app/Users/Controllers/UserSearchController.php
+++ b/app/Users/Controllers/UserSearchController.php
@@ -5,6 +5,7 @@
 use BookStack\Http\Controller;
 use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
 
 class UserSearchController extends Controller
@@ -25,7 +26,7 @@ public function forSelect(Request $request)
             $this->showPermissionError();
         }
 
-        $search = $request->get('search', '');
+        $search = $request->input('search', '');
         $query = User::query()
             ->orderBy('name', 'asc')
             ->take(20);
@@ -34,8 +35,43 @@ public function forSelect(Request $request)
             $query->where('name', 'like', '%' . $search . '%');
         }
 
+        /** @var Collection<User> $users */
+        $users = $query->get();
+
         return view('form.user-select-list', [
-            'users' => $query->get(),
+            'users' => $users,
+        ]);
+    }
+
+    /**
+     * Search users in the system, with the response formatted
+     * for use in a list of mentions.
+     */
+    public function forMentions(Request $request)
+    {
+        $hasPermission = !user()->isGuest() && (
+                userCan(Permission::CommentCreateAll)
+                || userCan(Permission::CommentUpdate)
+            );
+
+        if (!$hasPermission) {
+            $this->showPermissionError();
+        }
+
+        $search = $request->input('search', '');
+        $query = User::query()
+            ->orderBy('name', 'asc')
+            ->take(20);
+
+        if (!empty($search)) {
+            $query->where('name', 'like', '%' . $search . '%');
+        }
+
+        /** @var Collection<User> $users */
+        $users = $query->get();
+
+        return view('form.user-mention-list', [
+            'users' => $users,
         ]);
     }
 }
diff --git a/app/Users/Models/Role.php b/app/Users/Models/Role.php
index 92be224580f..930d68c1aac 100644
--- a/app/Users/Models/Role.php
+++ b/app/Users/Models/Role.php
@@ -40,7 +40,8 @@ class Role extends Model implements Loggable
      */
     public function users(): BelongsToMany
     {
-        return $this->belongsToMany(User::class)->orderBy('name', 'asc');
+        $relation = $this->belongsToMany(User::class)->orderBy('name', 'asc');
+        return $this->deletableOrderedRelation($relation);
     }
 
     /**
@@ -87,7 +88,7 @@ public function hasPermission(string $permissionName): bool
     /**
      * Add a permission to this role.
      */
-    public function attachPermission(RolePermission $permission)
+    public function attachPermission(RolePermission $permission): void
     {
         $this->permissions()->attach($permission->id);
     }
@@ -95,7 +96,7 @@ public function attachPermission(RolePermission $permission)
     /**
      * Detach a single permission from this role.
      */
-    public function detachPermission(RolePermission $permission)
+    public function detachPermission(RolePermission $permission): void
     {
         $this->permissions()->detach([$permission->id]);
     }
diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index 0017653b53d..b9289a5a7b5 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -11,7 +11,6 @@
 use BookStack\Api\ApiToken;
 use BookStack\App\Model;
 use BookStack\App\SluggableInterface;
-use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Permissions\Permission;
 use BookStack\Translation\LocaleDefinition;
 use BookStack\Translation\LocaleManager;
@@ -31,8 +30,6 @@
 use Illuminate\Support\Collection;
 
 /**
- * Class User.
- *
  * @property int        $id
  * @property string     $name
  * @property string     $slug
@@ -225,8 +222,7 @@ public function hasSocialAccount(string $socialDriver = ''): bool
     public function getAvatar(int $size = 50): string
     {
         $default = url('/user_avatar.png');
-        $imageId = $this->image_id;
-        if ($imageId === 0 || $imageId === '0' || $imageId === null) {
+        if ($this->image_id === 0) {
             return $default;
         }
 
@@ -360,14 +356,4 @@ public function logDescriptor(): string
     {
         return "({$this->id}) {$this->name}";
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function refreshSlug(): string
-    {
-        $this->slug = app()->make(SlugGenerator::class)->generate($this, $this->name);
-
-        return $this->slug;
-    }
 }
diff --git a/app/Users/UserRepo.php b/app/Users/UserRepo.php
index d24f7002e71..6477d97d868 100644
--- a/app/Users/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -5,13 +5,14 @@
 use BookStack\Access\UserInviteException;
 use BookStack\Access\UserInviteService;
 use BookStack\Activity\ActivityType;
-use BookStack\Entities\EntityProvider;
+use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\UserAvatars;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
+use DB;
 use Exception;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
@@ -21,11 +22,11 @@ class UserRepo
 {
     public function __construct(
         protected UserAvatars $userAvatar,
-        protected UserInviteService $inviteService
+        protected UserInviteService $inviteService,
+        protected SlugGenerator $slugGenerator,
     ) {
     }
 
-
     /**
      * Get a user by their email address.
      */
@@ -50,6 +51,25 @@ public function getBySlug(string $slug): User
         return User::query()->where('slug', '=', $slug)->firstOrFail();
     }
 
+    /**
+     * Get a user by their external auth ID value.
+     * Returns null if no matching user found.
+     */
+    public function getByExternalAuthId(string $externalId): User|null
+    {
+        // We only really expect at most one user from the search, but as an extra layer of defence against database
+        // normalisation we search possible matches exactly against the value.
+        $users = User::query()->where('external_auth_id', '=', $externalId)->get();
+
+        foreach ($users as $user) {
+            if ($user->external_auth_id === $externalId) {
+                return $user;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Create a new basic instance of user with the given pre-validated data.
      *
@@ -64,7 +84,7 @@ public function createWithoutActivity(array $data, bool $emailConfirmed = false)
         $user->email_confirmed = $emailConfirmed;
         $user->external_auth_id = $data['external_auth_id'] ?? '';
 
-        $user->refreshSlug();
+        $this->slugGenerator->regenerateForUser($user);
         $user->save();
 
         if (!empty($data['language'])) {
@@ -102,7 +122,7 @@ public function create(array $data, bool $sendInvite = false): User
     /**
      * Update the given user with the given data, but do not create an activity.
      *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
+     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string, display_mode: ?string} $data
      *
      * @throws UserUpdateException
      */
@@ -110,7 +130,7 @@ public function updateWithoutActivity(User $user, array $data, bool $manageUsers
     {
         if (!empty($data['name'])) {
             $user->name = $data['name'];
-            $user->refreshSlug();
+            $this->slugGenerator->regenerateForUser($user);
         }
 
         if (!empty($data['email']) && $manageUsersAllowed) {
@@ -133,6 +153,11 @@ public function updateWithoutActivity(User $user, array $data, bool $manageUsers
             setting()->putUser($user, 'language', $data['language']);
         }
 
+        if (!empty($data['display_mode'])) {
+            $value = $data['display_mode'] === 'dark' ? 'true' : 'false';
+            setting()->putUser($user, 'dark-mode-enabled', $value);
+        }
+
         $user->save();
 
         return $user;
@@ -141,7 +166,7 @@ public function updateWithoutActivity(User $user, array $data, bool $manageUsers
     /**
      * Update the given user with the given data.
      *
-     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string} $data
+     * @param array{name: ?string, email: ?string, external_auth_id: ?string, password: ?string, roles: ?array<int>, language: ?string, display_mode: ?string} $data
      *
      * @throws UserUpdateException
      */
@@ -159,15 +184,12 @@ public function update(User $user, array $data, bool $manageUsersAllowed): User
      *
      * @throws Exception
      */
-    public function destroy(User $user, ?int $newOwnerId = null)
+    public function destroy(User $user, ?int $newOwnerId = null): void
     {
         $this->ensureDeletable($user);
 
-        $user->socialAccounts()->delete();
-        $user->apiTokens()->delete();
-        $user->favourites()->delete();
-        $user->mfaValues()->delete();
-        $user->watches()->delete();
+        $this->removeUserDependantRelations($user);
+        $this->nullifyUserNonDependantRelations($user);
         $user->delete();
 
         // Delete user profile images
@@ -176,16 +198,53 @@ public function destroy(User $user, ?int $newOwnerId = null)
         // Delete related activities
         setting()->deleteUserSettings($user->id);
 
+        // Migrate or nullify ownership
+        $newOwner = null;
         if (!empty($newOwnerId)) {
             $newOwner = User::query()->find($newOwnerId);
-            if (!is_null($newOwner)) {
-                $this->migrateOwnership($user, $newOwner);
-            }
         }
+        $this->migrateOwnership($user, $newOwner);
 
         Activity::add(ActivityType::USER_DELETE, $user);
     }
 
+    protected function removeUserDependantRelations(User $user): void
+    {
+        $user->apiTokens()->delete();
+        $user->socialAccounts()->delete();
+        $user->favourites()->delete();
+        $user->mfaValues()->delete();
+        $user->watches()->delete();
+
+        $tables = ['email_confirmations', 'user_invites', 'views'];
+        foreach ($tables as $table) {
+            DB::table($table)->where('user_id', '=', $user->id)->delete();
+        }
+    }
+    protected function nullifyUserNonDependantRelations(User $user): void
+    {
+        $toNullify = [
+            'attachments' => ['created_by', 'updated_by'],
+            'comments' => ['created_by', 'updated_by'],
+            'deletions' => ['deleted_by'],
+            'entities' => ['created_by', 'updated_by'],
+            'images' => ['created_by', 'updated_by'],
+            'imports' => ['created_by'],
+            'joint_permissions' => ['owner_id'],
+            'page_revisions' => ['created_by'],
+            'page_update_drafts' => ['created_by'],
+            'sessions' => ['user_id'],
+        ];
+
+        foreach ($toNullify as $table => $columns) {
+            foreach ($columns as $column) {
+                DB::table($table)
+                    ->where($column, '=', $user->id)
+                    ->update([$column => null]);
+            }
+        }
+    }
+
     /**
      * @throws NotifyException
      */
@@ -203,13 +262,12 @@ protected function ensureDeletable(User $user): void
     /**
      * Migrate ownership of items in the system from one user to another.
      */
-    protected function migrateOwnership(User $fromUser, User $toUser)
+    protected function migrateOwnership(User $fromUser, User|null $toUser): void
     {
-        $entities = (new EntityProvider())->all();
-        foreach ($entities as $instance) {
-            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
-                ->update(['owned_by' => $toUser->id]);
-        }
+        $newOwnerValue = $toUser ? $toUser->id : null;
+        DB::table('entities')
+            ->where('owned_by', '=', $fromUser->id)
+            ->update(['owned_by' => $newOwnerValue]);
     }
 
     /**
@@ -247,7 +305,7 @@ protected function isOnlyAdmin(User $user): bool
      *
      * @throws UserUpdateException
      */
-    protected function setUserRoles(User $user, array $roles)
+    protected function setUserRoles(User $user, array $roles): void
     {
         $roles = array_filter(array_values($roles));
 
@@ -260,7 +318,7 @@ protected function setUserRoles(User $user, array $roles)
 
     /**
      * Check if the given user is the last admin and their new roles no longer
-     * contains the admin role.
+     * contain the admin role.
      */
     protected function demotingLastAdmin(User $user, array $newRoles): bool
     {
diff --git a/app/Util/CspService.php b/app/Util/CspService.php
index 4262b5c98f8..9b871e7ff3b 100644
--- a/app/Util/CspService.php
+++ b/app/Util/CspService.php
@@ -30,6 +30,8 @@ public function getCspHeader(): string
             $this->getFrameAncestors(),
             $this->getFrameSrc(),
             $this->getScriptSrc(),
+            $this->getStyleSrc(),
+            $this->getImgSrc(),
             $this->getObjectSrc(),
             $this->getBaseUri(),
         ];
@@ -45,6 +47,8 @@ public function getCspMetaTagValue(): string
         $headers = [
             $this->getFrameSrc(),
             $this->getScriptSrc(),
+            $this->getStyleSrc(),
+            $this->getImgSrc(),
             $this->getObjectSrc(),
             $this->getBaseUri(),
         ];
@@ -65,7 +69,7 @@ public function allowedIFrameHostsConfigured(): bool
      */
     protected function getScriptSrc(): string
     {
-        if (config('app.allow_content_scripts')) {
+        if ($this->scriptFilteringDisabled()) {
             return '';
         }
 
@@ -108,13 +112,29 @@ protected function getFrameSrc(): string
      */
     protected function getObjectSrc(): string
     {
-        if (config('app.allow_content_scripts')) {
+        if ($this->scriptFilteringDisabled()) {
             return '';
         }
 
         return "object-src 'self'";
     }
 
+    /**
+     * Creates CSP 'style-src' rule to restrict where styles can be loaded from.
+     */
+    protected function getStyleSrc(): string
+    {
+        return 'style-src ' . implode(' ', $this->getAllowedStyleSources());
+    }
+
+    /**
+     * Creates CSP 'img-src' rule to restrict where images can be loaded from.
+     */
+    protected function getImgSrc(): string
+    {
+        return 'img-src ' . implode(' ', $this->getAllowedImageSources());
+    }
+
     /**
      * Creates CSP 'base-uri' rule to restrict what base tags can be set on
      * the page to prevent manipulation of relative links.
@@ -124,6 +144,11 @@ protected function getBaseUri(): string
         return "base-uri 'self'";
     }
 
+    protected function scriptFilteringDisabled(): bool
+    {
+        return !HtmlContentFilterConfig::fromConfigString(config('app.content_filtering'))->filterOutJavaScript;
+    }
+
     protected function getAllowedIframeHosts(): array
     {
         $hosts = config('app.iframe_hosts') ?? '';
@@ -139,6 +164,59 @@ protected function getAllowedIframeSources(): array
         return array_filter($sources);
     }
 
+    /**
+     * Get allowed style sources for the style-src directive.
+     */
+    protected function getAllowedStyleSources(): array
+    {
+        $configured = config('app.style_sources');
+
+        if (is_string($configured)) {
+            $sources = array_filter(explode(' ', $configured));
+            array_unshift($sources, "'self'");
+
+            // Ensure 'unsafe-inline' is quoted if present
+            // This is done as attempting to pass this in env values with quotes can either
+            // be awkward or cause issues.
+            $unsafeInlineIndex = array_search('unsafe-inline', $sources, true);
+            if ($unsafeInlineIndex !== false) {
+                $sources[$unsafeInlineIndex] = "'unsafe-inline'";
+            }
+
+            return array_values(array_unique($sources));
+        }
+
+        return [
+            "'self'",
+            "'unsafe-inline'",
+            'http:',
+            'https:',
+        ];
+    }
+
+    /**
+     * Get allowed image sources for the img-src directive.
+     */
+    protected function getAllowedImageSources(): array
+    {
+        $configured = config('app.image_sources');
+
+        if (is_string($configured)) {
+            $sources = array_filter(explode(' ', $configured));
+            array_unshift($sources, "'self'", 'blob:', 'data:');
+
+            return array_values(array_unique($sources));
+        }
+
+        return [
+            "'self'",
+            'data:',
+            'blob:',
+            'http:',
+            'https:',
+        ];
+    }
+
     /**
      * Extract the host name of the configured drawio URL for use in CSP.
      * Returns empty string if not in use.
diff --git a/app/Util/DatabaseTransaction.php b/app/Util/DatabaseTransaction.php
index e36bd2ef310..2e57b6479a1 100644
--- a/app/Util/DatabaseTransaction.php
+++ b/app/Util/DatabaseTransaction.php
@@ -3,6 +3,7 @@
 namespace BookStack\Util;
 
 use Closure;
+use Illuminate\Database\Connection;
 use Illuminate\Support\Facades\DB;
 use Throwable;
 
@@ -24,7 +25,7 @@
 class DatabaseTransaction
 {
     /**
-     * @param  (Closure(static): TReturn)  $callback
+     * @param  (Closure(Connection): TReturn)  $callback
      */
     public function __construct(
         protected Closure $callback
diff --git a/app/Util/HtmlContentFilter.php b/app/Util/HtmlContentFilter.php
index 75859172977..26f22e6ca6a 100644
--- a/app/Util/HtmlContentFilter.php
+++ b/app/Util/HtmlContentFilter.php
@@ -2,16 +2,53 @@
 
 namespace BookStack\Util;
 
+use BookStack\Util\HtmlPurifier\ConfiguredHtmlPurifier;
 use DOMAttr;
 use DOMElement;
 use DOMNodeList;
 
 class HtmlContentFilter
 {
-    /**
-     * Remove all the script elements from the given HTML document.
-     */
-    public static function removeScriptsFromDocument(HtmlDocument $doc)
+    public function __construct(
+        protected HtmlContentFilterConfig $config
+    ) {
+    }
+
+    public function filterDocument(HtmlDocument $doc): string
+    {
+        if ($this->config->filterOutJavaScript) {
+            $this->filterOutScriptsFromDocument($doc);
+        }
+        if ($this->config->filterOutFormElements) {
+            $this->filterOutFormElementsFromDocument($doc);
+        }
+        if ($this->config->filterOutBadHtmlElements) {
+            $this->filterOutBadHtmlElementsFromDocument($doc);
+        }
+        if ($this->config->filterOutNonContentElements) {
+            $this->filterOutNonContentElementsFromDocument($doc);
+        }
+
+        $filtered = $doc->getBodyInnerHtml();
+        if ($this->config->useAllowListFilter) {
+            $filtered = $this->applyAllowListFiltering($filtered);
+        }
+
+        return $filtered;
+    }
+
+    public function filterString(string $html): string
+    {
+        return $this->filterDocument(new HtmlDocument($html));
+    }
+
+    protected function applyAllowListFiltering(string $html): string
+    {
+        $purifier = new ConfiguredHtmlPurifier();
+        return $purifier->purify($html);
+    }
+
+    protected function filterOutScriptsFromDocument(HtmlDocument $doc): void
     {
         // Remove standard script tags
         $scriptElems = $doc->queryXPath('//script');
@@ -21,21 +58,21 @@ public static function removeScriptsFromDocument(HtmlDocument $doc)
         $badLinks = $doc->queryXPath('//*[' . static::xpathContains('@href', 'javascript:') . ']');
         static::removeNodes($badLinks);
 
-        // Remove forms with calls to JavaScript URI
+        // Remove elements with form-like attributes with calls to JavaScript URI
         $badForms = $doc->queryXPath('//*[' . static::xpathContains('@action', 'javascript:') . '] | //*[' . static::xpathContains('@formaction', 'javascript:') . ']');
         static::removeNodes($badForms);
 
-        // Remove meta tag to prevent external redirects
-        $metaTags = $doc->queryXPath('//meta[' . static::xpathContains('@content', 'url') . ']');
-        static::removeNodes($metaTags);
-
-        // Remove data or JavaScript iFrames
+        // Remove data or JavaScript iFrames & embeds
         $badIframes = $doc->queryXPath('//*[' . static::xpathContains('@src', 'data:') . '] | //*[' . static::xpathContains('@src', 'javascript:') . '] | //*[@srcdoc]');
         static::removeNodes($badIframes);
 
+        // Remove data or JavaScript objects
+        $badObjects = $doc->queryXPath('//*[' . static::xpathContains('@data', 'data:') . '] | //*[' . static::xpathContains('@data', 'javascript:') . ']');
+        static::removeNodes($badObjects);
+
         // Remove attributes, within svg children, hiding JavaScript or data uris.
         // A bunch of svg element and attribute combinations expose xss possibilities.
-        // For example, SVG animate tag can exploit javascript in values.
+        // For example, SVG animate tag can exploit JavaScript in values.
         $badValuesAttrs = $doc->queryXPath('//svg//@*[' . static::xpathContains('.', 'data:') . '] | //svg//@*[' . static::xpathContains('.', 'javascript:') . ']');
         static::removeAttributes($badValuesAttrs);
 
@@ -49,23 +86,52 @@ public static function removeScriptsFromDocument(HtmlDocument $doc)
         static::removeAttributes($onAttributes);
     }
 
-    /**
-     * Remove scripts from the given HTML string.
-     */
-    public static function removeScriptsFromHtmlString(string $html): string
+    protected function filterOutFormElementsFromDocument(HtmlDocument $doc): void
     {
-        if (empty($html)) {
-            return $html;
+        // Remove form elements
+        $formElements = ['form', 'fieldset', 'button', 'textarea', 'select'];
+        foreach ($formElements as $formElement) {
+            $matchingFormElements = $doc->queryXPath('//' . $formElement);
+            static::removeNodes($matchingFormElements);
         }
 
-        $doc = new HtmlDocument($html);
-        static::removeScriptsFromDocument($doc);
+        // Remove non-checkbox inputs
+        $inputsToRemove = $doc->queryXPath('//input');
+        /** @var DOMElement $input */
+        foreach ($inputsToRemove as $input) {
+            $type = strtolower($input->getAttribute('type'));
+            if ($type !== 'checkbox') {
+                $input->parentNode->removeChild($input);
+            }
+        }
 
-        return $doc->getBodyInnerHtml();
+        // Remove form attributes
+        $formAttrs = ['form', 'formaction', 'formmethod', 'formtarget'];
+        foreach ($formAttrs as $formAttr) {
+            $matchingFormAttrs = $doc->queryXPath('//@' . $formAttr);
+            static::removeAttributes($matchingFormAttrs);
+        }
+    }
+
+    protected function filterOutBadHtmlElementsFromDocument(HtmlDocument $doc): void
+    {
+        // Remove meta tag to prevent external redirects
+        $metaTags = $doc->queryXPath('//meta[' . static::xpathContains('@content', 'url') . ']');
+        static::removeNodes($metaTags);
+    }
+
+    protected function filterOutNonContentElementsFromDocument(HtmlDocument $doc): void
+    {
+        // Remove non-content elements
+        $formElements = ['link', 'style', 'meta', 'title', 'template'];
+        foreach ($formElements as $formElement) {
+            $matchingFormElements = $doc->queryXPath('//' . $formElement);
+            static::removeNodes($matchingFormElements);
+        }
     }
 
     /**
-     * Create a xpath contains statement with a translation automatically built within
+     * Create an x-path 'contains' statement with a translation automatically built within
      * to affectively search in a cases-insensitive manner.
      */
     protected static function xpathContains(string $property, string $value): string
@@ -99,4 +165,34 @@ protected static function removeAttributes(DOMNodeList $attrs): void
             $parentNode->removeAttribute($attrName);
         }
     }
+
+    /**
+     * Alias using the old method name to avoid potential compatibility breaks during patch release.
+     * To remove in future feature release.
+     * @deprecated Use filterDocument instead.
+     */
+    public static function removeScriptsFromDocument(HtmlDocument $doc): void
+    {
+        $config = new HtmlContentFilterConfig(
+            filterOutNonContentElements: false,
+            useAllowListFilter: false,
+        );
+        $filter = new self($config);
+        $filter->filterDocument($doc);
+    }
+
+    /**
+     * Alias using the old method name to avoid potential compatibility breaks during patch release.
+     * To remove in future feature release.
+     * @deprecated Use filterString instead.
+     */
+    public static function removeScriptsFromHtmlString(string $html): string
+    {
+        $config = new HtmlContentFilterConfig(
+            filterOutNonContentElements: false,
+            useAllowListFilter: false,
+        );
+        $filter = new self($config);
+        return $filter->filterString($html);
+    }
 }
diff --git a/app/Util/HtmlContentFilterConfig.php b/app/Util/HtmlContentFilterConfig.php
new file mode 100644
index 00000000000..2cb77ea5815
--- /dev/null
+++ b/app/Util/HtmlContentFilterConfig.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace BookStack\Util;
+
+readonly class HtmlContentFilterConfig
+{
+    public function __construct(
+        public bool $filterOutJavaScript = true,
+        public bool $filterOutBadHtmlElements = true,
+        public bool $filterOutFormElements = true,
+        public bool $filterOutNonContentElements = true,
+        public bool $useAllowListFilter = true,
+    ) {
+    }
+
+    /**
+     * Create an instance from a config string, where the string
+     * is a combination of characters to enable filters.
+     */
+    public static function fromConfigString(string $config): self
+    {
+        $config = strtolower($config);
+        return new self(
+            filterOutJavaScript: str_contains($config, 'j'),
+            filterOutBadHtmlElements: str_contains($config, 'h'),
+            filterOutFormElements: str_contains($config, 'f'),
+            filterOutNonContentElements: str_contains($config, 'h'),
+            useAllowListFilter: str_contains($config, 'a'),
+        );
+    }
+}
diff --git a/app/Util/HtmlDescriptionFilter.php b/app/Util/HtmlDescriptionFilter.php
index d4f7d2c8fa2..ba145460381 100644
--- a/app/Util/HtmlDescriptionFilter.php
+++ b/app/Util/HtmlDescriptionFilter.php
@@ -19,7 +19,7 @@ class HtmlDescriptionFilter
      */
     protected static array $allowedAttrsByElements = [
         'p' => [],
-        'a' => ['href', 'title', 'target'],
+        'a' => ['href', 'title', 'target', 'data-mention-user-id'],
         'ol' => [],
         'ul' => [],
         'li' => [],
@@ -27,6 +27,7 @@ class HtmlDescriptionFilter
         'span' => [],
         'em' => [],
         'br' => [],
+        'code' => [],
     ];
 
     public static function filterFromString(string $html): string
diff --git a/app/Util/HtmlDocument.php b/app/Util/HtmlDocument.php
index 7517955b9f6..c1ec2cf415b 100644
--- a/app/Util/HtmlDocument.php
+++ b/app/Util/HtmlDocument.php
@@ -103,7 +103,13 @@ public function getElementById(string $elementId): ?DOMElement
      */
     public function getBody(): DOMNode
     {
-        return $this->document->getElementsByTagName('body')[0];
+        $bodies = $this->document->getElementsByTagName('body');
+
+        if ($bodies->length === 0) {
+            return new DOMElement('body', '');
+        }
+
+        return $bodies[0];
     }
 
     /**
diff --git a/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
new file mode 100644
index 00000000000..883b0f1767d
--- /dev/null
+++ b/app/Util/HtmlPurifier/ConfiguredHtmlPurifier.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier;
+
+use BookStack\App\AppVersion;
+use BookStack\Util\HtmlPurifier\Filters\UriEnsureScheme;
+use BookStack\Util\HtmlPurifier\Filters\UriLimitFileProtocolToAnchors;
+use BookStack\Util\HtmlPurifier\Filters\UriMakeAbsolute;
+use BookStack\Util\UrlFilter;
+use HTMLPurifier;
+use HTMLPurifier_Config;
+use HTMLPurifier_DefinitionCache_Serializer;
+use HTMLPurifier_HTML5Config;
+use HTMLPurifier_HTMLDefinition;
+use HTMLPurifier_URIDefinition;
+use HTMLPurifier_URISchemeRegistry;
+
+/**
+ * Provides a configured HTML Purifier instance.
+ * https://github.com/ezyang/htmlpurifier
+ * Also uses this to extend support to HTML5 elements:
+ * https://github.com/xemlock/htmlpurifier-html5
+ */
+class ConfiguredHtmlPurifier
+{
+    protected HTMLPurifier $purifier;
+    protected static bool $cachedChecked = false;
+
+    public function __construct()
+    {
+        // This is done by the web-server at run-time, with the existing
+        // storage/framework/cache folder to ensure we're using a server-writable folder.
+        $cachePath = storage_path('framework/cache/purifier');
+        $this->createCacheFolderIfNeeded($cachePath);
+
+        $config = HTMLPurifier_HTML5Config::createDefault();
+        $this->setConfig($config, $cachePath);
+        $this->resetCacheIfNeeded($config);
+
+        $htmlDef = $config->getDefinition('HTML', true, true);
+        if ($htmlDef instanceof HTMLPurifier_HTMLDefinition) {
+            $this->configureHtmlDefinition($htmlDef);
+        }
+
+        $registry = HTMLPurifier_URISchemeRegistry::instance();
+        $registry->register('sftp', new SftpUriScheme());
+
+        $uriDef = $config->getDefinition('URI', true, true);
+        if ($uriDef instanceof HTMLPurifier_URIDefinition) {
+            $this->configureUriDefinition($uriDef);
+        }
+
+        $this->purifier = new HTMLPurifier($config);
+    }
+
+    protected function createCacheFolderIfNeeded(string $cachePath): void
+    {
+        if (!file_exists($cachePath)) {
+            mkdir($cachePath, 0777, true);
+        }
+    }
+
+    protected function resetCacheIfNeeded(HTMLPurifier_Config $config): void
+    {
+        if (self::$cachedChecked) {
+            return;
+        }
+
+        $cachedForVersion = cache('htmlpurifier::cache-version');
+        $appVersion = AppVersion::get();
+        if ($cachedForVersion !== $appVersion) {
+            foreach (['HTML', 'CSS', 'URI'] as $name) {
+                $cache = new HTMLPurifier_DefinitionCache_Serializer($name);
+                $cache->flush($config);
+            }
+            cache()->set('htmlpurifier::cache-version', $appVersion);
+        }
+
+        self::$cachedChecked = true;
+    }
+
+    protected function setConfig(HTMLPurifier_Config $config, string $cachePath): void
+    {
+        $config->set('Cache.SerializerPath', $cachePath);
+        $config->set('Core.AllowHostnameUnderscore', true);
+        $config->set('CSS.AllowTricky', true);
+        $config->set('HTML.SafeIframe', true);
+        $config->set('HTML.TargetNoopener', false);
+        $config->set('HTML.TargetNoreferrer', false);
+        $config->set('Attr.EnableID', true);
+        $config->set('Attr.ID.HTML5', true);
+        $config->set('Output.FixInnerHTML', false);
+
+        $allowedSchemes = UrlFilter::getAllowedSchemes();
+        $allowedSchemesSetting = [];
+        foreach ($allowedSchemes as $scheme) {
+            $allowedSchemesSetting[$scheme] = true;
+        }
+        $defaultScheme = str_starts_with(url('/'), 'http:') ? 'http' : 'https';
+        $config->set('URI.SafeIframeRegexp', '%^(http://|https://|//)%');
+        $config->set('URI.AllowedSchemes', $allowedSchemesSetting);
+        $config->set('URI.MakeAbsolute', false); // We register our own MakeAbsolute filter below
+        $config->set('URI.DefaultScheme', $defaultScheme);
+        $config->set('URI.Base', url('/'));
+
+         // $config->set('Cache.DefinitionImpl', null); // Disable cache during testing
+    }
+
+    protected function configureHtmlDefinition(HTMLPurifier_HTMLDefinition $definition): void
+    {
+        // Allow the object element
+        $definition->addElement(
+            'object',
+            'Inline',
+            'Flow',
+            'Common',
+            [
+                'data'   => 'URI',
+                'type'   => 'Text',
+                'width'  => 'Length',
+                'height' => 'Length',
+            ]
+        );
+
+        // Allow the embed element
+        $definition->addElement(
+            'embed',
+            'Inline',
+            'Empty',
+            'Common',
+            [
+                'src'   => 'URI',
+                'type'   => 'Text',
+                'width'  => 'Length',
+                'height' => 'Length',
+            ]
+        );
+
+        // Allow checkbox inputs
+        $definition->addElement(
+            'input',
+            'Formctrl',
+            'Empty',
+            'Common',
+            [
+                'checked' => 'Bool#checked',
+                'disabled' => 'Bool#disabled',
+                'name' => 'Text',
+                'readonly' => 'Bool#readonly',
+                'type' => 'Enum#checkbox',
+                'value' => 'Text',
+            ]
+        );
+
+        // Allow the drawio-diagram attribute on div elements
+        $definition->addAttribute(
+            'div',
+            'drawio-diagram',
+            'Number',
+        );
+
+        // Allow target="_blank" on links
+        $definition->addAttribute('a', 'target', 'Enum#_blank');
+
+        // Allow mention-ids on links
+        $definition->addAttribute('a', 'data-mention-user-id', 'Number');
+
+        // Allow 'align' attribute on table cells
+        $definition->addAttribute('td', 'align', 'Enum#left,center,right');
+        $definition->addAttribute('th', 'align', 'Enum#left,center,right');
+
+        // Set up custom handler for srcset
+        // To remove once added upstream: https://github.com/xemlock/htmlpurifier-html5/pull/91
+        $definition->addAttribute('img', 'srcset', new SrcsetAttrDef());
+        $definition->addAttribute('source', 'srcset', new SrcsetAttrDef());
+    }
+
+    protected function configureUriDefinition(HTMLPurifier_URIDefinition $definition): void
+    {
+        $definition->registerFilter(new UriLimitFileProtocolToAnchors());
+        $definition->registerFilter(new UriEnsureScheme());
+        $definition->registerFilter(new UriMakeAbsolute());
+    }
+
+    public function purify(string $html): string
+    {
+        return $this->purifier->purify($html);
+    }
+}
diff --git a/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php b/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php
new file mode 100644
index 00000000000..74380701a8e
--- /dev/null
+++ b/app/Util/HtmlPurifier/Filters/UriEnsureScheme.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier\Filters;
+
+use HTMLPurifier_Config;
+use HTMLPurifier_Context;
+use HTMLPurifier_URI;
+use HTMLPurifier_URIFilter;
+
+class UriEnsureScheme extends HTMLPurifier_URIFilter
+{
+    /**
+     * @type string
+     */
+    public $name = 'EnsureScheme';
+
+    /**
+     * @type bool
+     */
+    public $always_load = true;
+
+    /**
+     * @param HTMLPurifier_URI $uri
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return bool
+     */
+    public function filter(&$uri, $config, $context): bool
+    {
+        $def = $config->getDefinition('URI');
+        $defaultScheme = $def->defaultScheme ?? '';
+
+        if (empty($uri->scheme) && $defaultScheme) {
+            if (!str_starts_with($uri->toString(), '#')) {
+                $uri->scheme = $defaultScheme;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/app/Util/HtmlPurifier/Filters/UriLimitFileProtocolToAnchors.php b/app/Util/HtmlPurifier/Filters/UriLimitFileProtocolToAnchors.php
new file mode 100644
index 00000000000..bf259e08398
--- /dev/null
+++ b/app/Util/HtmlPurifier/Filters/UriLimitFileProtocolToAnchors.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier\Filters;
+
+use HTMLPurifier_Config;
+use HTMLPurifier_Context;
+use HTMLPurifier_URI;
+use HTMLPurifier_URIFilter;
+
+/**
+ * Limits file:// URIs to only be used on anchor tags href attributes.
+ * This prevents use on iframes/embeds/images where they can be used to load external
+ * content on the network, triggering calls which may include NTLM auth hashes when in
+ * certain windows based environments.
+ */
+class UriLimitFileProtocolToAnchors extends HTMLPurifier_URIFilter
+{
+    /**
+     * @type string
+     */
+    public $name = 'LimitFileProtocolToAnchors';
+
+    /**
+     * @type bool
+     */
+    public $always_load = true;
+
+    /**
+     * @param HTMLPurifier_URI $uri
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     * @return bool
+     */
+    public function filter(&$uri, $config, $context)
+    {
+        // Ensure we're only filtering file:// URIs'
+        if ($uri->scheme !== 'file') {
+            return true;
+        }
+
+        $token = $context->get('CurrentToken', true);
+        $attr = $context->get('CurrentAttr', true);
+
+        // Only allow if used on hrefs on anchor tags
+        $isAnchor = $token && $token->name === 'a';
+        $isHref = $attr === 'href';
+        if ($isAnchor && $isHref) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php b/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php
new file mode 100644
index 00000000000..fc005a7408a
--- /dev/null
+++ b/app/Util/HtmlPurifier/Filters/UriMakeAbsolute.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier\Filters;
+
+use HTMLPurifier_Config;
+use HTMLPurifier_Context;
+use HTMLPurifier_URI;
+use HTMLPurifier_URIFilter_MakeAbsolute;
+
+/**
+ * A custom version of HTMLPurifier's MakeAbsolute filter which leaves fragment-based
+ * anchors alone without adding a base.
+ */
+class UriMakeAbsolute extends HTMLPurifier_URIFilter_MakeAbsolute
+{
+    /**
+     * @type string
+     */
+    public $name = 'CustomMakeAbsolute';
+
+    /**
+     * @type bool
+     */
+    public $always_load = true;
+
+    /**
+     * @param HTMLPurifier_URI $uri
+     * @param HTMLPurifier_Config $config
+     * @param HTMLPurifier_Context $context
+     */
+    public function filter(&$uri, $config, $context): bool
+    {
+        if (str_starts_with($uri->toString(), '#')) {
+            return true;
+        }
+
+        return parent::filter($uri, $config, $context);
+    }
+}
diff --git a/app/Util/HtmlPurifier/SftpUriScheme.php b/app/Util/HtmlPurifier/SftpUriScheme.php
new file mode 100644
index 00000000000..889cb7f38cc
--- /dev/null
+++ b/app/Util/HtmlPurifier/SftpUriScheme.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier;
+
+use HTMLPurifier_URIScheme_ftp;
+
+class SftpUriScheme extends HTMLPurifier_URIScheme_ftp
+{
+    public $default_port = 22;
+}
diff --git a/app/Util/HtmlPurifier/SrcsetAttrDef.php b/app/Util/HtmlPurifier/SrcsetAttrDef.php
new file mode 100644
index 00000000000..783f1f86cc7
--- /dev/null
+++ b/app/Util/HtmlPurifier/SrcsetAttrDef.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace BookStack\Util\HtmlPurifier;
+
+use HTMLPurifier_AttrDef;
+use HTMLPurifier_AttrDef_URI;
+
+/**
+ * A custom attribute definition for handling Srcset attributes.
+ * Has been provided upstream via:
+ * https://github.com/xemlock/htmlpurifier-html5/pull/91
+ * but awaiting review/merge.
+ */
+class SrcsetAttrDef extends HTMLPurifier_AttrDef
+{
+    public function validate($string, $config, $context)
+    {
+        $sources = $this->parseImageSources($string);
+        if (empty($sources)) {
+            return false;
+        }
+
+        $uriFilter = new HTMLPurifier_AttrDef_URI(true);
+
+        $filtered = array();
+        foreach ($sources as $source) {
+            $uri = $source['uri'];
+            $descriptor = $source['descriptor'];
+            $validatedUri = $uriFilter->validate($uri, $config, $context);
+            if (is_string($validatedUri)) {
+                if ($descriptor) {
+                    $filtered[] = $validatedUri . ' ' . $source['descriptor'];
+                } else {
+                    $filtered[] = $validatedUri;
+                }
+            }
+        }
+
+        if (empty($filtered)) {
+            return false;
+        }
+
+        return implode(', ', $filtered);
+    }
+
+    /**
+     * Parse the image source from srcset attribute text.
+     * Returns false if it's found to be invalid, otherwise
+     * returns an array of uri and descriptor combinations.
+     *
+     * This aims to follow the WHATWG parsing spec as per:
+     * https://html.spec.whatwg.org/multipage/images.html#parsing-a-srcset-attribute
+     *
+     * @param string $string
+     * @return array{uri: string, descriptor: string}[]|false
+     */
+    private function parseImageSources($string)
+    {
+        $imageSources = array();
+        $asciiWhitespace = " \n\r\t\f";
+        $asciiWhiteSpaceComma = $asciiWhitespace . ',';
+        $input = trim($string, $asciiWhiteSpaceComma);
+
+        if ($input === "") {
+            return false;
+        }
+
+        $position = 0;
+        while ($position < strlen($input)) {
+            $position += strspn($input, $asciiWhitespace, $position);
+            $urlEnd = $position + strcspn($input, $asciiWhitespace, $position);
+            $url = substr($input, $position, $urlEnd - $position);
+            $position = $urlEnd;
+            $descriptors = array();
+
+            if (strpos($url, ',') === strlen($url) - 1) {
+                $url = rtrim($url, ',');
+            } else {
+                $position += strspn($input, $asciiWhitespace, $position);
+                $currentDescriptor = '';
+                $state = 'in_descriptor';
+                while (true) {
+                    if ($position < strlen($input)) {
+                        $c = $input[$position];
+                    } else {
+                        $c = null;
+                    }
+
+                    if ($state === 'in_descriptor') {
+                        if ($c !== null && str_contains($asciiWhitespace, $c)) {
+                            if ($currentDescriptor !== '') {
+                                $descriptors[] = $currentDescriptor;
+                            }
+                            $state = 'after_descriptor';
+                        } else if ($c === ',') {
+                            $position++;
+                            if ($currentDescriptor !== '') {
+                                $descriptors[] = $currentDescriptor;
+                            }
+                            break;
+                        } else if ($c === '(') {
+                            $currentDescriptor .= $c;
+                            $state = 'in_parens';
+                        } else if ($c === null) {
+                            if ($currentDescriptor !== '') {
+                                $descriptors[] = $currentDescriptor;
+                            }
+                            break;
+                        } else {
+                            $currentDescriptor .= $c;
+                        }
+                    } else if ($state === 'in_parens') {
+                        if ($c === ')') {
+                            $currentDescriptor .= $c;
+                            $state = 'in_descriptor';
+                        } else if ($c === null) {
+                            $descriptors[] = $currentDescriptor;
+                            break;
+                        } else {
+                            $currentDescriptor .= $c;
+                        }
+                    } else {
+                        if ($c !== null && str_contains($asciiWhitespace, $c)) {
+                            // Stay in this state
+                        } else if ($c === null) {
+                            break;
+                        } else {
+                            $state = 'in_descriptor';
+                            $position--;
+                        }
+                    }
+
+                    $position++;
+                }
+            }
+
+            $descriptor = $this->formatDescriptor($descriptors);
+
+            if ($url && $descriptor !== false) {
+                $imageSources[] = array(
+                    'uri' => $url,
+                    'descriptor' => $descriptor,
+                );
+            }
+        }
+
+        return $imageSources;
+    }
+
+    /**
+     * Parse and format a single descriptor from an array of potential
+     * descriptor strings. Returns empty if valid but no descriptor.
+     * Returns false if invalid.
+     * @param string[] $descriptors
+     * @return false|string
+     */
+    private function formatDescriptor(array $descriptors)
+    {
+        $error = false;
+        $width = '';
+        $density = '';
+        $futureCompatH = '';
+
+        foreach ($descriptors as $descriptor) {
+            $descriptor = trim($descriptor);
+            if ($descriptor === '') {
+                continue;
+            }
+
+            $unit = $descriptor[strlen($descriptor) - 1];
+            $number = trim(substr($descriptor, 0, -1));
+
+            if ($unit === 'w' && filter_var($number, FILTER_VALIDATE_INT) && intval($number) >= 0) {
+                if (!empty($width) || !empty($density) || intval($number) === 0) {
+                    $error = true;
+                }
+                $width = $number;
+            } else if ($unit === 'x' && filter_var($number, FILTER_VALIDATE_FLOAT)) {
+                if (!empty($width) || !empty($density) || !empty($futureCompatH) || floatval($number) < 0) {
+                    $error = true;
+                }
+                $density = $number;
+            } else if ($unit === 'h' && filter_var($number, FILTER_VALIDATE_INT) && intval($number) >= 0) {
+                if (!empty($futureCompatH) || !empty($density)) {
+                    $error = true;
+                }
+                $futureCompatH = $number;
+            } else {
+                $error = true;
+            }
+        }
+
+        if (!empty($futureCompatH) && empty($width)) {
+            $error = true;
+        }
+
+        if ($error) {
+            return false;
+        }
+
+        if ($width) {
+            return $width . 'w';
+        }
+
+        if ($density) {
+            return $density . 'x';
+        }
+
+        return '';
+    }
+}
diff --git a/app/Util/HtmlToPlainText.php b/app/Util/HtmlToPlainText.php
new file mode 100644
index 00000000000..79da9e3d862
--- /dev/null
+++ b/app/Util/HtmlToPlainText.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace BookStack\Util;
+
+class HtmlToPlainText
+{
+    /**
+     * Inline tags types where the content should not be put on a new line.
+     */
+    protected array $inlineTags = [
+        'a', 'b', 'i', 'u', 'strong', 'em', 'small', 'sup', 'sub', 'span', 'div',
+    ];
+
+    /**
+     * Convert the provided HTML to relatively clean plain text.
+     */
+    public function convert(string $html): string
+    {
+        $doc = new HtmlDocument($html);
+        $text = $this->nodeToText($doc->getBody());
+
+        // Remove repeated newlines
+        $text = preg_replace('/\n+/', "\n", $text);
+        // Remove leading/trailing whitespace
+        $text = trim($text);
+
+        return $text;
+    }
+
+    protected function nodeToText(\DOMNode $node): string
+    {
+        if ($node->nodeType === XML_TEXT_NODE) {
+            return $node->textContent;
+        }
+
+        $text = '';
+        if (!in_array($node->nodeName, $this->inlineTags)) {
+            $text .= "\n";
+        }
+
+        foreach ($node->childNodes as $childNode) {
+            $text .= $this->nodeToText($childNode);
+        }
+
+        return $text;
+    }
+}
diff --git a/app/Util/SimpleListOptions.php b/app/Util/SimpleListOptions.php
index 81d8a587636..9fb1b98ae8f 100644
--- a/app/Util/SimpleListOptions.php
+++ b/app/Util/SimpleListOptions.php
@@ -30,7 +30,7 @@ public function __construct(string $typeKey, string $sort, string $order, string
      */
     public static function fromRequest(Request $request, string $typeKey, bool $sortDescDefault = false): self
     {
-        $search = $request->get('search', '');
+        $search = $request->input('search', '');
         $sort = setting()->getForCurrentUser($typeKey . '_sort', '');
         $order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc');
 
diff --git a/app/Util/SsrUrlValidator.php b/app/Util/SsrUrlValidator.php
index 076a653fc86..a9b5c138df5 100644
--- a/app/Util/SsrUrlValidator.php
+++ b/app/Util/SsrUrlValidator.php
@@ -8,6 +8,10 @@
  * Validate the host we're connecting to when making a server-side-request.
  * Will use the given hosts config if given during construction otherwise
  * will look to the app configured config.
+ *
+ * The config format is a space-seperated list of URL prefixes which should contain the
+ * protocol and host. It can optionally define a path prefix as part of the URL.
+ * Wildcards, via a '*', can be used within these elements to match anything but a '/'.
  */
 class SsrUrlValidator
 {
@@ -48,15 +52,34 @@ protected function urlMatchesPattern($url, $pattern): bool
     {
         $pattern = rtrim(trim($pattern), '/');
         $url = trim($url);
+        $urlParts = parse_url($url);
 
-        if (empty($pattern) || empty($url)) {
+        if (empty($pattern) || empty($url) || $urlParts === false) {
             return false;
         }
 
+        // Prevent potential tricks using percent encoded slashes
+        if (str_contains(strtolower($urlParts['host'] ?? ''), '%2f')) {
+            return false;
+        }
+
+        // Disregard query and fragment
+        $url = explode('?', $url, 2)[0];
+        $url = explode('#', $url, 2)[0];
+
+        // Disregard userinfo if existing
+        if (!empty($urlParts['user']) || !empty($urlParts['pass'])) {
+            [$start, $postUserinfo] = explode('@', $url, 2);
+            $preUserinfo = explode('//', $start, 2)[0];
+            $url = ($preUserinfo ? $preUserinfo . '//' : '') . $postUserinfo;
+        }
+
+        // Prepare pattern
         $quoted = preg_quote($pattern, '/');
-        $regexPattern = str_replace('\*', '.*', $quoted);
+        $regexPattern = str_replace('\*', '[^\/]*', $quoted);
 
-        return preg_match('/^' . $regexPattern . '($|\/.*$|#.*$)/i', $url);
+        // Check against our URL
+        return preg_match('/^' . $regexPattern . '($|\/.*$)/i', $url);
     }
 
     /**
diff --git a/app/Util/SvgIcon.php b/app/Util/SvgIcon.php
index ce6e1c23e37..b1b14a4872a 100644
--- a/app/Util/SvgIcon.php
+++ b/app/Util/SvgIcon.php
@@ -2,6 +2,8 @@
 
 namespace BookStack\Util;
 
+use BookStack\Facades\Theme;
+
 class SvgIcon
 {
     public function __construct(
@@ -23,12 +25,9 @@ public function toHtml(): string
             $attrString .= $attrName . '="' . $attr . '" ';
         }
 
-        $iconPath = resource_path('icons/' . $this->name . '.svg');
-        $themeIconPath = theme_path('icons/' . $this->name . '.svg');
-
-        if ($themeIconPath && file_exists($themeIconPath)) {
-            $iconPath = $themeIconPath;
-        } elseif (!file_exists($iconPath)) {
+        $defaultIconPath = resource_path('icons/' . $this->name . '.svg');
+        $iconPath = Theme::findFirstFile("icons/{$this->name}.svg") ?? $defaultIconPath;
+        if (!file_exists($iconPath)) {
             return '';
         }
 
diff --git a/app/Util/UrlComparison.php b/app/Util/UrlComparison.php
new file mode 100644
index 00000000000..9fda2d6142b
--- /dev/null
+++ b/app/Util/UrlComparison.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace BookStack\Util;
+
+class UrlComparison
+{
+    public function __construct(
+        protected readonly string $a,
+        protected readonly string $b,
+    ) {
+    }
+
+    /**
+     * Check if the two URLs have the same origin.
+     */
+    public function originsMatch(): bool
+    {
+        $aParts = parse_url($this->a);
+        $bParts = parse_url($this->b);
+
+        return ($aParts['host'] ?? '') === ($bParts['host'] ?? '')
+            && ($aParts['scheme'] ?? '') === ($bParts['scheme'] ?? '')
+            && ($aParts['port'] ?? '') === ($bParts['port'] ?? '');
+    }
+
+    /**
+     * Check if there's some overlap between the two URLs' paths.
+     */
+    public function pathsOverlap(): bool
+    {
+        $aPath = parse_url($this->a, PHP_URL_PATH) ?? '';
+        $bPath = parse_url($this->b, PHP_URL_PATH) ?? '';
+
+        return str_starts_with($aPath, $bPath) || str_starts_with($bPath, $aPath);
+    }
+}
diff --git a/app/Util/UrlFilter.php b/app/Util/UrlFilter.php
new file mode 100644
index 00000000000..9380597c092
--- /dev/null
+++ b/app/Util/UrlFilter.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BookStack\Util;
+
+/**
+ * Helps filter URLs to prevent the use of undesired schemes.
+ * Also parses and rebuilds the URL to ensure it's valid.
+ */
+class UrlFilter
+{
+    protected static array $allowedSchemes = ['http', 'https', 'mailto', 'tel', 'file', 'sftp', 'ftp', 'nntp', 'news'];
+    protected string $url;
+
+    public function __construct(string $url)
+    {
+        $this->url = trim($url);
+    }
+
+    /**
+     * Check if the URL is allowed to be generally used as a link
+     * in the application. This does not ensure the original URL string
+     * provided is safe as-is. Ensure you use the clean method to produce
+     * a URL that is considered safe to use.
+     */
+    public function isAllowed(): bool
+    {
+        $urlParts = parse_url($this->url);
+        if (!$urlParts) {
+            return false;
+        }
+
+        // Extra check to help avoid scenarios where non-standard characters are used in the scheme
+        // to work around parse_url handling with URLs which may be interpreted by the browser differently.
+        if (str_contains($this->url, ':') && !preg_match('/^[a-z]+:/i', $this->url)) {
+            return false;
+        }
+
+        if (isset($urlParts['scheme'])) {
+            return in_array(strtolower($urlParts['scheme']), self::$allowedSchemes);
+        }
+
+        return true;
+    }
+
+    /**
+     * Clean the URL to ensure it's valid and only uses the allowed schemes.
+     * If the URL is not allowed, return a placeholder.
+     */
+    public function clean(): string
+    {
+        if (!$this->isAllowed()) {
+            return '#badlink';
+        }
+
+        $urlParts = parse_url($this->url);
+        if (!$urlParts) {
+            return '#badlink';
+        }
+
+        $url = '';
+
+        if (isset($urlParts['scheme']) || isset($urlParts['host'])) {
+            $scheme = strtolower($urlParts['scheme'] ?? 'https');
+            $url = $scheme . ':' . (isset($urlParts['host']) ? '//' : '');
+        }
+
+        if (isset($urlParts['user']) || isset($urlParts['pass'])) {
+            $url .= $urlParts['user'] ?? '';
+            if (isset($urlParts['pass'])) {
+                $url .= ':' . $urlParts['pass'];
+            }
+            $url .= '@';
+        }
+
+        if (isset($urlParts['host'])) {
+            $url .= $urlParts['host'];
+        }
+        if (isset($urlParts['port'])) {
+            $url .= ':' . $urlParts['port'];
+        }
+        if (isset($urlParts['path'])) {
+            $url .= $urlParts['path'];
+        }
+        if (isset($urlParts['query'])) {
+            $url .= '?' . $urlParts['query'];
+        }
+        if (isset($urlParts['fragment'])) {
+            $url .= '#' . $urlParts['fragment'];
+        }
+
+        return $url;
+    }
+
+    /**
+     * Get schemes that are allowed to be used in content links.
+     */
+    public static function getAllowedSchemes(): array
+    {
+        return self::$allowedSchemes;
+    }
+}
diff --git a/app/View/BaseViewBlock.php b/app/View/BaseViewBlock.php
new file mode 100644
index 00000000000..e2cd8d1098c
--- /dev/null
+++ b/app/View/BaseViewBlock.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace BookStack\View;
+
+/**
+ * Base class for view blocks.
+ * This is intended as a base implementation for the ViewBlockInterface, and it's advised to extend
+ * this since we will aim to keep child implementations of this class forward compatible with future changes
+ * of the interface.
+ */
+abstract class BaseViewBlock implements ViewBlockInterface
+{
+}
diff --git a/app/View/LayoutController.php b/app/View/LayoutController.php
new file mode 100644
index 00000000000..ff6a6f030f7
--- /dev/null
+++ b/app/View/LayoutController.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace BookStack\View;
+
+use BookStack\Http\Controller;
+use Closure;
+use Illuminate\Http\Request;
+
+class LayoutController extends Controller
+{
+    public function __construct(
+        protected ViewBlockManager $viewBlocks,
+        protected ViewBlockPreferences $viewBlockPreferences,
+    ) {
+        $this->middleware(function (Request $request, Closure $next) {
+            $this->preventGuestAccess();
+            return $next($request);
+        });
+    }
+
+    /**
+     * Start editing the layout for a specific location.
+     */
+    public function edit(string $location)
+    {
+        $namedLocations = $this->viewBlocks->getNamedLocations();
+        $locationName = $namedLocations[$location] ?? $location;
+        $blocks = $this->viewBlocks->getForLocationForCurrentUser($location);
+
+        $this->setPageTitle(trans('preferences.layout_edit'));
+
+        return view('settings.layouts.edit', [
+            'location' => $location,
+            'locationName' => $locationName,
+            'namedLocations' => $namedLocations,
+            'blocks' => $blocks,
+        ]);
+    }
+
+    /**
+     * Update the layout for a specific location for the current user.
+     */
+    public function update(string $location, Request $request)
+    {
+        $data = $this->validate($request, [
+            'layout' => ['required', 'string', 'json'],
+        ]);
+
+        $layoutData = json_decode($data['layout'], true, 5);
+        if (is_array($layoutData)) {
+            $this->viewBlocks->updatePreferencesFromIdPositionMap($location, $layoutData);
+        }
+
+        $this->showSuccessNotification(trans('preferences.layout_update_success'));
+
+        return redirect("/layouts/{$location}");
+    }
+
+    /**
+     * Reset the layout for a specific location, for the current user,
+     * back to system defaults by removing any user-specific preferences.
+     */
+    public function reset(string $location)
+    {
+        $this->viewBlockPreferences->clearForLocation($location);
+
+        $this->showSuccessNotification(trans('preferences.layout_reset_success'));
+
+        return redirect("/layouts/{$location}");
+    }
+}
diff --git a/app/View/SimpleViewBlock.php b/app/View/SimpleViewBlock.php
new file mode 100644
index 00000000000..0e1a4e27c21
--- /dev/null
+++ b/app/View/SimpleViewBlock.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace BookStack\View;
+
+abstract class SimpleViewBlock extends BaseViewBlock
+{
+    protected static string $id;
+    protected static string $view;
+    protected static string $labelTranslationKey;
+
+    /**
+     * @inheritDoc
+     */
+    public static function getId(): string
+    {
+        return static::$id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getLabel(): string
+    {
+        return trans(static::$labelTranslationKey);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getView(array $viewData): string
+    {
+        return static::$view;
+    }
+}
diff --git a/app/View/ViewBlockDefaults.php b/app/View/ViewBlockDefaults.php
new file mode 100644
index 00000000000..e3bd887462e
--- /dev/null
+++ b/app/View/ViewBlockDefaults.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace BookStack\View;
+
+class ViewBlockDefaults
+{
+    /**
+     * The default block configuration, organised by location and position.
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
+     */
+    protected static array $defaults = [
+        'home-default' => [
+            'left' => [
+                ViewBlocks\HomeRecentDrafts::class,
+                ViewBlocks\HomeRecentlyViewedOrRecentBooks::class,
+            ],
+            'center' => [
+                ViewBlocks\HomeTopFavourites::class,
+                ViewBlocks\HomeRecentlyUpdatedPages::class,
+            ],
+            'right' => [
+                ViewBlocks\HomeRecentActivity::class,
+            ],
+        ],
+        'home-non-default' => [
+            'left' => [
+                ViewBlocks\HomeRecentDrafts::class,
+                ViewBlocks\HomeTopFavourites::class,
+                ViewBlocks\HomeRecentlyViewedOrRecentBooks::class,
+                ViewBlocks\HomeRecentlyUpdatedPages::class,
+                ViewBlocks\HomeRecentActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\HomeActions::class,
+            ],
+        ],
+        'shelves-index' => [
+            'left' => [
+                ViewBlocks\ShelvesIndexRecents::class,
+                ViewBlocks\ShelvesIndexPopular::class,
+                ViewBlocks\ShelvesIndexNew::class,
+            ],
+            'right' => [
+                ViewBlocks\ShelvesIndexActions::class,
+            ],
+        ],
+        'shelves-show' => [
+            'left' => [
+                ViewBlocks\ShelvesShowTags::class,
+                ViewBlocks\ShelvesShowDetails::class,
+                ViewBlocks\ShelvesShowActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\ShelvesShowActions::class,
+            ],
+        ],
+        'books-index' => [
+            'left' => [
+                ViewBlocks\BooksIndexRecents::class,
+                ViewBlocks\BooksIndexPopular::class,
+                ViewBlocks\BooksIndexNew::class,
+            ],
+            'right' => [
+                ViewBlocks\BooksIndexActions::class,
+            ],
+        ],
+        'books-show' => [
+            'left' => [
+                ViewBlocks\BooksShowSearchForm::class,
+                ViewBlocks\BooksShowTags::class,
+                ViewBlocks\BooksShowShelves::class,
+                ViewBlocks\BooksShowActivity::class,
+            ],
+            'right' => [
+                ViewBlocks\BooksShowDetails::class,
+                ViewBlocks\BooksShowActions::class,
+            ],
+        ],
+        'chapters-show' => [
+            'left' => [
+                ViewBlocks\ChaptersShowSearchForm::class,
+                ViewBlocks\ChaptersShowTags::class,
+                ViewBlocks\ChaptersShowBookTree::class,
+            ],
+            'right' => [
+                ViewBlocks\ChaptersShowDetails::class,
+                ViewBlocks\ChaptersShowActions::class,
+            ],
+        ],
+        'pages-show' => [
+            'left' => [
+                ViewBlocks\PagesShowTags::class,
+                ViewBlocks\PagesShowAttachments::class,
+                ViewBlocks\PagesShowPageNav::class,
+                ViewBlocks\PagesShowBookTree::class,
+            ],
+            'right' => [
+                ViewBlocks\PagesShowDetails::class,
+                ViewBlocks\PagesShowActions::class,
+            ],
+        ],
+    ];
+
+    /**
+     * Get the default view blocks for the given location.
+     */
+    public static function getForLocation(string $location): array
+    {
+        return self::$defaults[$location] ?? [];
+    }
+
+    /**
+     * Get the locations for all default blocks.
+     * @return string[]
+     */
+    public static function getLocations(): array
+    {
+        return array_keys(self::$defaults);
+    }
+
+    public static function getLocationLabels(): array
+    {
+        return [
+            'home-default' => trans('common.homepage'),
+            'home-non-default' => trans('common.homepage'),
+            'shelves-index' => trans('entities.shelves'),
+            'shelves-show' => trans('entities.shelf'),
+            'books-index' => trans('entities.books'),
+            'books-show' => trans('entities.book'),
+            'chapters-show' => trans('entities.chapter'),
+            'pages-show' => trans('entities.page'),
+        ];
+    }
+}
diff --git a/app/View/ViewBlockInterface.php b/app/View/ViewBlockInterface.php
new file mode 100644
index 00000000000..c524a1d5863
--- /dev/null
+++ b/app/View/ViewBlockInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View;
+
+interface ViewBlockInterface
+{
+    /**
+     * Get the unique ID for this block.
+     */
+    public static function getId(): string;
+
+    /**
+     * Get the label for this block.
+     */
+    public static function getLabel(): string;
+
+    /**
+     * Get the view to render for this block.
+     * This is provided with the existing parent view data to allow the view used to be
+     * dynamic based on the context of its environment.
+     */
+    public function getView(array $viewData): string;
+
+    /**
+     * Specify the data to pass to the view on render.
+     * This is provided with the existing parent view data.
+     * @return array<string, mixed>
+     */
+    public function getViewData(array $viewData): array;
+}
diff --git a/app/View/ViewBlockManager.php b/app/View/ViewBlockManager.php
new file mode 100644
index 00000000000..884c5335f60
--- /dev/null
+++ b/app/View/ViewBlockManager.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace BookStack\View;
+
+use Illuminate\Contracts\Container\BindingResolutionException;
+
+class ViewBlockManager
+{
+    public function __construct(
+        protected ViewBlockPreferences $preferences,
+    ) {
+    }
+
+    /**
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
+     */
+    protected array $blocksByLocationAndPosition = [];
+
+    /**
+     * @var array<string, array<string, class-string<ViewBlockInterface>[]>>
+     */
+    protected array $locationBlockCache = [];
+
+    /**
+     * Register a block type to be displayed at the given location and position.
+     * @param class-string<ViewBlockInterface> $blockClass
+     */
+    public function register(string $location, string $defaultPosition, string $blockClass): void
+    {
+        if (!isset($this->blocksByLocationAndPosition[$location])) {
+            $this->blocksByLocationAndPosition[$location] = [];
+        }
+
+        if (!isset($this->blocksByLocationAndPosition[$location][$defaultPosition])) {
+            $this->blocksByLocationAndPosition[$location][$defaultPosition] = [];
+        }
+
+        // @phpstan-ignore-next-line
+        if (!is_a($blockClass, ViewBlockInterface::class, true)) {
+            throw new \InvalidArgumentException('When registering a view block, the block class must implement ViewBlockInterface');
+        }
+
+        $this->blocksByLocationAndPosition[$location][$defaultPosition][] = $blockClass;
+    }
+
+    /**
+     * Get all blocks registered for a given location and position, considering the
+     * preferences for the current user.
+     * @return ViewBlockInterface[]
+     * @throws BindingResolutionException
+     */
+    public function getInstancesForLocationAndPositionForCurrentUser(string $location, string $position): array
+    {
+        $key = $location;
+        if (isset($this->locationBlockCache[$key])) {
+            $blocks = $this->locationBlockCache[$key][$position] ?? [];
+            return $this->blocksToInstances($blocks);
+        }
+
+        $forLocation = $this->getForLocationForCurrentUser($location);
+        $this->locationBlockCache[$key] = $forLocation;
+
+        $blocks = $forLocation[$position] ?? [];
+        return $this->blocksToInstances($blocks);
+    }
+
+    /**
+     * Create instances of the given block classes.
+     * @param class-string<ViewBlockInterface>[] $blocks
+     * @return ViewBlockInterface[]
+     * @throws BindingResolutionException
+     */
+    protected function blocksToInstances(array $blocks): array
+    {
+        return array_map(fn (string $blockClass) => app()->make($blockClass), $blocks);
+    }
+
+    /**
+     * Get all blocks registered for a given location, as sets of arrays
+     * keyed by position.
+     * @return array<string, class-string<ViewBlockInterface>[]>
+     */
+    protected function getForLocation(string $location): array
+    {
+        $defaults = ViewBlockDefaults::getForLocation($location);
+        $registered = $this->blocksByLocationAndPosition[$location] ?? [];
+        return array_merge_recursive($defaults, $registered);
+    }
+
+    /**
+     * Get all blocks registered for a given location, as sets of arrays
+     * keyed by position, for the current user.
+     * Same as above but with user-specific preferences applied.
+     * @return array<string, list<class-string<ViewBlockInterface>>>
+     * @throws BindingResolutionException
+     */
+    public function getForLocationForCurrentUser(string $location): array
+    {
+        $forLocation = $this->getForLocation($location);
+        $userBlocksByPosition = $this->preferences->getIdByPositionMap($location);
+        if (empty($userBlocksByPosition)) {
+            return $forLocation;
+        }
+
+        $results = [];
+        $blocksById = $this->blocksByPositionToIdMap($forLocation);
+        $idPositionMap = $this->blocksByPositionToIdPositionMap($forLocation);
+        $positions = array_unique([...array_keys($forLocation), 'unused']);
+
+        // Add based on user preferences
+        foreach ($positions as $position) {
+            $userBlockIds = $userBlocksByPosition[$position] ?? [];
+            $results[$position] = [];
+            foreach ($userBlockIds as $blockId) {
+                $block = $blocksById[$blockId] ?? null;
+                if ($block) {
+                    $results[$position][] = $block;
+                    unset($blocksById[$blockId]);
+                }
+            }
+        }
+
+        // Add remaining blocks based on their default locations
+        foreach ($blocksById as $block) {
+            $position = $idPositionMap[$block::getId()] ?? 'unused';
+            $results[$position][] = $block;
+        }
+
+        return $results;
+    }
+
+    /**
+     * Get the names of all locations where blocks are registered.
+     * Returns an array where the keys are location strings, and the
+     * values are translated labels for that location.
+     * @return array<string, string>
+     */
+    public function getNamedLocations(): array
+    {
+        $labels = ViewBlockDefaults::getLocationLabels();
+        $defaults = ViewBlockDefaults::getLocations();
+        $registered = array_keys($this->blocksByLocationAndPosition);
+        $merged = array_unique(array_merge($defaults, $registered));
+
+        $results = [];
+        foreach ($merged as $location) {
+            $results[$location] = $labels[$location] ?? $location;
+        }
+
+        $usingDefaultHome = setting('app-homepage-type') === 'default';
+        $toIgnore = $usingDefaultHome ? 'home-non-default' : 'home-default';
+        unset($results[$toIgnore]);
+
+        return $results;
+    }
+
+
+    /**
+     * Update user preferences for a given location to match the given layout data map.
+     * @param array<string, string[]> $layoutData
+     * @throws BindingResolutionException
+     */
+    public function updatePreferencesFromIdPositionMap(string $location, array $layoutData): void
+    {
+        $this->preferences->storeByIdPositionMap(
+            $location,
+            $layoutData,
+            $this->getForLocation($location),
+        );
+    }
+
+    /**
+     * Clear the local user-specific cache of blocks.
+     * The cache only needs to exist for the current request time since its purpose is to
+     * avoid duplicate loading across views.
+     */
+    public function clearLocalCache(): void
+    {
+        $this->locationBlockCache = [];
+    }
+
+    /**
+     * Convert a blocksByPosition array into a map of block IDs to blocks.
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
+     * @return array<string, class-string<ViewBlockInterface>>
+     */
+    protected function blocksByPositionToIdMap(array $blocksByPosition): array
+    {
+        $map = [];
+        foreach ($blocksByPosition as $position => $blocks) {
+            foreach ($blocks as $block) {
+                $map[$block::getId()] = $block;
+            }
+        }
+        return $map;
+    }
+
+    /**
+     * Convert a blocksByPosition array into a map of block IDs to their positions.
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
+     * @return array<string, string>
+     */
+    protected function blocksByPositionToIdPositionMap(array $blocksByPosition): array
+    {
+        $map = [];
+        foreach ($blocksByPosition as $position => $blocks) {
+            foreach ($blocks as $block) {
+                $map[$block::getId()] = $position;
+            }
+        }
+        return $map;
+    }
+}
diff --git a/app/View/ViewBlockPreferences.php b/app/View/ViewBlockPreferences.php
new file mode 100644
index 00000000000..67e53018831
--- /dev/null
+++ b/app/View/ViewBlockPreferences.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace BookStack\View;
+
+use Illuminate\Contracts\Container\BindingResolutionException;
+
+class ViewBlockPreferences
+{
+    /**
+     * From the request data of the layout editor, validate the request data to ensure the blocks
+     * and locations are valid and then store the layout data.
+     * The request data is expected to be in the format of:
+     * [
+     *     'position-1' => ['block-id-1', 'block-id-2'],
+     *     'position-2' => ['block-id-3'],
+     * ]
+     * @param array<string, string[]> $layoutData
+     * @param array<string, class-string<ViewBlockInterface>[]> $validBlocksByPosition
+     * @throws BindingResolutionException
+     */
+    public function storeByIdPositionMap(
+        string $location,
+        array $layoutData,
+        array $validBlocksByPosition,
+    ): void {
+        $validIds = $this->extractValidBlockIds($validBlocksByPosition);
+        $validPositions = array_keys($validBlocksByPosition);
+        $validPositions[] = 'unused';
+
+        // Ignore updates for invalid/unknown locations
+        if (empty($validBlocksByPosition)) {
+            return;
+        }
+
+        /** @var array<string, string[]> $validatedLayoutData */
+        $validatedLayoutData = [];
+
+        foreach ($layoutData as $position => $blockIds) {
+            // @phpstan-ignore-next-line
+            if (!in_array($position, $validPositions) || !is_array($blockIds)) {
+                continue;
+            }
+
+            $validatedLayoutData[$position] = array_filter($blockIds, function ($id) use ($validIds) {
+                // @phpstan-ignore function.alreadyNarrowedType
+                return is_string($id) && in_array($id, $validIds);
+            });
+        }
+
+        $settingKey = $this->getSettingKey($location);
+        setting()->putForCurrentUser($settingKey, json_encode($validatedLayoutData));
+    }
+
+    /**
+     * Clear the view block preferences for a given location for the current user.
+     */
+    public function clearForLocation(string $location): void
+    {
+        $settingKey = $this->getSettingKey($location);
+        setting()->removeForCurrentUser($settingKey);
+    }
+
+    /**
+     * Get the layout data for a given location.
+     * Provides arrays of block ids keyed by position.
+     * @return array<string, string[]>
+     */
+    public function getIdByPositionMap(string $location): array
+    {
+        $settingKey = $this->getSettingKey($location);
+        $layoutData = setting()->getForCurrentUser($settingKey, '{}');
+        return json_decode($layoutData, true) ?? [];
+    }
+
+    protected function getSettingKey(string $location): string
+    {
+        return 'view-layout#' . $location;
+    }
+
+    /**
+     * @param array<string, class-string<ViewBlockInterface>[]> $blocksByPosition
+     * @return string[]
+     */
+    protected function extractValidBlockIds(array $blocksByPosition): array
+    {
+        $ids = [];
+
+        foreach ($blocksByPosition as $blocks) {
+            foreach ($blocks as $block) {
+                $ids[] = $block::getId();
+            }
+        }
+
+        return array_unique($ids);
+    }
+}
diff --git a/app/View/ViewBlocks/BooksIndexActions.php b/app/View/ViewBlocks/BooksIndexActions.php
new file mode 100644
index 00000000000..47e8c6a7975
--- /dev/null
+++ b/app/View/ViewBlocks/BooksIndexActions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class BooksIndexActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-index-actions';
+    protected static string $view = 'books.parts.index-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'view' => $viewData['view'],
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksIndexNew.php b/app/View/ViewBlocks/BooksIndexNew.php
new file mode 100644
index 00000000000..0006ce4b3ff
--- /dev/null
+++ b/app/View/ViewBlocks/BooksIndexNew.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SimpleViewBlock;
+
+class BooksIndexNew extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-index-new';
+    protected static string $view = 'books.parts.index-sidebar-section-new';
+    protected static string $labelTranslationKey = 'entities.books_new';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $new = $this->queries->visibleForList()
+            ->orderBy('created_at', 'desc')
+            ->take(4)
+            ->get();
+
+        return [
+            'new' => $new,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksIndexPopular.php b/app/View/ViewBlocks/BooksIndexPopular.php
new file mode 100644
index 00000000000..20dacca9633
--- /dev/null
+++ b/app/View/ViewBlocks/BooksIndexPopular.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SimpleViewBlock;
+
+class BooksIndexPopular extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-index-popular';
+    protected static string $view = 'books.parts.index-sidebar-section-popular';
+    protected static string $labelTranslationKey = 'entities.books_popular';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'popular' => $this->queries->popularForList()->take(4)->get(),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksIndexRecents.php b/app/View/ViewBlocks/BooksIndexRecents.php
new file mode 100644
index 00000000000..8ed50631829
--- /dev/null
+++ b/app/View/ViewBlocks/BooksIndexRecents.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\SimpleViewBlock;
+
+class BooksIndexRecents extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-index-recents';
+    protected static string $view = 'books.parts.index-sidebar-section-recents';
+    protected static string $labelTranslationKey = 'entities.recently_viewed';
+
+    public function __construct(
+        protected BookQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $recents = null;
+        if (!user()->isGuest()) {
+            $recents = $this->queries->recentlyViewedForCurrentUser()->take(4)->get();
+        }
+
+        return [
+            'recents' => $recents,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowActions.php b/app/View/ViewBlocks/BooksShowActions.php
new file mode 100644
index 00000000000..a85f123153a
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowActions.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-actions';
+    protected static string $view = 'books.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $book),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowActivity.php b/app/View/ViewBlocks/BooksShowActivity.php
new file mode 100644
index 00000000000..e56b6e585d1
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowActivity.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\Entities\Models\Book;
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowActivity extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-activity';
+    protected static string $view = 'books.parts.show-sidebar-section-activity';
+    protected static string $labelTranslationKey = 'entities.recent_activity';
+
+    public function __construct(
+        protected ActivityQueries $activityQueries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'activity' => $this->activityQueries->entityActivity($book, 20, 1),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowDetails.php b/app/View/ViewBlocks/BooksShowDetails.php
new file mode 100644
index 00000000000..0409566bf5f
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowDetails.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowDetails extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-details';
+    protected static string $view = 'books.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($book);
+
+        return [
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $book),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowSearchForm.php b/app/View/ViewBlocks/BooksShowSearchForm.php
new file mode 100644
index 00000000000..bea92898b38
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowSearchForm.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowSearchForm extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-search-form';
+    protected static string $view = 'entities.search-form';
+    protected static string $labelTranslationKey = 'common.search';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'label' => trans('entities.books_search_this'),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowShelves.php b/app/View/ViewBlocks/BooksShowShelves.php
new file mode 100644
index 00000000000..e91ec84dacc
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowShelves.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowShelves extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-shelves';
+    protected static string $view = 'books.parts.show-sidebar-section-shelves';
+    protected static string $labelTranslationKey = 'entities.shelves';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        $shelves = $book->shelves()->scopes('visible')->get();
+
+        return [
+            'shelves' => $shelves,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/BooksShowTags.php b/app/View/ViewBlocks/BooksShowTags.php
new file mode 100644
index 00000000000..26d13eac2b9
--- /dev/null
+++ b/app/View/ViewBlocks/BooksShowTags.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class BooksShowTags extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_books-show-tags';
+    protected static string $view = 'books.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'book' => $viewData['book'],
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ChaptersShowActions.php b/app/View/ViewBlocks/ChaptersShowActions.php
new file mode 100644
index 00000000000..af9b5f6dadd
--- /dev/null
+++ b/app/View/ViewBlocks/ChaptersShowActions.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Chapter;
+use BookStack\View\SimpleViewBlock;
+
+class ChaptersShowActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_chapters-show-actions';
+    protected static string $view = 'chapters.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        return [
+            'chapter' => $chapter,
+            'watchOptions' => new UserEntityWatchOptions(user(), $chapter),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ChaptersShowBookTree.php b/app/View/ViewBlocks/ChaptersShowBookTree.php
new file mode 100644
index 00000000000..dd8164fb4ce
--- /dev/null
+++ b/app/View/ViewBlocks/ChaptersShowBookTree.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SimpleViewBlock;
+
+class ChaptersShowBookTree extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_chapters-show-book-tree';
+    protected static string $view = 'entities.book-tree';
+    protected static string $labelTranslationKey = 'entities.books_navigation';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'bookTree' => $viewData['bookTree'],
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ChaptersShowDetails.php b/app/View/ViewBlocks/ChaptersShowDetails.php
new file mode 100644
index 00000000000..79750536e69
--- /dev/null
+++ b/app/View/ViewBlocks/ChaptersShowDetails.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SimpleViewBlock;
+
+class ChaptersShowDetails extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_chapters-show-details';
+    protected static string $view = 'chapters.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($chapter);
+
+        return [
+            'chapter' => $chapter,
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $chapter),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ChaptersShowSearchForm.php b/app/View/ViewBlocks/ChaptersShowSearchForm.php
new file mode 100644
index 00000000000..f7fd87d5d5d
--- /dev/null
+++ b/app/View/ViewBlocks/ChaptersShowSearchForm.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class ChaptersShowSearchForm extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_chapters-show-search-form';
+    protected static string $view = 'entities.search-form';
+    protected static string $labelTranslationKey = 'common.search';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'label' => trans('entities.chapters_search_this'),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ChaptersShowTags.php b/app/View/ViewBlocks/ChaptersShowTags.php
new file mode 100644
index 00000000000..f79e16d7be5
--- /dev/null
+++ b/app/View/ViewBlocks/ChaptersShowTags.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Chapter;
+use BookStack\View\SimpleViewBlock;
+
+class ChaptersShowTags extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_chapters-show-tags';
+    protected static string $view = 'chapters.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Chapter $chapter */
+        $chapter = $viewData['chapter'];
+
+        return [
+            'chapter' => $chapter,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeActions.php b/app/View/ViewBlocks/HomeActions.php
new file mode 100644
index 00000000000..02e20a56a4f
--- /dev/null
+++ b/app/View/ViewBlocks/HomeActions.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class HomeActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_home-actions';
+    protected static string $view = 'home.parts.configured-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'view' => $viewData['view'] ?? '',
+            'homeView' => $viewData['homeView'] ?? 'default',
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentActivity.php b/app/View/ViewBlocks/HomeRecentActivity.php
new file mode 100644
index 00000000000..3877a6b515f
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentActivity.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\View\BaseViewBlock;
+
+class HomeRecentActivity extends BaseViewBlock
+{
+    public function __construct(
+        protected ActivityQueries $activityQueries
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'builtin_home-recent-activity';
+    }
+
+    public static function getLabel(): string
+    {
+        return trans('entities.recent_activity');
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recent-activity';
+        }
+
+        return 'home.parts.configured-section-recent-activity';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $activity = $this->activityQueries->latest(10);
+        return [
+            'activity' => $activity,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentDrafts.php b/app/View/ViewBlocks/HomeRecentDrafts.php
new file mode 100644
index 00000000000..15dcf074717
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentDrafts.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\View\BaseViewBlock;
+
+class HomeRecentDrafts extends BaseViewBlock
+{
+    public function __construct(
+        protected PageQueries $pageQueries
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'builtin_home-recent-drafts';
+    }
+
+    public static function getLabel(): string
+    {
+        return trans('entities.my_recent_drafts');
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recent-drafts';
+        }
+
+        return 'home.parts.configured-section-recent-drafts';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $draftPages = [];
+
+        if (!user()->isGuest()) {
+            $draftPages = $this->pageQueries->currentUserDraftsForList()
+                ->orderBy('updated_at', 'desc')
+                ->with('book')
+                ->take(6)
+                ->get();
+        }
+
+        return [
+            'draftPages' => $draftPages,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
new file mode 100644
index 00000000000..953a96c6aa8
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentlyUpdatedPages.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\PageQueries;
+use BookStack\View\BaseViewBlock;
+
+class HomeRecentlyUpdatedPages extends BaseViewBlock
+{
+    public function __construct(
+        protected PageQueries $queries
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'builtin_home-recently-updated-pages';
+    }
+
+    public static function getLabel(): string
+    {
+        return trans('entities.recently_updated_pages');
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recently-updated-pages';
+        }
+
+        return 'home.parts.configured-section-recently-updated-pages';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $recentlyUpdatedPages = $this->queries->visibleForList()
+            ->where('draft', false)
+            ->orderBy('updated_at', 'desc')
+            ->take(8)
+            ->get();
+
+        return [
+            'recentlyUpdatedPages' => $recentlyUpdatedPages,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
new file mode 100644
index 00000000000..3a75ffd8a99
--- /dev/null
+++ b/app/View/ViewBlocks/HomeRecentlyViewedOrRecentBooks.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\EntityQueries;
+use BookStack\Entities\Queries\QueryRecentlyViewed;
+use BookStack\View\BaseViewBlock;
+
+class HomeRecentlyViewedOrRecentBooks extends BaseViewBlock
+{
+    public function __construct(
+        protected EntityQueries $queries,
+        protected QueryRecentlyViewed $recentlyViewed,
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'builtin_home-recently-viewed-or-recent-books';
+    }
+
+    public static function getLabel(): string
+    {
+        $key = user()->isGuest() ? 'books_recent' : 'my_recently_viewed';
+        return trans("entities.{$key}");
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-recently-viewed-or-recent-books';
+        }
+
+        return 'home.parts.configured-section-recently-viewed-or-recent-books';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        if (user()->isGuest()) {
+            $recents = $this->queries->books->visibleForList()
+                ->orderBy('created_at', 'desc')
+                ->take(10)
+                ->get();
+        } else {
+            $recents = $this->recentlyViewed->run(10, 1);
+        }
+
+        return [
+            'recents' => $recents
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/HomeTopFavourites.php b/app/View/ViewBlocks/HomeTopFavourites.php
new file mode 100644
index 00000000000..2b8bb3aca6b
--- /dev/null
+++ b/app/View/ViewBlocks/HomeTopFavourites.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\QueryTopFavourites;
+use BookStack\View\BaseViewBlock;
+
+class HomeTopFavourites extends BaseViewBlock
+{
+    public function __construct(
+        protected QueryTopFavourites $topFavourites
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'builtin_home-top-favourites';
+    }
+
+    public static function getLabel(): string
+    {
+        return trans('entities.my_most_viewed_favourites');
+    }
+
+    public function getView(array $viewData): string
+    {
+        if ($viewData['homeView'] === 'default') {
+            return 'home.parts.default-card-top-favourites';
+        }
+
+        return 'home.parts.configured-section-top-favourites';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $favourites = $this->topFavourites->run(6);
+        return [
+            'favourites' => $favourites
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowActions.php b/app/View/ViewBlocks/PagesShowActions.php
new file mode 100644
index 00000000000..25e99ced8c9
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowActions.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Page;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-actions';
+    protected static string $view = 'pages.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+            'watchOptions' => new UserEntityWatchOptions(user(), $page),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowAttachments.php b/app/View/ViewBlocks/PagesShowAttachments.php
new file mode 100644
index 00000000000..c61b8b8fbee
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Page;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowAttachments extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-attachments';
+    protected static string $view = 'pages.parts.show-sidebar-section-attachments';
+    protected static string $labelTranslationKey = 'entities.pages_attachments';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowBookTree.php b/app/View/ViewBlocks/PagesShowBookTree.php
new file mode 100644
index 00000000000..22bed36d09e
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowBookTree.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Book;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowBookTree extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-book-tree';
+    protected static string $view = 'entities.book-tree';
+    protected static string $labelTranslationKey = 'entities.books_navigation';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+
+        return [
+            'book' => $book,
+            'bookTree' => $viewData['bookTree'],
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowDetails.php b/app/View/ViewBlocks/PagesShowDetails.php
new file mode 100644
index 00000000000..d2d00e71d93
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowDetails.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\Tools\UserEntityWatchOptions;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowDetails extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-details';
+    protected static string $view = 'pages.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Book $book */
+        $book = $viewData['book'];
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($page);
+
+        return [
+            'page' => $page,
+            'book' => $book,
+            'watchOptions' => new UserEntityWatchOptions(user(), $page),
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowPageNav.php b/app/View/ViewBlocks/PagesShowPageNav.php
new file mode 100644
index 00000000000..f76e8e521f1
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowPageNav.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowPageNav extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-page-nav';
+    protected static string $view = 'pages.parts.show-sidebar-section-page-nav';
+    protected static string $labelTranslationKey = 'entities.pages_navigation';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        $pageContent = new PageContent($page);
+        $pageNav = $pageContent->getNavigation($page->html);
+
+        return [
+            'pageNav' => $pageNav,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/PagesShowTags.php b/app/View/ViewBlocks/PagesShowTags.php
new file mode 100644
index 00000000000..f6a9f567ff4
--- /dev/null
+++ b/app/View/ViewBlocks/PagesShowTags.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Page;
+use BookStack\View\SimpleViewBlock;
+
+class PagesShowTags extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_pages-show-tags';
+    protected static string $view = 'pages.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Page $page */
+        $page = $viewData['page'];
+
+        return [
+            'page' => $page,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesIndexActions.php b/app/View/ViewBlocks/ShelvesIndexActions.php
new file mode 100644
index 00000000000..d816f44cb9b
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesIndexActions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesIndexActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-index-actions';
+    protected static string $view = 'shelves.parts.index-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'view' => $viewData['view'],
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesIndexNew.php b/app/View/ViewBlocks/ShelvesIndexNew.php
new file mode 100644
index 00000000000..f3dd3a6109c
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesIndexNew.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesIndexNew extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-index-new';
+    protected static string $view = 'shelves.parts.index-sidebar-section-new';
+    protected static string $labelTranslationKey = 'entities.shelves_new';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $new = $this->queries->visibleForList()
+            ->orderBy('created_at', 'desc')
+            ->take(4)
+            ->get();
+
+        return [
+            'new' => $new,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesIndexPopular.php b/app/View/ViewBlocks/ShelvesIndexPopular.php
new file mode 100644
index 00000000000..071ec7ddb76
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesIndexPopular.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesIndexPopular extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-index-popular';
+    protected static string $view = 'shelves.parts.index-sidebar-section-popular';
+    protected static string $labelTranslationKey = 'entities.shelves_popular';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'popular' => $this->queries->popularForList()->take(4)->get(),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesIndexRecents.php b/app/View/ViewBlocks/ShelvesIndexRecents.php
new file mode 100644
index 00000000000..76ed3b91f61
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesIndexRecents.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Queries\BookshelfQueries;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesIndexRecents extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-index-recents';
+    protected static string $view = 'shelves.parts.index-sidebar-section-recents';
+    protected static string $labelTranslationKey = 'entities.recently_viewed';
+
+    public function __construct(
+        protected BookshelfQueries $queries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $recents = null;
+        if (!user()->isGuest()) {
+            $recents = $this->queries->recentlyViewedForCurrentUser()->take(4)->get();
+        }
+
+        return [
+            'recents' => $recents,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesShowActions.php b/app/View/ViewBlocks/ShelvesShowActions.php
new file mode 100644
index 00000000000..981ed295782
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesShowActions.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesShowActions extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-show-actions';
+    protected static string $view = 'shelves.parts.show-sidebar-section-actions';
+    protected static string $labelTranslationKey = 'common.actions';
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+
+        return [
+            'shelf' => $shelf,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesShowActivity.php b/app/View/ViewBlocks/ShelvesShowActivity.php
new file mode 100644
index 00000000000..a5146058783
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesShowActivity.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Activity\ActivityQueries;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesShowActivity extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-show-activity';
+    protected static string $view = 'shelves.parts.show-sidebar-section-activity';
+    protected static string $labelTranslationKey = 'entities.recent_activity';
+
+    public function __construct(
+        protected ActivityQueries $activityQueries,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+
+        return [
+            'activity' => $this->activityQueries->entityActivity($shelf, 20, 1),
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesShowDetails.php b/app/View/ViewBlocks/ShelvesShowDetails.php
new file mode 100644
index 00000000000..4d61ac77004
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesShowDetails.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\References\ReferenceFetcher;
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesShowDetails extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-show-details';
+    protected static string $view = 'shelves.parts.show-sidebar-section-details';
+    protected static string $labelTranslationKey = 'common.details';
+
+    public function __construct(
+        protected ReferenceFetcher $referenceFetcher,
+    ) {
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        /** @var Bookshelf $shelf */
+        $shelf = $viewData['shelf'];
+        $referenceCount = $this->referenceFetcher->getReferenceCountToEntity($shelf);
+
+        return [
+            'shelf' => $shelf,
+            'referenceCount' => $referenceCount,
+        ];
+    }
+}
diff --git a/app/View/ViewBlocks/ShelvesShowTags.php b/app/View/ViewBlocks/ShelvesShowTags.php
new file mode 100644
index 00000000000..df6f1025ae5
--- /dev/null
+++ b/app/View/ViewBlocks/ShelvesShowTags.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace BookStack\View\ViewBlocks;
+
+use BookStack\View\SimpleViewBlock;
+
+class ShelvesShowTags extends SimpleViewBlock
+{
+    protected static string $id = 'builtin_shelves-show-tags';
+    protected static string $view = 'shelves.parts.show-sidebar-section-tags';
+    protected static string $labelTranslationKey = 'entities.tags';
+
+    public function getViewData(array $viewData): array
+    {
+        return [
+            'shelf' => $viewData['shelf'],
+        ];
+    }
+}
diff --git a/bookstack-system-cli b/bookstack-system-cli
index c55c5a8a784..1a518e644e4 100755
Binary files a/bookstack-system-cli and b/bookstack-system-cli differ
diff --git a/composer.json b/composer.json
index 2285a22cb18..88f32a0bbd6 100644
--- a/composer.json
+++ b/composer.json
@@ -8,37 +8,38 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^8.2.0",
+        "php": "^8.3.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-zip": "*",
         "bacon/bacon-qr-code": "^3.0",
         "dompdf/dompdf": "^3.1",
+        "ezyang/htmlpurifier": "^4.19",
         "guzzlehttp/guzzle": "^7.4",
         "intervention/image": "^3.5",
         "knplabs/knp-snappy": "^1.5",
-        "laravel/framework": "^v12.26.4",
+        "laravel/framework": "^v13.35.0",
         "laravel/socialite": "^5.10",
-        "laravel/tinker": "^2.8",
+        "laravel/tinker": "^v3.0.2",
         "league/commonmark": "^2.3",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/html-to-markdown": "^5.0.0",
         "league/oauth2-client": "^2.6",
-        "onelogin/php-saml": "^4.0",
+        "onelogin/php-saml": "^4.3.1",
         "phpseclib/phpseclib": "^3.0",
-        "pragmarx/google2fa": "^8.0",
+        "pragmarx/google2fa": "^9.0",
         "predis/predis": "^3.2",
         "socialiteproviders/discord": "^4.1",
         "socialiteproviders/gitlab": "^4.1",
         "socialiteproviders/microsoft-azure": "^5.1",
         "socialiteproviders/okta": "^4.2",
         "socialiteproviders/twitch": "^5.3",
-        "ssddanbrown/htmldiff": "^2.0.0"
+        "ssddanbrown/htmldiff": "^2.0.0",
+        "xemlock/htmlpurifier-html5": "^0.1.12"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
@@ -46,10 +47,13 @@
         "mockery/mockery": "^1.5",
         "nunomaduro/collision": "^8.6",
         "larastan/larastan": "^v3.0",
-        "phpunit/phpunit": "^11.5",
-        "squizlabs/php_codesniffer": "^3.7",
+        "phpunit/phpunit": "^12.5.38",
+        "squizlabs/php_codesniffer": "^4.0.1",
         "ssddanbrown/asserthtml": "^3.1"
     },
+    "suggest": {
+        "ext-ldap": "*"
+    },
     "autoload": {
         "psr-4": {
             "BookStack\\": "app/",
@@ -93,6 +97,7 @@
             "@php artisan view:clear"
         ],
         "refresh-test-database": [
+            "@putenv APP_TIMEZONE=UTC",
             "@php artisan migrate:refresh --database=mysql_testing",
             "@php artisan db:seed --class=DummyContentSeeder --database=mysql_testing"
         ]
@@ -102,7 +107,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
-            "php": "8.2.0"
+            "php": "8.3.0"
         }
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index e6306263362..788c09efbcc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "506bcb9f80a5fd736b79c8e138efafa0",
+    "content-hash": "39e152ca06e4dcd2a46ad97531bc7913",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.356.32",
+            "version": "3.400.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "c564fb87e180da5ae45185a4526bb05a69998d05"
+                "reference": "c0cf2c322bc1a344aaf39250da8856563532f82b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c564fb87e180da5ae45185a4526bb05a69998d05",
-                "reference": "c564fb87e180da5ae45185a4526bb05a69998d05",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c0cf2c322bc1a344aaf39250da8856563532f82b",
+                "reference": "c0cf2c322bc1a344aaf39250da8856563532f82b",
                 "shasum": ""
             },
             "require": {
@@ -79,29 +79,28 @@
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^7.4.5",
-                "guzzlehttp/promises": "^2.0",
-                "guzzlehttp/psr7": "^2.4.5",
-                "mtdowling/jmespath.php": "^2.8.0",
+                "guzzlehttp/guzzle": "^7.8.2 || ^8.0",
+                "guzzlehttp/promises": "^2.0.3 || ^3.0",
+                "guzzlehttp/psr7": "^2.6.3 || ^3.0",
+                "mtdowling/jmespath.php": "^2.9.1",
                 "php": ">=8.1",
-                "psr/http-message": "^1.0 || ^2.0"
+                "psr/http-message": "^1.0 || ^2.0",
+                "symfony/filesystem": "^v5.4.45 || ^v6.4.3 || ^v7.1.0 || ^v8.0.0"
             },
             "require-dev": {
                 "andrewsville/php-token-reflection": "^1.4",
                 "aws/aws-php-sns-message-validator": "~1.0",
                 "behat/behat": "~3.0",
                 "composer/composer": "^2.7.8",
-                "dms/phpunit-arraysubset-asserts": "^0.4.0",
+                "dms/phpunit-arraysubset-asserts": "^v0.5.0",
                 "doctrine/cache": "~1.4",
                 "ext-dom": "*",
                 "ext-openssl": "*",
-                "ext-pcntl": "*",
                 "ext-sockets": "*",
-                "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^10.0",
                 "psr/cache": "^2.0 || ^3.0",
                 "psr/simple-cache": "^2.0 || ^3.0",
                 "sebastian/comparator": "^1.2.3 || ^4.0 || ^5.0",
-                "symfony/filesystem": "^v6.4.0 || ^v7.1.0",
                 "yoast/phpunit-polyfills": "^2.0"
             },
             "suggest": {
@@ -109,6 +108,7 @@
                 "doctrine/cache": "To use the DoctrineCacheAdapter",
                 "ext-curl": "To send requests using cURL",
                 "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
+                "ext-pcntl": "To use client-side monitoring",
                 "ext-sockets": "To use client-side monitoring"
             },
             "type": "library",
@@ -135,11 +135,11 @@
             "authors": [
                 {
                     "name": "Amazon Web Services",
-                    "homepage": "http://aws.amazon.com"
+                    "homepage": "https://aws.amazon.com"
                 }
             ],
             "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
-            "homepage": "http://aws.amazon.com/sdkforphp",
+            "homepage": "https://aws.amazon.com/sdk-for-php",
             "keywords": [
                 "amazon",
                 "aws",
@@ -153,22 +153,22 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.356.32"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.400.1"
             },
-            "time": "2025-10-03T18:12:05+00:00"
+            "time": "2026-10-09T18:11:15+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
-            "version": "v3.0.1",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f"
+                "reference": "4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f",
-                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2",
+                "reference": "4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2",
                 "shasum": ""
             },
             "require": {
@@ -178,8 +178,9 @@
             },
             "require-dev": {
                 "phly/keep-a-changelog": "^2.12",
-                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "phpunit/phpunit": "^10.5.11 || ^11.0.4",
                 "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "spatie/pixelmatch-php": "^1.2.0",
                 "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
@@ -207,30 +208,30 @@
             "homepage": "https://github.com/Bacon/BaconQrCode",
             "support": {
                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.1.1"
             },
-            "time": "2024-10-01T13:55:55+00:00"
+            "time": "2026-04-05T21:06:35+00:00"
         },
         {
             "name": "brick/math",
-            "version": "0.14.0",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2"
+                "reference": "2effe05d2177c451b86c6a073196a4034c02f211"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",
-                "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",
+                "url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211",
+                "reference": "2effe05d2177c451b86c6a073196a4034c02f211",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.2"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "^2.2",
-                "phpstan/phpstan": "2.1.22",
+                "phpstan/phpstan": "2.2.13",
+                "phpstan/phpstan-phpunit": "2.0.18",
                 "phpunit/phpunit": "^11.5"
             },
             "type": "library",
@@ -261,7 +262,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.14.0"
+                "source": "https://github.com/brick/math/tree/1.0.0"
             },
             "funding": [
                 {
@@ -269,20 +270,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-29T12:40:03+00:00"
+            "time": "2026-09-12T10:28:18+00:00"
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
                 "shasum": ""
             },
             "require": {
@@ -297,6 +298,11 @@
                 "phpunit/phpunit": "^10.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
@@ -322,7 +328,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.1"
             },
             "funding": [
                 {
@@ -338,7 +344,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-09T16:56:22+00:00"
+            "time": "2026-09-06T14:11:38+00:00"
         },
         {
             "name": "dasprid/enum",
@@ -557,27 +563,25 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "3.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
+                "reference": "71d305eaa6480d3d3460c7d053d1da7749fa9cca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
-                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/71d305eaa6480d3d3460c7d053d1da7749fa9cca",
+                "reference": "71d305eaa6480d3d3460c7d053d1da7749fa9cca",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^12",
-                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^10.5",
-                "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^5.21"
+                "doctrine/coding-standard": "^14",
+                "phpstan/phpstan": "^2",
+                "phpunit/phpunit": "^10.5.58 || ^12.5.4"
             },
             "type": "library",
             "autoload": {
@@ -614,7 +618,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
+                "source": "https://github.com/doctrine/lexer/tree/3.0.3"
             },
             "funding": [
                 {
@@ -630,20 +634,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-05T11:56:58+00:00"
+            "time": "2026-10-01T06:59:29+00:00"
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v3.1.2",
+            "version": "v3.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "b3493e35d31a5e76ec24c3b64a29b0034b2f32a6"
+                "reference": "6d4b4eb8500f7a786da8868ba463a71b725a4005"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/b3493e35d31a5e76ec24c3b64a29b0034b2f32a6",
-                "reference": "b3493e35d31a5e76ec24c3b64a29b0034b2f32a6",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/6d4b4eb8500f7a786da8868ba463a71b725a4005",
+                "reference": "6d4b4eb8500f7a786da8868ba463a71b725a4005",
                 "shasum": ""
             },
             "require": {
@@ -692,22 +696,22 @@
             "homepage": "https://github.com/dompdf/dompdf",
             "support": {
                 "issues": "https://github.com/dompdf/dompdf/issues",
-                "source": "https://github.com/dompdf/dompdf/tree/v3.1.2"
+                "source": "https://github.com/dompdf/dompdf/tree/v3.1.6"
             },
-            "time": "2025-09-23T03:06:41+00:00"
+            "time": "2026-07-20T12:29:38+00:00"
         },
         {
             "name": "dompdf/php-font-lib",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d"
+                "reference": "a6e9a688a2a80016ac080b97be73d3e10c444c9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d",
-                "reference": "6137b7d4232b7f16c882c75e4ca3991dbcf6fe2d",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a6e9a688a2a80016ac080b97be73d3e10c444c9a",
+                "reference": "a6e9a688a2a80016ac080b97be73d3e10c444c9a",
                 "shasum": ""
             },
             "require": {
@@ -715,7 +719,7 @@
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^3 || ^4 || ^5 || ^6"
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11 || ^12"
             },
             "type": "library",
             "autoload": {
@@ -737,31 +741,31 @@
             "homepage": "https://github.com/dompdf/php-font-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.1"
+                "source": "https://github.com/dompdf/php-font-lib/tree/1.0.2"
             },
-            "time": "2024-12-02T14:37:59+00:00"
+            "time": "2026-01-20T14:10:26+00:00"
         },
         {
             "name": "dompdf/php-svg-lib",
-            "version": "1.0.0",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "eb045e518185298eb6ff8d80d0d0c6b17aecd9af"
+                "reference": "8259ffb930817e72b1ff1caef5d226501f3dfeb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/eb045e518185298eb6ff8d80d0d0c6b17aecd9af",
-                "reference": "eb045e518185298eb6ff8d80d0d0c6b17aecd9af",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8259ffb930817e72b1ff1caef5d226501f3dfeb1",
+                "reference": "8259ffb930817e72b1ff1caef5d226501f3dfeb1",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^7.1 || ^8.0",
-                "sabberworm/php-css-parser": "^8.4"
+                "sabberworm/php-css-parser": "^8.4 || ^9.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
+                "phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11"
             },
             "type": "library",
             "autoload": {
@@ -783,35 +787,34 @@
             "homepage": "https://github.com/dompdf/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/1.0.0"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/1.0.2"
             },
-            "time": "2024-04-29T13:26:35+00:00"
+            "time": "2026-01-02T16:01:13+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.4.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "8c784d071debd117328803d86b2097615b457500"
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
-                "reference": "8c784d071debd117328803d86b2097615b457500",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013",
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0",
-                "webmozart/assert": "^1.0"
+                "php": "^8.2|^8.3|^8.4|^8.5"
             },
             "replace": {
                 "mtdowling/cron-expression": "^1.0"
             },
             "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.32|^2.1.31",
+                "phpunit/phpunit": "^8.5.48|^9.0"
             },
             "type": "library",
             "extra": {
@@ -842,7 +845,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -850,7 +853,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-09T13:47:03+00:00"
+            "time": "2025-10-31T18:51:33+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -919,26 +922,89 @@
             ],
             "time": "2025-03-06T22:45:56+00:00"
         },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.19.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "5e0539132d934f936fbae2c88b55d58f9438623f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/5e0539132d934f936fbae2c88b55d58f9438623f",
+                "reference": "5e0539132d934f936fbae2c88b55d58f9438623f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
+            },
+            "require-dev": {
+                "cerdic/css-tidy": "^1.7 || ^2.0",
+                "simpletest/simpletest": "dev-master"
+            },
+            "suggest": {
+                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                "ext-tidy": "Used for pretty-printing HTML"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ],
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "exclude-from-classmap": [
+                    "/library/HTMLPurifier/Language/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "support": {
+                "issues": "https://github.com/ezyang/htmlpurifier/issues",
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.19.1"
+            },
+            "time": "2026-09-15T15:42:51+00:00"
+        },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.11.1",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
+                "url": "https://github.com/googleapis/php-jwt.git",
+                "reference": "0501f5729b9e2448516674aff07c7d1727869b8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
-                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "url": "https://api.github.com/repos/googleapis/php-jwt/zipball/0501f5729b9e2448516674aff07c7d1727869b8e",
+                "reference": "0501f5729b9e2448516674aff07c7d1727869b8e",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^7.4",
-                "phpspec/prophecy-phpunit": "^2.0",
+                "guzzlehttp/guzzle": "^7.4||^8.0",
+                "phpfastcache/phpfastcache": "^9.2",
+                "phpseclib/phpseclib": "~3.0",
+                "phpspec/prophecy-phpunit": "^2.2",
                 "phpunit/phpunit": "^9.5",
                 "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
@@ -946,9 +1012,18 @@
             },
             "suggest": {
                 "ext-sodium": "Support EdDSA (Ed25519) signatures",
-                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present",
+                "phpseclib/phpseclib": "Support PS256 (RSASSA-PSS) signatures"
             },
             "type": "library",
+            "extra": {
+                "component": {
+                    "id": "jwt",
+                    "path": "Jwt",
+                    "entry": "README.md",
+                    "target": "googleapis/php-jwt.git"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Firebase\\JWT\\": "src"
@@ -971,44 +1046,44 @@
                 }
             ],
             "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-            "homepage": "https://github.com/firebase/php-jwt",
+            "homepage": "https://github.com/googleapis/php-jwt",
             "keywords": [
                 "jwt",
                 "php"
             ],
             "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
+                "issues": "https://github.com/googleapis/php-jwt/issues",
+                "source": "https://github.com/googleapis/php-jwt/tree/v7.2.1"
             },
-            "time": "2025-04-09T20:32:01+00:00"
+            "time": "2026-09-28T17:51:46+00:00"
         },
         {
             "name": "fruitcake/php-cors",
-            "version": "v1.3.0",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fruitcake/php-cors.git",
-                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
+                "reference": "38aaa6c3fd4c157ffe2a4d10aa8b9b16ba8de379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
-                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
+                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/38aaa6c3fd4c157ffe2a4d10aa8b9b16ba8de379",
+                "reference": "38aaa6c3fd4c157ffe2a4d10aa8b9b16ba8de379",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4|^8.0",
-                "symfony/http-foundation": "^4.4|^5.4|^6|^7"
+                "php": "^8.1",
+                "symfony/http-foundation": "^5.4|^6.4|^7.3|^8"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan": "^2",
                 "phpunit/phpunit": "^9",
-                "squizlabs/php_codesniffer": "^3.5"
+                "squizlabs/php_codesniffer": "^4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -1039,7 +1114,7 @@
             ],
             "support": {
                 "issues": "https://github.com/fruitcake/php-cors/issues",
-                "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
+                "source": "https://github.com/fruitcake/php-cors/tree/v1.4.0"
             },
             "funding": [
                 {
@@ -1051,28 +1126,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-12T05:21:21+00:00"
+            "time": "2025-12-03T09:33:47+00:00"
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.3",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
-                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/adccca3324eece92ca35463648c12b9e6293c05b",
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.3"
+                "phpoption/phpoption": "^1.10"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34 || ^10.5.63 || ^11.5.55 || ^12.5.14"
             },
             "type": "library",
             "autoload": {
@@ -1101,7 +1176,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.2.0"
             },
             "funding": [
                 {
@@ -1113,29 +1188,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-20T21:45:45+00:00"
+            "time": "2026-08-24T09:06:52+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.10.0",
+            "version": "7.15.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
-                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^2.3",
-                "guzzlehttp/psr7": "^2.8",
+                "guzzlehttp/promises": "^2.5.3",
+                "guzzlehttp/psr7": "^2.13.1",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
-                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+                "symfony/deprecation-contracts": "^2.5 || ^3.0",
+                "symfony/polyfill-php80": "^1.25"
             },
             "provide": {
                 "psr/http-client-implementation": "1.0"
@@ -1143,9 +1219,10 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "guzzle/client-integration-tests": "3.0.2",
+                "guzzle/client-integration-tests": "3.0.3",
+                "guzzlehttp/test-server": "^0.7",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1223,7 +1300,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.15.5"
             },
             "funding": [
                 {
@@ -1239,28 +1316,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-23T22:36:01+00:00"
+            "time": "2026-08-24T09:21:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.3.0",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/cde49999552d185d64715fe9c1f77a2aadd2f9f1",
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5 || ^8.0"
+                "php": "^7.2.5 || ^8.0",
+                "symfony/deprecation-contracts": "^2.5 || ^3.0"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "type": "library",
             "extra": {
@@ -1306,7 +1384,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+                "source": "https://github.com/guzzle/promises/tree/2.5.3"
             },
             "funding": [
                 {
@@ -1322,27 +1400,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T14:34:08+00:00"
+            "time": "2026-08-24T09:11:28+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.8.0",
+            "version": "2.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "21dc724a0583619cd1652f673303492272778051"
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
-                "reference": "21dc724a0583619cd1652f673303492272778051",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/95e7828100de18b4e269fb1703be530082d5166d",
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.1 || ^2.0",
-                "ralouphie/getallheaders": "^3.0"
+                "ralouphie/getallheaders": "^3.0",
+                "symfony/deprecation-contracts": "^2.5 || ^3.0",
+                "symfony/polyfill-php80": "^1.25"
             },
             "provide": {
                 "psr/http-factory-implementation": "1.0",
@@ -1350,8 +1430,9 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "0.9.0",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "http-interop/http-factory-tests": "1.1.0",
+                "jshttp/mime-db": "1.54.0.1",
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1422,7 +1503,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.13.1"
             },
             "funding": [
                 {
@@ -1438,30 +1519,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-23T21:21:41+00:00"
+            "time": "2026-08-24T09:13:11+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.5",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1"
+                "reference": "7a466ad606491eb6528c717482f7cca77f1851f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/4f4bbd4e7172148801e76e3decc1e559bdee34e1",
-                "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/7a466ad606491eb6528c717482f7cca77f1851f3",
+                "reference": "7a466ad606491eb6528c717482f7cca77f1851f3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5 || ^8.0",
-                "symfony/polyfill-php80": "^1.24"
+                "php": "^7.4 || ^8.0",
+                "symfony/polyfill-php80": "^1.25"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25",
-                "uri-template/tests": "1.0.0"
+                "phpunit/phpunit": "^9.6.34",
+                "uri-template/tests": "1.0.2"
             },
             "type": "library",
             "extra": {
@@ -1508,7 +1589,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.5"
+                "source": "https://github.com/guzzle/uri-template/tree/v2.0.1"
             },
             "funding": [
                 {
@@ -1524,20 +1605,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T14:27:06+00:00"
+            "time": "2026-08-24T17:13:02+00:00"
         },
         {
             "name": "intervention/gif",
-            "version": "4.2.2",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/gif.git",
-                "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a"
+                "reference": "c3598a16ebe7690cd55640c44144a9df383ea73c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/gif/zipball/5999eac6a39aa760fb803bc809e8909ee67b451a",
-                "reference": "5999eac6a39aa760fb803bc809e8909ee67b451a",
+                "url": "https://api.github.com/repos/Intervention/gif/zipball/c3598a16ebe7690cd55640c44144a9df383ea73c",
+                "reference": "c3598a16ebe7690cd55640c44144a9df383ea73c",
                 "shasum": ""
             },
             "require": {
@@ -1576,7 +1657,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/gif/issues",
-                "source": "https://github.com/Intervention/gif/tree/4.2.2"
+                "source": "https://github.com/Intervention/gif/tree/4.2.4"
             },
             "funding": [
                 {
@@ -1592,20 +1673,20 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-03-29T07:46:21+00:00"
+            "time": "2026-01-04T09:27:23+00:00"
         },
         {
             "name": "intervention/image",
-            "version": "3.11.4",
+            "version": "3.11.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "8c49eb21a6d2572532d1bc425964264f3e496846"
+                "reference": "af6e5cfa403233cec4c4347e475addcbdc5b8f07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/8c49eb21a6d2572532d1bc425964264f3e496846",
-                "reference": "8c49eb21a6d2572532d1bc425964264f3e496846",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/af6e5cfa403233cec4c4347e475addcbdc5b8f07",
+                "reference": "af6e5cfa403233cec4c4347e475addcbdc5b8f07",
                 "shasum": ""
             },
             "require": {
@@ -1618,7 +1699,7 @@
                 "phpstan/phpstan": "^2.1",
                 "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
                 "slevomat/coding-standard": "~8.0",
-                "squizlabs/php_codesniffer": "^3.8"
+                "squizlabs/php_codesniffer": "^4"
             },
             "suggest": {
                 "ext-exif": "Recommended to be able to read EXIF data properly."
@@ -1637,11 +1718,11 @@
                 {
                     "name": "Oliver Vogel",
                     "email": "oliver@intervention.io",
-                    "homepage": "https://intervention.io/"
+                    "homepage": "https://intervention.io"
                 }
             ],
-            "description": "PHP image manipulation",
-            "homepage": "https://image.intervention.io/",
+            "description": "PHP Image Processing",
+            "homepage": "https://image.intervention.io",
             "keywords": [
                 "gd",
                 "image",
@@ -1652,7 +1733,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/3.11.4"
+                "source": "https://github.com/Intervention/image/tree/3.11.10"
             },
             "funding": [
                 {
@@ -1668,33 +1749,33 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2025-07-30T13:13:19+00:00"
+            "time": "2026-10-05T12:21:16+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
-            "version": "v1.5.1",
+            "version": "v1.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
-                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7"
+                "reference": "f749a7d2e0f1260f4a0f96925323e34ede898f1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
-                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/f749a7d2e0f1260f4a0f96925323e34ede898f1f",
+                "reference": "f749a7d2e0f1260f4a0f96925323e34ede898f1f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/log": "^2.0||^3.0",
-                "symfony/process": "^5.0||^6.0||^7.0"
+                "symfony/process": "^5.0||^6.0||^7.0||^8.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "pedrotroller/php-cs-custom-fixer": "^2.19",
-                "phpstan/phpstan": "^1.0.0",
-                "phpstan/phpstan-phpunit": "^1.0.0",
-                "phpunit/phpunit": "^8.5"
+                "phpstan/phpstan": "^2.1.39",
+                "phpstan/phpstan-phpunit": "^2.0.15",
+                "phpunit/phpunit": "^9.6.29"
             },
             "type": "library",
             "extra": {
@@ -1733,30 +1814,30 @@
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/snappy/issues",
-                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.1"
+                "source": "https://github.com/KnpLabs/snappy/tree/v1.7.3"
             },
-            "time": "2025-01-06T16:53:26+00:00"
+            "time": "2026-07-29T11:03:07+00:00"
         },
         {
             "name": "laravel/framework",
-            "version": "v12.32.5",
+            "version": "v13.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a"
+                "reference": "a413a9da94884e5e9d58f4e6612884f712827804"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
-                "reference": "77b2740391cd2a825ba59d6fada45e9b8b9bcc5a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a413a9da94884e5e9d58f4e6612884f712827804",
+                "reference": "a413a9da94884e5e9d58f4e6612884f712827804",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.11|^0.12|^0.13|^0.14",
+                "brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
                 "dragonmantank/cron-expression": "^3.4",
-                "egulias/email-validator": "^3.2.1|^4.0",
+                "egulias/email-validator": "^4.0",
                 "ext-ctype": "*",
                 "ext-filter": "*",
                 "ext-hash": "*",
@@ -1765,36 +1846,39 @@
                 "ext-session": "*",
                 "ext-tokenizer": "*",
                 "fruitcake/php-cors": "^1.3",
-                "guzzlehttp/guzzle": "^7.8.2",
-                "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.3.0",
-                "laravel/serializable-closure": "^1.3|^2.0",
-                "league/commonmark": "^2.7",
+                "guzzlehttp/guzzle": "^7.8.2 || ^8.0",
+                "guzzlehttp/promises": "^2.0.3 || ^3.0",
+                "guzzlehttp/psr7": "^2.9 || ^3.0",
+                "guzzlehttp/uri-template": "^1.0 || ^2.0",
+                "laravel/prompts": "^0.3.11",
+                "laravel/serializable-closure": "^2.0.10",
+                "league/commonmark": "^2.8.1",
                 "league/flysystem": "^3.25.1",
                 "league/flysystem-local": "^3.25.1",
                 "league/uri": "^7.5.1",
-                "monolog/monolog": "^3.0",
+                "monolog/monolog": "^3.10",
                 "nesbot/carbon": "^3.8.4",
                 "nunomaduro/termwind": "^2.0",
-                "php": "^8.2",
-                "psr/container": "^1.1.1|^2.0.1",
-                "psr/log": "^1.0|^2.0|^3.0",
-                "psr/simple-cache": "^1.0|^2.0|^3.0",
+                "php": "^8.3",
+                "psr/container": "^1.1.1 || ^2.0.1",
+                "psr/http-message": "^1.0 || ^2.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^7.2.0",
-                "symfony/error-handler": "^7.2.0",
-                "symfony/finder": "^7.2.0",
-                "symfony/http-foundation": "^7.2.0",
-                "symfony/http-kernel": "^7.2.0",
-                "symfony/mailer": "^7.2.0",
-                "symfony/mime": "^7.2.0",
-                "symfony/polyfill-php83": "^1.33",
-                "symfony/polyfill-php84": "^1.33",
-                "symfony/polyfill-php85": "^1.33",
-                "symfony/process": "^7.2.0",
-                "symfony/routing": "^7.2.0",
-                "symfony/uid": "^7.2.0",
-                "symfony/var-dumper": "^7.2.0",
+                "symfony/console": "^7.4.0 || ^8.0.0",
+                "symfony/error-handler": "^7.4.0 || ^8.0.0",
+                "symfony/finder": "^7.4.0 || ^8.0.0",
+                "symfony/http-foundation": "^7.4.0 || ^8.0.0",
+                "symfony/http-kernel": "^7.4.0 || ^8.0.0",
+                "symfony/mailer": "^7.4.0 || ^8.0.0",
+                "symfony/mime": "^7.4.0 || ^8.0.0",
+                "symfony/polyfill-php84": "^1.36",
+                "symfony/polyfill-php85": "^1.36",
+                "symfony/polyfill-php86": "^1.36",
+                "symfony/process": "^7.4.5 || ^8.0.5",
+                "symfony/routing": "^7.4.0 || ^8.0.0",
+                "symfony/uid": "^7.4.0 || ^8.0.0",
+                "symfony/var-dumper": "^7.4.0 || ^8.0.0",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
                 "vlucas/phpdotenv": "^5.6.1",
                 "voku/portable-ascii": "^2.0.2"
@@ -1803,9 +1887,9 @@
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
-                "psr/container-implementation": "1.1|2.0",
-                "psr/log-implementation": "1.0|2.0|3.0",
-                "psr/simple-cache-implementation": "1.0|2.0|3.0"
+                "psr/container-implementation": "1.1 || 2.0",
+                "psr/log-implementation": "1.0 || 2.0 || 3.0",
+                "psr/simple-cache-implementation": "1.0 || 2.0 || 3.0"
             },
             "replace": {
                 "illuminate/auth": "self.version",
@@ -1826,6 +1910,7 @@
                 "illuminate/filesystem": "self.version",
                 "illuminate/hashing": "self.version",
                 "illuminate/http": "self.version",
+                "illuminate/image": "self.version",
                 "illuminate/json-schema": "self.version",
                 "illuminate/log": "self.version",
                 "illuminate/macroable": "self.version",
@@ -1836,6 +1921,7 @@
                 "illuminate/process": "self.version",
                 "illuminate/queue": "self.version",
                 "illuminate/redis": "self.version",
+                "illuminate/reflection": "self.version",
                 "illuminate/routing": "self.version",
                 "illuminate/session": "self.version",
                 "illuminate/support": "self.version",
@@ -1850,8 +1936,7 @@
                 "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
                 "fakerphp/faker": "^1.24",
-                "guzzlehttp/promises": "^2.0.3",
-                "guzzlehttp/psr7": "^2.4",
+                "intervention/image": "^4.0",
                 "laravel/pint": "^1.18",
                 "league/flysystem-aws-s3-v3": "^3.25.1",
                 "league/flysystem-ftp": "^3.25.1",
@@ -1860,22 +1945,25 @@
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
                 "opis/json-schema": "^2.4.1",
-                "orchestra/testbench-core": "^10.6.5",
-                "pda/pheanstalk": "^5.0.6|^7.0.0",
+                "orchestra/testbench-core": "^11.5.0",
+                "pda/pheanstalk": "^7.0.0 || ^8.0.0",
                 "php-http/discovery": "^1.15",
-                "phpstan/phpstan": "^2.0",
-                "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
-                "predis/predis": "^2.3|^3.0",
-                "resend/resend-php": "^0.10.0",
-                "symfony/cache": "^7.2.0",
-                "symfony/http-client": "^7.2.0",
-                "symfony/psr-http-message-bridge": "^7.2.0",
-                "symfony/translation": "^7.2.0"
+                "phpstan/phpstan": "2.2.15",
+                "phpunit/phpunit": "^11.5.50 || ^12.5.8 || ^13.0.3",
+                "predis/predis": "^2.3 || ^3.0",
+                "rector/rector": "2.6.3",
+                "resend/resend-php": "^1.0",
+                "symfony/cache": "^7.4.0 || ^8.0.0",
+                "symfony/http-client": "^7.4.0 || ^8.0.0",
+                "symfony/mercure": "^0.8.0",
+                "symfony/psr-http-message-bridge": "^7.4.0 || ^8.0.0",
+                "symfony/translation": "^7.4.0 || ^8.0.0",
+                "web-token/jwt-library": "^4.1"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
                 "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
-                "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
+                "brianium/paratest": "Required to run tests in parallel (^7.0 || ^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -1884,9 +1972,10 @@
                 "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
                 "ext-pdo": "Required to use all database features.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0 || ^5.0 || ^6.0).",
                 "fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
+                "intervention/image": "Required to use the image processing features (^4.0).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
                 "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
@@ -1894,24 +1983,26 @@
                 "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
                 "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
                 "mockery/mockery": "Required to use mocking (^1.6).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^7.0 || ^8.0).",
                 "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.5.3|^12.0.1).",
-                "predis/predis": "Required to use the predis connector (^2.3|^3.0).",
-                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^7.2).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
+                "phpunit/phpunit": "Required to use assertions and run tests (^11.5.50 || ^12.5.8 || ^13.0.3).",
+                "predis/predis": "Required to use the predis connector (^2.3 || ^3.0).",
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0 || ^7.0).",
+                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0 || ^1.0).",
+                "spatie/fork": "Required to use the 'fork' concurrency driver (^1.2).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.4 || ^8.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4 || ^8.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.4 || ^8.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4 || ^8.0).",
+                "symfony/mercure": "Required to use the Mercure broadcast driver (^0.8).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4 || ^8.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4 || ^8.0).",
+                "web-token/jwt-library": "Required to sign Mercure JWTs and use end-to-end encrypted channels (^4.1)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "12.x-dev"
+                    "dev-master": "13.0.x-dev"
                 }
             },
             "autoload": {
@@ -1922,6 +2013,7 @@
                     "src/Illuminate/Filesystem/functions.php",
                     "src/Illuminate/Foundation/helpers.php",
                     "src/Illuminate/Log/functions.php",
+                    "src/Illuminate/Reflection/helpers.php",
                     "src/Illuminate/Support/functions.php",
                     "src/Illuminate/Support/helpers.php"
                 ],
@@ -1930,7 +2022,8 @@
                     "Illuminate\\Support\\": [
                         "src/Illuminate/Macroable/",
                         "src/Illuminate/Collections/",
-                        "src/Illuminate/Conditionable/"
+                        "src/Illuminate/Conditionable/",
+                        "src/Illuminate/Reflection/"
                     ]
                 }
             },
@@ -1954,36 +2047,36 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-30T17:39:22+00:00"
+            "time": "2026-10-06T13:52:37+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.7",
+            "version": "v0.3.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "a1891d362714bc40c8d23b0b1d7090f022ea27cc"
+                "reference": "21b7b49d60fcb700016dd27b582ae739c75de816"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/a1891d362714bc40c8d23b0b1d7090f022ea27cc",
-                "reference": "a1891d362714bc40c8d23b0b1d7090f022ea27cc",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/21b7b49d60fcb700016dd27b582ae739c75de816",
+                "reference": "21b7b49d60fcb700016dd27b582ae739c75de816",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2.2",
                 "ext-mbstring": "*",
                 "php": "^8.1",
-                "symfony/console": "^6.2|^7.0"
+                "symfony/console": "^6.2|^7.0|^8.0"
             },
             "conflict": {
                 "illuminate/console": ">=10.17.0 <10.25.0",
                 "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
-                "illuminate/collections": "^10.0|^11.0|^12.0",
+                "illuminate/collections": "^10.0|^11.0|^12.0|^13.0",
                 "mockery/mockery": "^1.5",
-                "pestphp/pest": "^2.3|^3.4",
+                "pestphp/pest": "^2.3|^3.4|^4.0",
                 "phpstan/phpstan": "^1.12.28",
                 "phpstan/phpstan-mockery": "^1.1.3"
             },
@@ -2010,34 +2103,33 @@
             ],
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
-                "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.7"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.25"
             },
-            "time": "2025-09-19T13:47:56+00:00"
+            "time": "2026-10-06T02:25:49+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.5",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3832547db6e0e2f8bb03d4093857b378c66eceed"
+                "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3832547db6e0e2f8bb03d4093857b378c66eceed",
-                "reference": "3832547db6e0e2f8bb03d4093857b378c66eceed",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5",
+                "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1"
             },
             "require-dev": {
-                "illuminate/support": "^10.0|^11.0|^12.0",
+                "illuminate/support": "^10.0|^11.0|^12.0|^13.0",
                 "nesbot/carbon": "^2.67|^3.0",
-                "pestphp/pest": "^2.36|^3.0",
+                "pestphp/pest": "^2.36|^3.0|^4.0",
                 "phpstan/phpstan": "^2.0",
-                "symfony/var-dumper": "^6.2.0|^7.0.0"
+                "symfony/var-dumper": "^6.2.0|^7.0.0|^8.0.0"
             },
             "type": "library",
             "extra": {
@@ -2074,38 +2166,38 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2025-09-22T17:29:40+00:00"
+            "time": "2026-09-22T14:32:34+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.23.0",
+            "version": "v5.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5"
+                "reference": "caf714f55d51ab0d914b40033d8b0f489d6219cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
-                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/caf714f55d51ab0d914b40033d8b0f489d6219cc",
+                "reference": "caf714f55d51ab0d914b40033d8b0f489d6219cc",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "firebase/php-jwt": "^6.4",
+                "firebase/php-jwt": "^6.4|^7.0",
                 "guzzlehttp/guzzle": "^6.0|^7.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
                 "league/oauth1-client": "^1.11",
                 "php": "^7.2|^8.0",
                 "phpseclib/phpseclib": "^3.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "orchestra/testbench": "^4.18|^5.20|^6.47|^7.55|^8.36|^9.15|^10.8|^11.0",
                 "phpstan/phpstan": "^1.12.23",
-                "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5"
+                "phpunit/phpunit": "^8.0|^9.3|^10.4|^11.5|^12.0"
             },
             "type": "library",
             "extra": {
@@ -2146,37 +2238,37 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-07-23T14:16:08+00:00"
+            "time": "2026-08-13T23:01:33+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.10.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3"
+                "reference": "4faba77764bd33411735936acdf30446d058c78b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/22177cc71807d38f2810c6204d8f7183d88a57d3",
-                "reference": "22177cc71807d38f2810c6204d8f7183d88a57d3",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/4faba77764bd33411735936acdf30446d058c78b",
+                "reference": "4faba77764bd33411735936acdf30446d058c78b",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-                "php": "^7.2.5|^8.0",
-                "psy/psysh": "^0.11.1|^0.12.0",
-                "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
+                "illuminate/console": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+                "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",
+                "php": "^8.1",
+                "psy/psysh": "^0.12.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0|^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "~1.3.3|^1.4.2",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^8.5.8|^9.3.3|^10.0"
+                "phpunit/phpunit": "^10.5|^11.5"
             },
             "suggest": {
-                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0)."
+                "illuminate/database": "The Illuminate Database package (^8.0|^9.0|^10.0|^11.0|^12.0|^13.0)."
             },
             "type": "library",
             "extra": {
@@ -2184,6 +2276,9 @@
                     "providers": [
                         "Laravel\\Tinker\\TinkerServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -2210,22 +2305,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.10.1"
+                "source": "https://github.com/laravel/tinker/tree/v3.0.2"
             },
-            "time": "2025-01-27T14:24:01+00:00"
+            "time": "2026-03-17T14:54:13+00:00"
         },
         {
             "name": "league/commonmark",
-            "version": "2.7.1",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca"
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca",
-                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6efbd9c472b91db0a3350fcd601c8332c2382e1f",
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f",
                 "shasum": ""
             },
             "require": {
@@ -2247,12 +2342,12 @@
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "^1.4 || ^2.0",
                 "nyholm/psr7": "^1.5",
-                "phpstan/phpstan": "^1.8.2",
-                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
+                "phpstan/phpstan": "^2.0.0",
+                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0 || ^12.0.0 || ^13.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
-                "symfony/process": "^5.4 | ^6.0 | ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0 || ^8.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0 || ^8.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0 || ^8.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
             },
@@ -2262,7 +2357,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.8-dev"
+                    "dev-main": "2.11-dev"
                 }
             },
             "autoload": {
@@ -2319,7 +2414,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-20T12:47:49+00:00"
+            "time": "2026-09-21T13:07:34+00:00"
         },
         {
             "name": "league/config",
@@ -2405,16 +2500,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.30.0",
+            "version": "3.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
-                "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f7fb152932f30072d573510cbd4dd657d6475b25",
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25",
                 "shasum": ""
             },
             "require": {
@@ -2482,26 +2577,26 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.36.0"
             },
-            "time": "2025-06-25T13:29:59+00:00"
+            "time": "2026-09-02T08:00:27+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.29.0",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9"
+                "reference": "b03780cb97585ee7e48977f40ed599b33b751634"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9",
-                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/b03780cb97585ee7e48977f40ed599b33b751634",
+                "reference": "b03780cb97585ee7e48977f40ed599b33b751634",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-sdk-php": "^3.295.10",
+                "aws/aws-sdk-php": "^3.371.5",
                 "league/flysystem": "^3.10.0",
                 "league/mime-type-detection": "^1.0.0",
                 "php": "^8.0.2"
@@ -2537,22 +2632,22 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.35.3"
             },
-            "time": "2024-08-17T13:10:48+00:00"
+            "time": "2026-08-08T16:19:23+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.30.0",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10"
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/6691915f77c7fb69adfb87dcd550052dc184ee10",
-                "reference": "6691915f77c7fb69adfb87dcd550052dc184ee10",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/a099b24dce160f3b2239043d13d47c4a1a214ea4",
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4",
                 "shasum": ""
             },
             "require": {
@@ -2586,22 +2681,22 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.30.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.35.3"
             },
-            "time": "2025-05-21T10:34:19+00:00"
+            "time": "2026-08-12T13:29:21+00:00"
         },
         {
             "name": "league/html-to-markdown",
-            "version": "5.1.1",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd"
+                "reference": "5411b9650dd468be52267a6f4a2a26c31d2581be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd",
-                "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/5411b9650dd468be52267a6f4a2a26c31d2581be",
+                "reference": "5411b9650dd468be52267a6f4a2a26c31d2581be",
                 "shasum": ""
             },
             "require": {
@@ -2611,11 +2706,11 @@
             },
             "require-dev": {
                 "mikehaertl/php-shellcommand": "^1.1.0",
-                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^8.5 || ^9.2",
+                "phpstan/phpstan": "^1.8.8 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^9.2 || ^10.5 || ^11.0 || ^12.0 || ^13.0",
                 "scrutinizer/ocular": "^1.6",
                 "unleashedtech/php-coding-standard": "^2.7 || ^3.0",
-                "vimeo/psalm": "^4.22 || ^5.0"
+                "vimeo/psalm": "^4.22 || ^5.0 || ^6.0"
             },
             "bin": [
                 "bin/html-to-markdown"
@@ -2657,7 +2752,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/html-to-markdown/issues",
-                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1"
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.3"
             },
             "funding": [
                 {
@@ -2677,20 +2772,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-12T21:21:09+00:00"
+            "time": "2026-10-06T01:08:41+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.16.0",
+            "version": "1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
+                "reference": "f5f47eff7c48ed1003069a2ca67f316fb4021c76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
-                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/f5f47eff7c48ed1003069a2ca67f316fb4021c76",
+                "reference": "f5f47eff7c48ed1003069a2ca67f316fb4021c76",
                 "shasum": ""
             },
             "require": {
@@ -2700,7 +2795,7 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
                 "phpstan/phpstan": "^0.12.68",
-                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
+                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0 || ^11.0 || ^12.0"
             },
             "type": "library",
             "autoload": {
@@ -2721,7 +2816,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.17.0"
             },
             "funding": [
                 {
@@ -2733,27 +2828,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-21T08:32:55+00:00"
+            "time": "2026-07-09T11:49:27+00:00"
         },
         {
             "name": "league/oauth1-client",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth1-client.git",
-                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055"
+                "reference": "aa8fe766f772f9233d6c06f9ef003fd8129e408d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
-                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/aa8fe766f772f9233d6c06f9ef003fd8129e408d",
+                "reference": "aa8fe766f772f9233d6c06f9ef003fd8129e408d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-openssl": "*",
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "guzzlehttp/psr7": "^1.7|^2.0",
+                "guzzlehttp/guzzle": "^6.5.8||^7.8.2||^8.0",
+                "guzzlehttp/psr7": "^1.9.1||^2.6.3||^3.0",
                 "php": ">=7.1||>=8.0"
             },
             "require-dev": {
@@ -2807,28 +2902,29 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth1-client/issues",
-                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.11.0"
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.12.0"
             },
-            "time": "2024-12-10T19:59:05+00:00"
+            "time": "2026-09-19T05:12:51+00:00"
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.8.1",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "9df2924ca644736c835fc60466a3a60390d334f9"
+                "reference": "8cedfef9d01a8d1fd2ecfabb41734b17592c4b71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/9df2924ca644736c835fc60466a3a60390d334f9",
-                "reference": "9df2924ca644736c835fc60466a3a60390d334f9",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/8cedfef9d01a8d1fd2ecfabb41734b17592c4b71",
+                "reference": "8cedfef9d01a8d1fd2ecfabb41734b17592c4b71",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "php": "^7.1 || >=8.0.0 <8.5.0"
+                "guzzlehttp/guzzle": "^6.5.8 || ^7.8.2 || ^8.0",
+                "guzzlehttp/psr7": "^1.9.1 || ^2.6.3 || ^3.0",
+                "php": "^7.1 || >=8.0.0 <8.6.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.5",
@@ -2872,39 +2968,44 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.1"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.9.1"
             },
-            "time": "2025-02-26T04:37:30+00:00"
+            "time": "2026-09-16T13:14:31+00:00"
         },
         {
             "name": "league/uri",
-            "version": "7.5.1",
+            "version": "7.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "81fb5145d2644324614cc532b28efd0215bda430"
+                "reference": "08cf38e3924d4f56238125547b5720496fac8fd4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430",
-                "reference": "81fb5145d2644324614cc532b28efd0215bda430",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/08cf38e3924d4f56238125547b5720496fac8fd4",
+                "reference": "08cf38e3924d4f56238125547b5720496fac8fd4",
                 "shasum": ""
             },
             "require": {
-                "league/uri-interfaces": "^7.5",
-                "php": "^8.1"
+                "league/uri-interfaces": "^7.8.1",
+                "php": "^8.1",
+                "psr/http-factory": "^1"
             },
             "conflict": {
                 "league/uri-schemes": "^1.0"
             },
             "suggest": {
                 "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-dom": "to convert the URI into an HTML anchor tag",
                 "ext-fileinfo": "to create Data URI from file contennts",
                 "ext-gmp": "to improve IPV4 host parsing",
                 "ext-intl": "to handle IDN host with the best performance",
-                "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
-                "league/uri-components": "Needed to easily manipulate URI objects components",
+                "ext-uri": "to use the PHP native URI class",
+                "jeremykendall/php-domain-parser": "to further parse the URI host and resolve its Public Suffix and Top Level Domain",
+                "league/uri-components": "to provide additional tools to manipulate URI objects components",
+                "league/uri-polyfill": "to backport the PHP URI extension for older versions of PHP",
                 "php-64bit": "to improve IPV4 host parsing",
+                "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification",
                 "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
@@ -2932,6 +3033,7 @@
             "description": "URI manipulation library",
             "homepage": "https://uri.thephpleague.com",
             "keywords": [
+                "URN",
                 "data-uri",
                 "file-uri",
                 "ftp",
@@ -2944,9 +3046,11 @@
                 "psr-7",
                 "query-string",
                 "querystring",
+                "rfc2141",
                 "rfc3986",
                 "rfc3987",
                 "rfc6570",
+                "rfc8141",
                 "uri",
                 "uri-template",
                 "url",
@@ -2956,7 +3060,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri/tree/7.5.1"
+                "source": "https://github.com/thephpleague/uri/tree/7.8.1"
             },
             "funding": [
                 {
@@ -2964,26 +3068,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-08T08:40:02+00:00"
+            "time": "2026-03-15T20:22:25+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "7.5.0",
+            "version": "7.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742"
+                "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
-                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/85d5c77c5d6d3af6c54db4a78246364908f3c928",
+                "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928",
                 "shasum": ""
             },
             "require": {
                 "ext-filter": "*",
                 "php": "^8.1",
-                "psr/http-factory": "^1",
                 "psr/http-message": "^1.1 || ^2.0"
             },
             "suggest": {
@@ -2991,6 +3094,7 @@
                 "ext-gmp": "to improve IPV4 host parsing",
                 "ext-intl": "to handle IDN host with the best performance",
                 "php-64bit": "to improve IPV4 host parsing",
+                "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification",
                 "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
@@ -3015,7 +3119,7 @@
                     "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "Common interfaces and classes for URI representation and interaction",
+            "description": "Common tools for parsing and resolving RFC3987/RFC3986 URI",
             "homepage": "https://uri.thephpleague.com",
             "keywords": [
                 "data-uri",
@@ -3040,7 +3144,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0"
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.1"
             },
             "funding": [
                 {
@@ -3048,28 +3152,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-08T08:18:47+00:00"
+            "time": "2026-03-08T20:05:35+00:00"
         },
         {
             "name": "masterminds/html5",
-            "version": "2.10.0",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
+                "reference": "a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7",
+                "reference": "a1e7a2f88ee13635d86fc61cfbdf2306a76ddfc7",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
-                "php": ">=5.3.0"
+                "php": ">=7.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
+                "phpunit/phpunit": "^6 || ^7 || ^8 || ^9 || ^10"
             },
             "type": "library",
             "extra": {
@@ -3113,22 +3217,22 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.11.0"
             },
-            "time": "2025-07-25T09:04:22+00:00"
+            "time": "2026-08-18T06:18:41+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "3.9.0",
+            "version": "3.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
+                "reference": "d7059e4c691d05ea1222b5124bed0f961be46e15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
-                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7059e4c691d05ea1222b5124bed0f961be46e15",
+                "reference": "d7059e4c691d05ea1222b5124bed0f961be46e15",
                 "shasum": ""
             },
             "require": {
@@ -3146,7 +3250,7 @@
                 "graylog2/gelf-php": "^1.4.2 || ^2.0",
                 "guzzlehttp/guzzle": "^7.4.5",
                 "guzzlehttp/psr7": "^2.2",
-                "mongodb/mongodb": "^1.8",
+                "mongodb/mongodb": "^1.8 || ^2.0",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
                 "php-console/php-console": "^3.1.8",
                 "phpstan/phpstan": "^2",
@@ -3154,6 +3258,7 @@
                 "phpstan/phpstan-strict-rules": "^2",
                 "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
+                "psr/clock": "^1.0",
                 "rollbar/rollbar": "^4.0",
                 "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
@@ -3172,6 +3277,7 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "psr/clock": "Required to pass a clock to the Logger and control the timestamp of log records",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -3206,7 +3312,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.9.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.12.1"
             },
             "funding": [
                 {
@@ -3218,20 +3324,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-24T10:02:05+00:00"
+            "time": "2026-09-29T19:21:12+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.8.0",
+            "version": "2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
+                "reference": "2157c5e50e813ec6a96c1eed3be7f64a20fb32a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
-                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/2157c5e50e813ec6a96c1eed3be7f64a20fb32a8",
+                "reference": "2157c5e50e813ec6a96c1eed3be7f64a20fb32a8",
                 "shasum": ""
             },
             "require": {
@@ -3240,7 +3346,7 @@
             },
             "require-dev": {
                 "composer/xdebug-handler": "^3.0.3",
-                "phpunit/phpunit": "^8.5.33"
+                "phpunit/phpunit": "^8.5.52"
             },
             "bin": [
                 "bin/jp.php"
@@ -3248,7 +3354,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "2.9-dev"
                 }
             },
             "autoload": {
@@ -3282,22 +3388,22 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.9.2"
             },
-            "time": "2024-09-04T18:46:31+00:00"
+            "time": "2026-07-06T18:56:19+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.10.3",
+            "version": "3.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f"
+                "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
-                "reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/94cfc34887f07ab5c0efa07914c8f527544e3224",
+                "reference": "94cfc34887f07ab5c0efa07914c8f527544e3224",
                 "shasum": ""
             },
             "require": {
@@ -3305,9 +3411,9 @@
                 "ext-json": "*",
                 "php": "^8.1",
                 "psr/clock": "^1.0",
-                "symfony/clock": "^6.3.12 || ^7.0",
+                "symfony/clock": "^6.3.12 || ^7.0 || ^8.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0 || ^8.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
@@ -3317,11 +3423,11 @@
                 "doctrine/orm": "^2.15.2 || ^3.0",
                 "friendsofphp/php-cs-fixer": "^v3.87.1",
                 "kylekatarnls/multi-tester": "^2.5.3",
-                "phpmd/phpmd": "^2.15.0",
+                "phpmd/phpmd": "^3.0@dev",
                 "phpstan/extension-installer": "^1.4.3",
                 "phpstan/phpstan": "^2.1.22",
                 "phpunit/phpunit": "^10.5.53",
-                "squizlabs/php_codesniffer": "^3.13.4"
+                "squizlabs/php_codesniffer": "^3.13.4 || ^4.0.0"
             },
             "bin": [
                 "bin/carbon"
@@ -3364,14 +3470,14 @@
                 }
             ],
             "description": "An API extension for DateTime that supports 281 different languages.",
-            "homepage": "https://carbon.nesbot.com",
+            "homepage": "https://carbonphp.github.io/carbon/",
             "keywords": [
                 "date",
                 "datetime",
                 "time"
             ],
             "support": {
-                "docs": "https://carbon.nesbot.com/docs",
+                "docs": "https://carbonphp.github.io/carbon/guide/getting-started/introduction.html",
                 "issues": "https://github.com/CarbonPHP/carbon/issues",
                 "source": "https://github.com/CarbonPHP/carbon"
             },
@@ -3389,29 +3495,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-06T13:39:36+00:00"
+            "time": "2026-10-02T07:26:52+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.2",
+            "version": "v1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
+                "reference": "c54350438cd6914616f790a49cb424605f421562"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
-                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
+                "url": "https://api.github.com/repos/nette/schema/zipball/c54350438cd6914616f790a49cb424605f421562",
+                "reference": "c54350438cd6914616f790a49cb424605f421562",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.4"
+                "php": "8.1 - 8.5"
             },
             "require-dev": {
-                "nette/tester": "^2.5.2",
-                "phpstan/phpstan-nette": "^1.0",
+                "nette/phpstan-rules": "^1.0",
+                "nette/tester": "^2.6",
+                "phpstan/extension-installer": "^1.4@stable",
+                "phpstan/phpstan": "^2.1.39@stable",
                 "tracy/tracy": "^2.8"
             },
             "type": "library",
@@ -3421,6 +3529,9 @@
                 }
             },
             "autoload": {
+                "psr-4": {
+                    "Nette\\": "src"
+                },
                 "classmap": [
                     "src/"
                 ]
@@ -3449,26 +3560,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.2"
+                "source": "https://github.com/nette/schema/tree/v1.3.6"
             },
-            "time": "2024-10-06T23:10:23+00:00"
+            "time": "2026-08-16T21:58:41+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.8",
+            "version": "v4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
+                "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
-                "reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
+                "url": "https://api.github.com/repos/nette/utils/zipball/b043439dbdf954e6c28b5ea7e34b0100f83165e0",
+                "reference": "b043439dbdf954e6c28b5ea7e34b0100f83165e0",
                 "shasum": ""
             },
             "require": {
-                "php": "8.0 - 8.5"
+                "php": "8.2 - 8.5"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -3476,13 +3587,15 @@
             },
             "require-dev": {
                 "jetbrains/phpstorm-attributes": "^1.2",
+                "nette/phpstan-rules": "^1.0",
                 "nette/tester": "^2.5",
-                "phpstan/phpstan-nette": "^2.0@stable",
+                "phpstan/extension-installer": "^1.4@stable",
+                "phpstan/phpstan": "^2.1@stable",
                 "tracy/tracy": "^2.9"
             },
             "suggest": {
                 "ext-gd": "to use Image",
-                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-iconv": "to use Strings::chr(), ord() and reverse()",
                 "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
                 "ext-json": "to use Nette\\Utils\\Json",
                 "ext-mbstring": "to use Strings::lower() etc...",
@@ -3491,7 +3604,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -3538,26 +3651,25 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.8"
+                "source": "https://github.com/nette/utils/tree/v4.1.5"
             },
-            "time": "2025-08-06T21:43:34+00:00"
+            "time": "2026-07-17T23:02:45+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.1",
+            "version": "v5.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+                "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9e33da9553fe7786f0962b35f4e4ecf01be89def",
+                "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def",
                 "shasum": ""
             },
             "require": {
-                "ext-ctype": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": ">=7.4"
@@ -3596,37 +3708,37 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.9.0"
             },
-            "time": "2025-08-13T20:13:15+00:00"
+            "time": "2026-09-13T18:51:52+00:00"
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v2.3.1",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "dfa08f390e509967a15c22493dc0bac5733d9123"
+                "reference": "712a31b768f5daea284c2169a7d227031001b9a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/dfa08f390e509967a15c22493dc0bac5733d9123",
-                "reference": "dfa08f390e509967a15c22493dc0bac5733d9123",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/712a31b768f5daea284c2169a7d227031001b9a8",
+                "reference": "712a31b768f5daea284c2169a7d227031001b9a8",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^8.2",
-                "symfony/console": "^7.2.6"
+                "symfony/console": "^7.4.4 || ^8.0.4"
             },
             "require-dev": {
-                "illuminate/console": "^11.44.7",
-                "laravel/pint": "^1.22.0",
+                "illuminate/console": "^11.47.0",
+                "laravel/pint": "^1.27.1",
                 "mockery/mockery": "^1.6.12",
-                "pestphp/pest": "^2.36.0 || ^3.8.2",
-                "phpstan/phpstan": "^1.12.25",
+                "pestphp/pest": "^2.36.0 || ^3.8.4 || ^4.3.2",
+                "phpstan/phpstan": "^1.12.32",
                 "phpstan/phpstan-strict-rules": "^1.6.2",
-                "symfony/var-dumper": "^7.2.6",
+                "symfony/var-dumper": "^7.3.5 || ^8.0.4",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -3658,7 +3770,7 @@
                     "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Its like Tailwind CSS, but for the console.",
+            "description": "It's like Tailwind CSS, but for the console.",
             "keywords": [
                 "cli",
                 "console",
@@ -3669,7 +3781,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.4.0"
             },
             "funding": [
                 {
@@ -3685,25 +3797,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-08T08:14:37+00:00"
+            "time": "2026-02-16T23:10:27+00:00"
         },
         {
             "name": "onelogin/php-saml",
-            "version": "4.3.0",
+            "version": "4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SAML-Toolkits/php-saml.git",
-                "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0"
+                "reference": "26b3a47349415e5b7aa300ba4ab7fc316c65f19e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/bf5efce9f2df5d489d05e78c27003a0fc8bc50f0",
-                "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0",
+                "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/26b3a47349415e5b7aa300ba4ab7fc316c65f19e",
+                "reference": "26b3a47349415e5b7aa300ba4ab7fc316c65f19e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3",
-                "robrichards/xmlseclibs": "^3.1"
+                "robrichards/xmlseclibs": "^3.1.5"
             },
             "require-dev": {
                 "pdepend/pdepend": "^2.8.0",
@@ -3749,7 +3861,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-25T14:28:00+00:00"
+            "time": "2026-05-07T22:38:04+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -3872,16 +3984,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.4",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d"
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
-                "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/67b192b6a42ec03944b972d6e633ddec78ad2c6d",
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d",
                 "shasum": ""
             },
             "require": {
@@ -3889,7 +4001,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
+                "phpunit/phpunit": "^8.5.54 || ^9.6.36 || ^10.5.64 || ^11.5.56 || ^12.5.33"
             },
             "type": "library",
             "extra": {
@@ -3931,7 +4043,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.4"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.10.0"
             },
             "funding": [
                 {
@@ -3943,20 +4055,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-21T11:53:16+00:00"
+            "time": "2026-08-24T00:54:40+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.46",
+            "version": "3.0.57",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6"
+                "reference": "d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
-                "reference": "56483a7de62a6c2a6635e42e93b8a9e25d4f0ec6",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4",
+                "reference": "d17e0ddaeaf6f22f7e007cbb437d78792fe2a0e4",
                 "shasum": ""
             },
             "require": {
@@ -4037,7 +4149,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.46"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.57"
             },
             "funding": [
                 {
@@ -4053,20 +4165,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-26T16:29:55+00:00"
+            "time": "2026-08-26T12:13:21+00:00"
         },
         {
             "name": "pragmarx/google2fa",
-            "version": "v8.0.3",
+            "version": "v9.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"
+                "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
-                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/f00bc788c555adfb6765c437ff3538e59cd88af1",
+                "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1",
                 "shasum": ""
             },
             "require": {
@@ -4074,8 +4186,11 @@
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
+                "phpstan/phpstan": "^1.0|^2.0",
+                "phpstan/phpstan-phpunit": "^1.0|^2.0",
+                "phpunit/phpunit": "~9|~10|~11|~12|~13",
+                "psalm/plugin-phpunit": "^0.19|^0.20",
+                "vimeo/psalm": "^5.26|^6.13"
             },
             "type": "library",
             "autoload": {
@@ -4098,27 +4213,36 @@
             "keywords": [
                 "2fa",
                 "Authentication",
+                "MFA",
                 "Two Factor Authentication",
-                "google2fa"
+                "google-authenticator",
+                "google2fa",
+                "hotp",
+                "otp",
+                "rfc4226",
+                "rfc6238",
+                "totp"
             ],
             "support": {
+                "docs": "https://github.com/antonioribeiro/google2fa#readme",
                 "issues": "https://github.com/antonioribeiro/google2fa/issues",
-                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"
+                "security": "https://github.com/antonioribeiro/google2fa/security/policy",
+                "source": "https://github.com/antonioribeiro/google2fa"
             },
-            "time": "2024-09-05T11:56:40+00:00"
+            "time": "2026-08-15T13:22:01+00:00"
         },
         {
             "name": "predis/predis",
-            "version": "v3.2.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8"
+                "reference": "4d91f3b08a60c3bacc2afbd8dc41724559b7626a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",
-                "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",
+                "url": "https://api.github.com/repos/predis/predis/zipball/4d91f3b08a60c3bacc2afbd8dc41724559b7626a",
+                "reference": "4d91f3b08a60c3bacc2afbd8dc41724559b7626a",
                 "shasum": ""
             },
             "require": {
@@ -4160,7 +4284,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v3.2.0"
+                "source": "https://github.com/predis/predis/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -4168,7 +4292,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-06T06:41:24+00:00"
+            "time": "2026-10-08T16:46:04+00:00"
         },
         {
             "name": "psr/clock",
@@ -4584,16 +4708,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.12",
+            "version": "v0.12.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "cd23863404a40ccfaf733e3af4db2b459837f7e7"
+                "reference": "ca0fdcf8a7617afa3adfdf1b5fef573dffb69ca1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/cd23863404a40ccfaf733e3af4db2b459837f7e7",
-                "reference": "cd23863404a40ccfaf733e3af4db2b459837f7e7",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ca0fdcf8a7617afa3adfdf1b5fef573dffb69ca1",
+                "reference": "ca0fdcf8a7617afa3adfdf1b5fef573dffb69ca1",
                 "shasum": ""
             },
             "require": {
@@ -4601,18 +4725,19 @@
                 "ext-tokenizer": "*",
                 "nikic/php-parser": "^5.0 || ^4.0",
                 "php": "^8.0 || ^7.4",
-                "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4",
-                "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4"
+                "symfony/console": "^8.0 || ^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4",
+                "symfony/var-dumper": "^8.0 || ^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4"
             },
             "conflict": {
                 "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.2"
+                "bamarni/composer-bin-plugin": "^1.2",
+                "composer/class-map-generator": "^1.6"
             },
             "suggest": {
+                "composer/class-map-generator": "Improved tab completion performance with better class discovery.",
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
-                "ext-pdo-sqlite": "The doc command requires SQLite to work.",
                 "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well."
             },
             "bin": [
@@ -4656,9 +4781,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.12"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.24"
             },
-            "time": "2025-09-20T13:46:31+00:00"
+            "time": "2026-06-29T15:41:09+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -4782,20 +4907,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.9.1",
+            "version": "4.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
+                "reference": "75d73f48d02797c2c285a7e9f348fadc0102ffe2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
-                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/75d73f48d02797c2c285a7e9f348fadc0102ffe2",
+                "reference": "75d73f48d02797c2c285a7e9f348fadc0102ffe2",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
+                "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
             },
@@ -4854,22 +4979,22 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.4"
             },
-            "time": "2025-09-04T20:59:21+00:00"
+            "time": "2026-09-16T11:39:30+00:00"
         },
         {
             "name": "robrichards/xmlseclibs",
-            "version": "3.1.3",
+            "version": "3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07"
+                "reference": "03062be78178cbb5e8f605cd255dc32a14981f92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/2bdfd742624d739dfadbd415f00181b4a77aaf07",
-                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07",
+                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/03062be78178cbb5e8f605cd255dc32a14981f92",
+                "reference": "03062be78178cbb5e8f605cd255dc32a14981f92",
                 "shasum": ""
             },
             "require": {
@@ -4896,31 +5021,39 @@
             ],
             "support": {
                 "issues": "https://github.com/robrichards/xmlseclibs/issues",
-                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.3"
+                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.5"
             },
-            "time": "2024-11-20T21:13:56+00:00"
+            "time": "2026-03-13T10:31:56+00:00"
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.9.0",
+            "version": "v9.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9"
+                "reference": "f284e63b6e891e0c28631e54ba06c3ed102a9ef3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d8e916507b88e389e26d4ab03c904a082aa66bb9",
-                "reference": "d8e916507b88e389e26d4ab03c904a082aa66bb9",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/f284e63b6e891e0c28631e54ba06c3ed102a9ef3",
+                "reference": "f284e63b6e891e0c28631e54ba06c3ed102a9ef3",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+                "php": "^7.2.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.41",
-                "rawr/cross-data-providers": "^2.0.0"
+                "php-parallel-lint/php-parallel-lint": "1.4.0",
+                "phpstan/extension-installer": "1.4.3",
+                "phpstan/phpstan": "1.12.33 || 2.2.9",
+                "phpstan/phpstan-phpunit": "1.4.2 || 2.0.18",
+                "phpstan/phpstan-strict-rules": "1.6.2 || 2.0.12",
+                "phpunit/phpunit": "8.5.54",
+                "rawr/phpunit-data-provider": "3.3.1",
+                "rector/rector": "1.2.10 || 2.6.2",
+                "rector/type-perfect": "1.0.0 || 2.1.4",
+                "squizlabs/php_codesniffer": "4.0.4"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -4928,10 +5061,14 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "9.0.x-dev"
+                    "dev-main": "9.6.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/Rule/Rule.php",
+                    "src/RuleSet/RuleContainer.php"
+                ],
                 "psr-4": {
                     "Sabberworm\\CSS\\": "src/"
                 }
@@ -4962,9 +5099,9 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.9.0"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v9.5.0"
             },
-            "time": "2025-07-11T13:20:48+00:00"
+            "time": "2026-09-20T15:02:00+00:00"
         },
         {
             "name": "socialiteproviders/discord",
@@ -5059,26 +5196,26 @@
         },
         {
             "name": "socialiteproviders/manager",
-            "version": "v4.8.1",
+            "version": "4.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Manager.git",
-                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4"
+                "reference": "65ad770276875682e246e5435566146bf0baebf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/8180ec14bef230ec2351cff993d5d2d7ca470ef4",
-                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/65ad770276875682e246e5435566146bf0baebf2",
+                "reference": "65ad770276875682e246e5435566146bf0baebf2",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
-                "laravel/socialite": "^5.5",
-                "php": "^8.1"
+                "illuminate/support": "^12.0 || ^13.0",
+                "laravel/socialite": "^5.29",
+                "php": "^8.3"
             },
             "require-dev": {
-                "mockery/mockery": "^1.2",
-                "phpunit/phpunit": "^9.0"
+                "mockery/mockery": "^1.6",
+                "phpunit/phpunit": "^12.5"
             },
             "type": "library",
             "extra": {
@@ -5129,24 +5266,23 @@
                 "issues": "https://github.com/socialiteproviders/manager/issues",
                 "source": "https://github.com/socialiteproviders/manager"
             },
-            "time": "2025-02-24T19:33:30+00:00"
+            "time": "2026-08-16T00:16:22+00:00"
         },
         {
             "name": "socialiteproviders/microsoft-azure",
-            "version": "5.2.0",
+            "version": "5.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
+                "reference": "d70ea3c60b09cc113a14350761a0618815bfa11c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/d70ea3c60b09cc113a14350761a0618815bfa11c",
+                "reference": "d70ea3c60b09cc113a14350761a0618815bfa11c",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
@@ -5180,7 +5316,7 @@
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
-            "time": "2024-03-15T03:02:10+00:00"
+            "time": "2026-08-23T02:40:58+00:00"
         },
         {
             "name": "socialiteproviders/okta",
@@ -5336,16 +5472,16 @@
         },
         {
             "name": "symfony/clock",
-            "version": "v7.3.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/clock.git",
-                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24"
+                "reference": "674fa3b98e21531dd040e613479f5f6fa8f32111"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
-                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/674fa3b98e21531dd040e613479f5f6fa8f32111",
+                "reference": "674fa3b98e21531dd040e613479f5f6fa8f32111",
                 "shasum": ""
             },
             "require": {
@@ -5390,7 +5526,7 @@
                 "time"
             ],
             "support": {
-                "source": "https://github.com/symfony/clock/tree/v7.3.0"
+                "source": "https://github.com/symfony/clock/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -5401,25 +5537,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.4",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+                "reference": "d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d",
+                "reference": "d7bca2fe05241dc7732d0c8b6d551b879f5d0a7d",
                 "shasum": ""
             },
             "require": {
@@ -5427,7 +5567,7 @@
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^7.2"
+                "symfony/string": "^7.2|^8.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -5441,16 +5581,16 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/lock": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5484,7 +5624,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.4"
+                "source": "https://github.com/symfony/console/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -5504,20 +5644,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-22T15:31:00+00:00"
+            "time": "2026-09-18T15:55:00+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.3.0",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2"
+                "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2",
-                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/fecf40067fc8d8880ea87b8ac227600b9aadd1d0",
+                "reference": "fecf40067fc8d8880ea87b8ac227600b9aadd1d0",
                 "shasum": ""
             },
             "require": {
@@ -5553,7 +5693,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.3.0"
+                "source": "https://github.com/symfony/css-selector/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -5564,25 +5704,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-08-23T10:03:40+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+                "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/f3202fa1b5097b0af062dc978b32ecf63404e31d",
+                "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d",
                 "shasum": ""
             },
             "require": {
@@ -5595,7 +5739,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -5620,7 +5764,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.1"
             },
             "funding": [
                 {
@@ -5631,41 +5775,46 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-06-05T06:23:12+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.3.4",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "99f81bc944ab8e5dae4f21b4ca9972698bbad0e4"
+                "reference": "82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/99f81bc944ab8e5dae4f21b4ca9972698bbad0e4",
-                "reference": "99f81bc944ab8e5dae4f21b4ca9972698bbad0e4",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0",
+                "reference": "82239fe00f7cdc9f17c4166fff4ebdc22bd26ec0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/polyfill-php85": "^1.32",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
                 "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0",
                 "symfony/webpack-encore-bundle": "^1.0|^2.0"
             },
             "bin": [
@@ -5697,7 +5846,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.3.4"
+                "source": "https://github.com/symfony/error-handler/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -5717,20 +5866,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2026-09-22T18:56:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.3.3",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
+                "reference": "d269974ee93c61d03620ffee358355bfdb471d66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
-                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d269974ee93c61d03620ffee358355bfdb471d66",
+                "reference": "d269974ee93c61d03620ffee358355bfdb471d66",
                 "shasum": ""
             },
             "require": {
@@ -5747,13 +5896,14 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^6.4|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5781,7 +5931,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -5801,20 +5951,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T11:49:31+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+                "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c7de7a00ffb67842132da02ea92988a39ccd9f4e",
+                "reference": "c7de7a00ffb67842132da02ea92988a39ccd9f4e",
                 "shasum": ""
             },
             "require": {
@@ -5828,7 +5978,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -5861,7 +6011,77 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-06-05T06:23:12+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v7.4.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "90d412aa5277c6819db39e7605aa46b1019e3232"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/90d412aa5277c6819db39e7605aa46b1019e3232",
+                "reference": "90d412aa5277c6819db39e7605aa46b1019e3232",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -5872,32 +6092,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-08-23T10:03:40+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.2",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+                "reference": "2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e",
+                "reference": "2dd31e5208db7a0fda7bfc998ad727b79c2e4d1e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.4|^7.0"
+                "symfony/filesystem": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5925,7 +6149,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+                "source": "https://github.com/symfony/finder/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -5945,27 +6169,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2026-09-26T06:31:10+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.4",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "c061c7c18918b1b64268771aad04b40be41dd2e6"
+                "reference": "9d0761c0da6bd5b801b401666834901a9a1ffc33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c061c7c18918b1b64268771aad04b40be41dd2e6",
-                "reference": "c061c7c18918b1b64268771aad04b40be41dd2e6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9d0761c0da6bd5b801b401666834901a9a1ffc33",
+                "reference": "9d0761c0da6bd5b801b401666834901a9a1ffc33",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.5|^3.0",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php83": "^1.27"
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "^1.1"
             },
             "conflict": {
                 "doctrine/dbal": "<3.6",
@@ -5974,13 +6197,13 @@
             "require-dev": {
                 "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.4.12|^7.1.5",
-                "symfony/clock": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/mime": "^6.4|^7.0",
-                "symfony/rate-limiter": "^6.4|^7.0"
+                "symfony/cache": "^6.4.12|^7.1.5|^8.0",
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^6.4|^7.0|^8.0",
+                "symfony/rate-limiter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -6008,7 +6231,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -6028,29 +6251,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-16T08:38:17+00:00"
+            "time": "2026-09-24T07:12:44+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.3.4",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b796dffea7821f035047235e076b60ca2446e3cf"
+                "reference": "392784b5d7b959b8d872542a2530c50c540a788f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b796dffea7821f035047235e076b60ca2446e3cf",
-                "reference": "b796dffea7821f035047235e076b60ca2446e3cf",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/392784b5d7b959b8d872542a2530c50c540a788f",
+                "reference": "392784b5d7b959b8d872542a2530c50c540a788f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^7.3",
-                "symfony/http-foundation": "^7.3",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^7.3|^8.0",
+                "symfony/http-foundation": "^7.4|^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -6060,6 +6283,7 @@
                 "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
                 "symfony/doctrine-bridge": "<6.4",
+                "symfony/flex": "<2.10",
                 "symfony/form": "<6.4",
                 "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
@@ -6077,28 +6301,28 @@
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^6.4|^7.0",
-                "symfony/clock": "^6.4|^7.0",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/console": "^6.4|^7.0",
-                "symfony/css-selector": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/dom-crawler": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/finder": "^6.4|^7.0",
+                "symfony/browser-kit": "^6.4|^7.0|^8.0",
+                "symfony/clock": "^6.4|^7.0|^8.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/css-selector": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4.1|^7.0.1|^8.0",
+                "symfony/dom-crawler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/property-access": "^7.1",
-                "symfony/routing": "^6.4|^7.0",
-                "symfony/serializer": "^7.1",
-                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/translation": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^7.1|^8.0",
+                "symfony/routing": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^7.1|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/translation": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^6.4|^7.0",
-                "symfony/validator": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0",
-                "symfony/var-exporter": "^6.4|^7.0",
-                "twig/twig": "^3.12"
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "symfony/validator": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symfony/var-exporter": "^6.4|^7.0|^8.0",
+                "twig/twig": "^3.12|^4.0"
             },
             "type": "library",
             "autoload": {
@@ -6126,7 +6350,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -6146,20 +6370,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-27T12:32:17+00:00"
+            "time": "2026-09-29T14:05:16+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.3.4",
+            "version": "v7.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "ab97ef2f7acf0216955f5845484235113047a31d"
+                "reference": "6f6f2441bef07a42d2617b9b3aadf04a321aa514"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/ab97ef2f7acf0216955f5845484235113047a31d",
-                "reference": "ab97ef2f7acf0216955f5845484235113047a31d",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/6f6f2441bef07a42d2617b9b3aadf04a321aa514",
+                "reference": "6f6f2441bef07a42d2617b9b3aadf04a321aa514",
                 "shasum": ""
             },
             "require": {
@@ -6167,8 +6391,8 @@
                 "php": ">=8.2",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/mime": "^7.2",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/mime": "^7.2|^8.0",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
@@ -6179,10 +6403,10 @@
                 "symfony/twig-bridge": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^6.4|^7.0",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/twig-bridge": "^6.4|^7.0"
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/twig-bridge": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -6210,7 +6434,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.4"
+                "source": "https://github.com/symfony/mailer/tree/v7.4.19"
             },
             "funding": [
                 {
@@ -6230,43 +6454,44 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-17T05:51:54+00:00"
+            "time": "2026-09-15T06:01:15+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.3.4",
+            "version": "v7.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "b1b828f69cbaf887fa835a091869e55df91d0e35"
+                "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/b1b828f69cbaf887fa835a091869e55df91d0e35",
-                "reference": "b1b828f69cbaf887fa835a091869e55df91d0e35",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693",
+                "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
             "conflict": {
                 "egulias/email-validator": "~3.0.0",
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
+                "phpdocumentor/reflection-docblock": "<5.2|>=7",
+                "phpdocumentor/type-resolver": "<1.5.1",
                 "symfony/mailer": "<6.4",
                 "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/property-access": "^6.4|^7.0",
-                "symfony/property-info": "^6.4|^7.0",
-                "symfony/serializer": "^6.4.3|^7.0.3"
+                "phpdocumentor/reflection-docblock": "^5.2|^6.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/property-access": "^6.4|^7.0|^8.0",
+                "symfony/property-info": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4.44|^7.4.17|^8.1.5"
             },
             "type": "library",
             "autoload": {
@@ -6298,7 +6523,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.3.4"
+                "source": "https://github.com/symfony/mime/tree/v7.4.19"
             },
             "funding": [
                 {
@@ -6318,20 +6543,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-16T08:38:17+00:00"
+            "time": "2026-09-04T10:45:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.33.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
@@ -6381,7 +6606,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -6401,20 +6626,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+                "reference": "5cac8f4db97208823aa353f59a01faad2da52c75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5cac8f4db97208823aa353f59a01faad2da52c75",
+                "reference": "5cac8f4db97208823aa353f59a01faad2da52c75",
                 "shasum": ""
             },
             "require": {
@@ -6463,7 +6688,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6483,20 +6708,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T09:58:17+00:00"
+            "time": "2026-09-25T15:46:47+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
+                "reference": "533d68cf99c8f8ee2e8893c59ed59192e92cfd74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
-                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/533d68cf99c8f8ee2e8893c59ed59192e92cfd74",
+                "reference": "533d68cf99c8f8ee2e8893c59ed59192e92cfd74",
                 "shasum": ""
             },
             "require": {
@@ -6550,7 +6775,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6570,20 +6795,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-10T14:38:51+00:00"
+            "time": "2026-09-23T14:40:04+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
+                "reference": "ebd57ccc7edb93d632e184efbe7693d2517bab3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/ebd57ccc7edb93d632e184efbe7693d2517bab3b",
+                "reference": "ebd57ccc7edb93d632e184efbe7693d2517bab3b",
                 "shasum": ""
             },
             "require": {
@@ -6635,7 +6860,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6655,20 +6880,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-09-23T22:02:09+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+                "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/4d5d331bf731e0aedbc6b2f5e61135b7b7996a72",
+                "reference": "4d5d331bf731e0aedbc6b2f5e61135b7b7996a72",
                 "shasum": ""
             },
             "require": {
@@ -6720,7 +6945,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6740,20 +6965,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-23T08:48:59+00:00"
+            "time": "2026-09-24T15:19:04+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+                "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74",
+                "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74",
                 "shasum": ""
             },
             "require": {
@@ -6804,7 +7029,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6824,20 +7049,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-02T08:10:11+00:00"
+            "time": "2026-09-25T15:50:05+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
+                "reference": "80ccff923a8d61f73ebe9da0aa94e25232f004ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
-                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/80ccff923a8d61f73ebe9da0aa94e25232f004ce",
+                "reference": "80ccff923a8d61f73ebe9da0aa94e25232f004ce",
                 "shasum": ""
             },
             "require": {
@@ -6884,7 +7109,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6904,20 +7129,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-08T02:45:35+00:00"
+            "time": "2026-09-25T15:50:05+00:00"
         },
         {
             "name": "symfony/polyfill-php84",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php84.git",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+                "reference": "22c6548499cbe5c5bb072fc0c42312dff062a015"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/22c6548499cbe5c5bb072fc0c42312dff062a015",
+                "reference": "22c6548499cbe5c5bb072fc0c42312dff062a015",
                 "shasum": ""
             },
             "require": {
@@ -6964,7 +7189,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -6984,20 +7209,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-24T13:30:11+00:00"
+            "time": "2026-09-23T22:01:09+00:00"
         },
         {
             "name": "symfony/polyfill-php85",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php85.git",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91"
+                "reference": "86a42cbcc07adc331481a5ab310a4024bfc227f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/86a42cbcc07adc331481a5ab310a4024bfc227f6",
+                "reference": "86a42cbcc07adc331481a5ab310a4024bfc227f6",
                 "shasum": ""
             },
             "require": {
@@ -7044,7 +7269,87 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.43.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-09-25T15:46:47+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php86",
+            "version": "v1.43.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php86.git",
+                "reference": "8840df45b24f33a49dc419fa18dc0057231ae1d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php86/zipball/8840df45b24f33a49dc419fa18dc0057231ae1d8",
+                "reference": "8840df45b24f33a49dc419fa18dc0057231ae1d8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php86\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.6+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php86/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -7064,20 +7369,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-23T16:12:55+00:00"
+            "time": "2026-09-25T15:46:47+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.33.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
+                "reference": "b23ff8245cc5c4479ea2be3d0132d2e6dd433993"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
-                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/b23ff8245cc5c4479ea2be3d0132d2e6dd433993",
+                "reference": "b23ff8245cc5c4479ea2be3d0132d2e6dd433993",
                 "shasum": ""
             },
             "require": {
@@ -7127,7 +7432,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -7147,20 +7452,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-09-24T05:20:52+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v7.3.4",
+            "version": "v7.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
+                "reference": "ed0ae095b86994d370d5791612e55984f15aa30e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
-                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/ed0ae095b86994d370d5791612e55984f15aa30e",
+                "reference": "ed0ae095b86994d370d5791612e55984f15aa30e",
                 "shasum": ""
             },
             "require": {
@@ -7192,7 +7497,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.4"
+                "source": "https://github.com/symfony/process/tree/v7.4.19"
             },
             "funding": [
                 {
@@ -7212,20 +7517,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2026-09-02T12:38:34+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.3.4",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8dc648e159e9bac02b703b9fbd937f19ba13d07c"
+                "reference": "2bacb72be5eadeaf9874d5accb75bfb33d21c74b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8dc648e159e9bac02b703b9fbd937f19ba13d07c",
-                "reference": "8dc648e159e9bac02b703b9fbd937f19ba13d07c",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/2bacb72be5eadeaf9874d5accb75bfb33d21c74b",
+                "reference": "2bacb72be5eadeaf9874d5accb75bfb33d21c74b",
                 "shasum": ""
             },
             "require": {
@@ -7239,11 +7544,11 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/expression-language": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/yaml": "^6.4|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/yaml": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -7277,7 +7582,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.3.4"
+                "source": "https://github.com/symfony/routing/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -7297,20 +7602,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2026-09-28T19:09:50+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
                 "shasum": ""
             },
             "require": {
@@ -7328,7 +7633,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -7364,7 +7669,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.3"
             },
             "funding": [
                 {
@@ -7375,31 +7680,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-25T09:37:31+00:00"
+            "time": "2026-07-27T15:39:01+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.3.4",
+            "version": "v7.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f96476035142921000338bad71e5247fbc138872"
+                "reference": "02731ce2bd26514bec9efc0baef2cd0b0cf67f46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
-                "reference": "f96476035142921000338bad71e5247fbc138872",
+                "url": "https://api.github.com/repos/symfony/string/zipball/02731ce2bd26514bec9efc0baef2cd0b0cf67f46",
+                "reference": "02731ce2bd26514bec9efc0baef2cd0b0cf67f46",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -7407,11 +7717,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/emoji": "^7.1",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/intl": "^6.4|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -7450,7 +7760,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.4"
+                "source": "https://github.com/symfony/string/tree/v7.4.19"
             },
             "funding": [
                 {
@@ -7470,27 +7780,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T14:36:48+00:00"
+            "time": "2026-09-11T14:46:58+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.3.4",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "ec25870502d0c7072d086e8ffba1420c85965174"
+                "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/ec25870502d0c7072d086e8ffba1420c85965174",
-                "reference": "ec25870502d0c7072d086e8ffba1420c85965174",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/2ee1e4a3b32a528a642babe041ff7c440b213b4b",
+                "reference": "2ee1e4a3b32a528a642babe041ff7c440b213b4b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^2.5|^3.0"
+                "symfony/translation-contracts": "^2.5.3|^3.3"
             },
             "conflict": {
                 "nikic/php-parser": "<5.0",
@@ -7509,17 +7819,17 @@
             "require-dev": {
                 "nikic/php-parser": "^5.0",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/console": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/finder": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/finder": "^6.4|^7.0|^8.0",
                 "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/intl": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^6.4|^7.0",
+                "symfony/routing": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^6.4|^7.0"
+                "symfony/yaml": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -7550,7 +7860,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.4"
+                "source": "https://github.com/symfony/translation/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -7570,20 +7880,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-07T11:39:36+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d"
+                "reference": "ccb206b98faccc511ebae8e5fad50f2dc0b30621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
-                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/ccb206b98faccc511ebae8e5fad50f2dc0b30621",
+                "reference": "ccb206b98faccc511ebae8e5fad50f2dc0b30621",
                 "shasum": ""
             },
             "require": {
@@ -7596,7 +7906,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -7632,7 +7942,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.7.1"
             },
             "funding": [
                 {
@@ -7643,25 +7953,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-27T08:32:26+00:00"
+            "time": "2026-06-05T06:23:12+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v7.3.1",
+            "version": "v7.4.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb"
+                "reference": "a96bbdb02a04ff3b5592cee6741b03edc78b56aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/a69f69f3159b852651a6bf45a9fdd149520525bb",
-                "reference": "a69f69f3159b852651a6bf45a9fdd149520525bb",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/a96bbdb02a04ff3b5592cee6741b03edc78b56aa",
+                "reference": "a96bbdb02a04ff3b5592cee6741b03edc78b56aa",
                 "shasum": ""
             },
             "require": {
@@ -7669,7 +7983,7 @@
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^6.4|^7.0"
+                "symfony/console": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -7706,7 +8020,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.3.1"
+                "source": "https://github.com/symfony/uid/tree/v7.4.20"
             },
             "funding": [
                 {
@@ -7718,24 +8032,28 @@
                     "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2025-06-27T19:55:54+00:00"
+            "time": "2026-09-23T16:18:28+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.3.4",
+            "version": "v7.4.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb"
+                "reference": "e088da50b813f32473a76871616cbb8fa54653a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb",
-                "reference": "b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e088da50b813f32473a76871616cbb8fa54653a8",
+                "reference": "e088da50b813f32473a76871616cbb8fa54653a8",
                 "shasum": ""
             },
             "require": {
@@ -7747,11 +8065,11 @@
                 "symfony/console": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/uid": "^6.4|^7.0",
-                "twig/twig": "^3.12"
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "twig/twig": "^3.12|^4.0"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -7789,7 +8107,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.18"
             },
             "funding": [
                 {
@@ -7809,27 +8127,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:12:26+00:00"
+            "time": "2026-08-30T20:10:52+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "v2.3.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "0d72ac1c00084279c1816675284073c5a337c20d"
+                "reference": "f0292ccf0ec75843d65027214426b6b163b48b41"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d",
-                "reference": "0d72ac1c00084279c1816675284073c5a337c20d",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/f0292ccf0ec75843d65027214426b6b163b48b41",
+                "reference": "f0292ccf0ec75843d65027214426b6b163b48b41",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "php": "^7.4 || ^8.0",
-                "symfony/css-selector": "^5.4 || ^6.0 || ^7.0"
+                "symfony/css-selector": "^5.4 || ^6.0 || ^7.0 || ^8.0"
             },
             "require-dev": {
                 "phpstan/phpstan": "^2.0",
@@ -7862,32 +8180,32 @@
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             "support": {
                 "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0"
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.4.0"
             },
-            "time": "2024-12-21T16:25:41+00:00"
+            "time": "2025-12-02T11:56:42+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.2",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af"
+                "url": "https://github.com/phpdotenv/phpdotenv.git",
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
-                "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af",
+                "url": "https://api.github.com/repos/phpdotenv/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40",
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.3",
+                "graham-campbell/result-type": "^1.2",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.3",
-                "symfony/polyfill-ctype": "^1.24",
-                "symfony/polyfill-mbstring": "^1.24",
-                "symfony/polyfill-php80": "^1.24"
+                "phpoption/phpoption": "^1.10",
+                "symfony/polyfill-ctype": "^1.26",
+                "symfony/polyfill-mbstring": "^1.26",
+                "symfony/polyfill-php80": "^1.26"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
@@ -7928,7 +8246,7 @@
                     "homepage": "https://github.com/vlucas"
                 }
             ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "description": "Loads environment variables from `.env` to `$_ENV` and `$_SERVER` automagically, and optionally to `getenv()`.",
             "keywords": [
                 "dotenv",
                 "env",
@@ -7936,7 +8254,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.7.0"
             },
             "funding": [
                 {
@@ -7948,27 +8266,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-30T23:37:27+00:00"
+            "time": "2026-08-24T18:07:49+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "2.0.3",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
+                "reference": "8e1051fe39379367aecf014f41744ce7539a856f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
-                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/8e1051fe39379367aecf014f41744ce7539a856f",
+                "reference": "8e1051fe39379367aecf014f41744ce7539a856f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+                "phpunit/phpunit": "~8.5 || ~9.6 || ~10.5 || ~11.5"
             },
             "suggest": {
                 "ext-intl": "Use Intl for transliterator_transliterate() support"
@@ -7998,7 +8316,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
+                "source": "https://github.com/voku/portable-ascii/tree/2.1.1"
             },
             "funding": [
                 {
@@ -8022,43 +8340,39 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-21T01:49:47+00:00"
+            "time": "2026-04-26T05:33:54+00:00"
         },
         {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
+            "name": "xemlock/htmlpurifier-html5",
+            "version": "v0.1.12",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+                "url": "https://github.com/xemlock/htmlpurifier-html5.git",
+                "reference": "535349cb160bf79752920e1e83c4a94c3e7d2b21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/535349cb160bf79752920e1e83c4a94c3e7d2b21",
+                "reference": "535349cb160bf79752920e1e83c4a94c3e7d2b21",
                 "shasum": ""
             },
             "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
+                "ezyang/htmlpurifier": "^4.8",
+                "php": ">=5.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
+                "masterminds/html5": "^2.7",
+                "php-coveralls/php-coveralls": "^1.1|^2.1",
+                "phpunit/phpunit": ">=4.7 <10.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
+            "suggest": {
+                "masterminds/html5": "Required to use HTMLPurifier_Lexer_HTML5"
             },
+            "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
+                "classmap": [
+                    "library/HTMLPurifier/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -8066,21 +8380,27 @@
             ],
             "authors": [
                 {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
+                    "name": "xemlock",
+                    "email": "xemlock@gmail.com"
                 }
             ],
-            "description": "Assertions to validate method input/output with nice error messages.",
+            "description": "HTML5 support for HTML Purifier",
+            "homepage": "https://github.com/xemlock/htmlpurifier-html5",
             "keywords": [
-                "assert",
-                "check",
-                "validate"
+                "HTML5",
+                "Purifier",
+                "html",
+                "htmlpurifier",
+                "security",
+                "tidy",
+                "validator",
+                "xss"
             ],
             "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
+                "issues": "https://github.com/xemlock/htmlpurifier-html5/issues",
+                "source": "https://github.com/xemlock/htmlpurifier-html5/tree/v0.1.12"
             },
-            "time": "2022-06-03T18:03:27+00:00"
+            "time": "2026-02-09T21:03:14+00:00"
         }
     ],
     "packages-dev": [
@@ -8149,16 +8469,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.4",
+            "version": "2.18.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d"
+                "reference": "7d0a2cde892089bb09372f4366e9b960eb3001a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d",
-                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/7d0a2cde892089bb09372f4366e9b960eb3001a9",
+                "reference": "7d0a2cde892089bb09372f4366e9b960eb3001a9",
                 "shasum": ""
             },
             "require": {
@@ -8167,8 +8487,8 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^4.0 || ^5.0"
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3 || ^10.5.58",
+                "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -8208,7 +8528,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.4"
+                "source": "https://github.com/filp/whoops/tree/2.18.6"
             },
             "funding": [
                 {
@@ -8216,23 +8536,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-08T12:00:00+00:00"
+            "time": "2026-10-03T17:03:57+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v2.1.1",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487"
+                "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
-                "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b61cd040da1a4925bc90a51c074f5297e7c0fa52",
+                "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-dom": "*",
                 "php": "^7.4|^8.0"
             },
             "replace": {
@@ -8241,13 +8563,15 @@
                 "kodova/hamcrest-php": "*"
             },
             "require-dev": {
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
                 "phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0",
                 "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -8265,22 +8589,22 @@
             ],
             "support": {
                 "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.1.1"
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v3.0.0"
             },
-            "time": "2025-04-30T06:54:44+00:00"
+            "time": "2026-03-17T11:56:53+00:00"
         },
         {
             "name": "iamcal/sql-parser",
-            "version": "v0.6",
+            "version": "v0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iamcal/SQLParser.git",
-                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62"
+                "reference": "610392f38de49a44dab08dc1659960a29874c4b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/947083e2dca211a6f12fb1beb67a01e387de9b62",
-                "reference": "947083e2dca211a6f12fb1beb67a01e387de9b62",
+                "url": "https://api.github.com/repos/iamcal/SQLParser/zipball/610392f38de49a44dab08dc1659960a29874c4b8",
+                "reference": "610392f38de49a44dab08dc1659960a29874c4b8",
                 "shasum": ""
             },
             "require-dev": {
@@ -8306,9 +8630,9 @@
             "description": "MySQL schema parser",
             "support": {
                 "issues": "https://github.com/iamcal/SQLParser/issues",
-                "source": "https://github.com/iamcal/SQLParser/tree/v0.6"
+                "source": "https://github.com/iamcal/SQLParser/tree/v0.7"
             },
-            "time": "2025-03-17T16:59:46+00:00"
+            "time": "2026-01-28T22:20:33+00:00"
         },
         {
             "name": "itsgoingd/clockwork",
@@ -8388,43 +8712,43 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.7.2",
+            "version": "v3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "a761859a7487bd7d0cb8b662a7538a234d5bb5ae"
+                "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/a761859a7487bd7d0cb8b662a7538a234d5bb5ae",
-                "reference": "a761859a7487bd7d0cb8b662a7538a234d5bb5ae",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3",
+                "reference": "24ee69a7705ffc7c2cd8a3c96a5f498a4c2de5e3",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "iamcal/sql-parser": "^0.6.0",
-                "illuminate/console": "^11.44.2 || ^12.4.1",
-                "illuminate/container": "^11.44.2 || ^12.4.1",
-                "illuminate/contracts": "^11.44.2 || ^12.4.1",
-                "illuminate/database": "^11.44.2 || ^12.4.1",
-                "illuminate/http": "^11.44.2 || ^12.4.1",
-                "illuminate/pipeline": "^11.44.2 || ^12.4.1",
-                "illuminate/support": "^11.44.2 || ^12.4.1",
+                "iamcal/sql-parser": "^0.7.0",
+                "illuminate/console": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/container": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/contracts": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/database": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/http": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/pipeline": "^11.44.2 || ^12.4.1 || ^13",
+                "illuminate/support": "^11.44.2 || ^12.4.1 || ^13",
                 "php": "^8.2",
-                "phpstan/phpstan": "^2.1.28"
+                "phpstan/phpstan": "^2.3.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^13",
-                "laravel/framework": "^11.44.2 || ^12.7.2",
+                "doctrine/coding-standard": "^14",
+                "laravel/framework": "^11.44.2 || ^12.7.2 || ^13",
                 "mockery/mockery": "^1.6.12",
                 "nikic/php-parser": "^5.4",
-                "orchestra/canvas": "^v9.2.2 || ^10.0.1",
-                "orchestra/testbench-core": "^9.12.0 || ^10.1",
+                "orchestra/canvas": "^v9.2.2 || ^10.0.1 || ^11",
+                "orchestra/testbench-core": "^9.12.0 || ^10.1 || ^11",
                 "phpstan/phpstan-deprecation-rules": "^2.0.1",
-                "phpunit/phpunit": "^10.5.35 || ^11.5.15"
+                "phpunit/phpunit": "^10.5.35 || ^11.5.15 || ^12.5.8 || ^13.3.0"
             },
             "suggest": {
-                "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
+                "orchestra/testbench": "Using Larastan for analysing a package needs Testbench",
+                "phpmyadmin/sql-parser": "Install to enable Larastan's optional phpMyAdmin-based SQL parser automatically"
             },
             "type": "phpstan-extension",
             "extra": {
@@ -8465,7 +8789,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.7.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.13.0"
             },
             "funding": [
                 {
@@ -8473,33 +8797,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-19T09:03:05+00:00"
+            "time": "2026-10-07T14:14:28+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.12",
+            "version": "1.6.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
-                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/967a801bd188989a5669bd280f252d51c0fdc9ee",
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee",
                 "shasum": ""
             },
             "require": {
-                "hamcrest/hamcrest-php": "^2.0.1",
-                "lib-pcre": ">=7.0",
+                "hamcrest/hamcrest-php": "^2.0 || ^3.0",
                 "php": ">=7.3"
             },
             "conflict": {
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.6.17",
-                "symplify/easy-coding-standard": "^12.1.14"
+                "phpunit/phpunit": "^9.6.36",
+                "symplify/easy-coding-standard": "^13.2.17"
             },
             "type": "library",
             "autoload": {
@@ -8556,24 +8879,24 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2024-05-16T03:13:13+00:00"
+            "time": "2026-08-19T19:37:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.13.4",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
-                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.0"
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
@@ -8608,51 +8931,48 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
             },
             "funding": [
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
+                    "url": "https://github.com/mnapoli",
+                    "type": "github"
                 }
             ],
-            "time": "2025-08-01T08:46:24+00:00"
+            "time": "2026-08-11T10:17:44+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.8.2",
+            "version": "v8.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb"
+                "reference": "fb53eacd509a1d303858e2d20cfebf2d630254ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
-                "reference": "60207965f9b7b7a4ce15a0f75d57f9dadb105bdb",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/fb53eacd509a1d303858e2d20cfebf2d630254ec",
+                "reference": "fb53eacd509a1d303858e2d20cfebf2d630254ec",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.18.1",
-                "nunomaduro/termwind": "^2.3.1",
+                "filp/whoops": "^2.18.4",
+                "nunomaduro/termwind": "^2.4.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.3.0"
+                "symfony/console": "^7.4.14 || ^8.1.1"
             },
             "conflict": {
-                "laravel/framework": "<11.44.2 || >=13.0.0",
-                "phpunit/phpunit": "<11.5.15 || >=13.0.0"
+                "laravel/framework": "<11.48.0 || >=14.0.0",
+                "phpunit/phpunit": "<11.5.50 || >=14.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^7.8.3",
-                "larastan/larastan": "^3.4.2",
-                "laravel/framework": "^11.44.2 || ^12.18",
-                "laravel/pint": "^1.22.1",
-                "laravel/sail": "^1.43.1",
-                "laravel/sanctum": "^4.1.1",
-                "laravel/tinker": "^2.10.1",
-                "orchestra/testbench-core": "^9.12.0 || ^10.4",
-                "pestphp/pest": "^3.8.2",
-                "sebastian/environment": "^7.2.1 || ^8.0"
+                "brianium/paratest": "^7.8.5",
+                "larastan/larastan": "^3.10.0",
+                "laravel/framework": "^11.48.0 || ^12.56.0 || ^13.20.0",
+                "laravel/pint": "^1.29.3",
+                "orchestra/testbench-core": "^9.12.0 || ^10.12.1 || ^11.3.5",
+                "pestphp/pest": "^3.8.5 || ^4.7.5 || ^5.0.0",
+                "sebastian/environment": "^7.2.1 || ^8.1.2 || ^9.3.2"
             },
             "type": "library",
             "extra": {
@@ -8715,7 +9035,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-06-25T02:12:12+00:00"
+            "time": "2026-07-15T19:09:14+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -8837,11 +9157,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.30",
+            "version": "2.3.1",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
-                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6155239b488e95d26d1ebd95c6b4bb294d7f09db",
+                "reference": "6155239b488e95d26d1ebd95c6b4bb294d7f09db",
                 "shasum": ""
             },
             "require": {
@@ -8864,6 +9184,17 @@
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "Ondřej Mirtes"
+                },
+                {
+                    "name": "Markus Staab"
+                },
+                {
+                    "name": "Vincent Langlet"
+                }
+            ],
             "description": "PHPStan - PHP Static Analysis Tool",
             "keywords": [
                 "dev",
@@ -8886,39 +9217,37 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-10-02T16:07:52+00:00"
+            "time": "2026-10-08T21:09:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.11",
+            "version": "12.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4"
+                "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
-                "reference": "4f7722aa9a7b76aa775e2d9d4e95d1ea16eeeef4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7440368d94738d54f2c1de24dbd3871793bbb0dd",
+                "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.4.0",
-                "php": ">=8.2",
-                "phpunit/php-file-iterator": "^5.1.0",
-                "phpunit/php-text-template": "^4.0.1",
-                "sebastian/code-unit-reverse-lookup": "^4.0.1",
-                "sebastian/complexity": "^4.0.1",
-                "sebastian/environment": "^7.2.0",
-                "sebastian/lines-of-code": "^3.0.1",
-                "sebastian/version": "^5.0.2",
-                "theseer/tokenizer": "^1.2.3"
+                "nikic/php-parser": "^5.9.0",
+                "php": ">=8.3",
+                "phpunit/php-text-template": "^5.0.1",
+                "sebastian/complexity": "^5.0",
+                "sebastian/environment": "^8.1.2",
+                "sebastian/lines-of-code": "^4.0.1",
+                "sebastian/version": "^6.0",
+                "theseer/tokenizer": "^2.0.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.5.2"
+                "phpunit/phpunit": "^12.5.37"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -8927,7 +9256,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "11.0.x-dev"
+                    "dev-main": "12.5.x-dev"
                 }
             },
             "autoload": {
@@ -8956,7 +9285,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.11"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.8"
             },
             "funding": [
                 {
@@ -8976,32 +9305,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-27T14:37:49+00:00"
+            "time": "2026-10-03T14:03:50+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "5.1.0",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
+                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
-                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.5.33"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9029,36 +9358,48 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-08-27T05:02:59+00:00"
+            "time": "2026-08-25T14:40:53+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "5.0.1",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2"
+                "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2",
-                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/12b54e689b07a25a9b41e57736dfab6ec9ae5406",
+                "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -9066,7 +9407,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -9093,7 +9434,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
                 "security": "https://github.com/sebastianbergmann/php-invoker/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/6.0.0"
             },
             "funding": [
                 {
@@ -9101,32 +9442,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:07:44+00:00"
+            "time": "2025-02-07T04:58:58+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "4.0.1",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964"
+                "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
-                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/babab73b7ef9fae406f2eb3ee11323a61caa63d5",
+                "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.5.37"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -9153,40 +9494,52 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
                 "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/5.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/php-text-template",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T05:08:43+00:00"
+            "time": "2026-10-03T04:51:29+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "7.0.1",
+            "version": "8.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3"
+                "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
-                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc",
+                "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "7.0-dev"
+                    "dev-main": "8.0-dev"
                 }
             },
             "autoload": {
@@ -9213,7 +9566,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
                 "security": "https://github.com/sebastianbergmann/php-timer/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/8.0.0"
             },
             "funding": [
                 {
@@ -9221,60 +9574,57 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:09:35+00:00"
+            "time": "2025-02-07T04:59:38+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.42",
+            "version": "12.5.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1c6cb5dfe412af3d0dfd414cfd110e3b9cfdbc3c"
+                "reference": "1e87ad87fe57665a7f6e99a6e467329c11e851cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c6cb5dfe412af3d0dfd414cfd110e3b9cfdbc3c",
-                "reference": "1c6cb5dfe412af3d0dfd414cfd110e3b9cfdbc3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1e87ad87fe57665a7f6e99a6e467329c11e851cc",
+                "reference": "1e87ad87fe57665a7f6e99a6e467329c11e851cc",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-filter": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
-                "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.4",
+                "myclabs/deep-copy": "^1.14.0",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
-                "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.11",
-                "phpunit/php-file-iterator": "^5.1.0",
-                "phpunit/php-invoker": "^5.0.1",
-                "phpunit/php-text-template": "^4.0.1",
-                "phpunit/php-timer": "^7.0.1",
-                "sebastian/cli-parser": "^3.0.2",
-                "sebastian/code-unit": "^3.0.3",
-                "sebastian/comparator": "^6.3.2",
-                "sebastian/diff": "^6.0.2",
-                "sebastian/environment": "^7.2.1",
-                "sebastian/exporter": "^6.3.2",
-                "sebastian/global-state": "^7.0.2",
-                "sebastian/object-enumerator": "^6.0.1",
-                "sebastian/type": "^5.1.3",
-                "sebastian/version": "^5.0.2",
+                "php": ">=8.3",
+                "phpunit/php-code-coverage": "^12.5.8",
+                "phpunit/php-file-iterator": "^6.0.2",
+                "phpunit/php-invoker": "^6.0.0",
+                "phpunit/php-text-template": "^5.0.1",
+                "phpunit/php-timer": "^8.0.0",
+                "sebastian/cli-parser": "^4.2.1",
+                "sebastian/comparator": "^7.1.8",
+                "sebastian/diff": "^7.0.1",
+                "sebastian/environment": "^8.1.2",
+                "sebastian/exporter": "^7.0.3",
+                "sebastian/global-state": "^8.0.3",
+                "sebastian/object-enumerator": "^7.0.0",
+                "sebastian/recursion-context": "^7.0.1",
+                "sebastian/type": "^6.0.4",
+                "sebastian/version": "^6.0.1",
                 "staabm/side-effects-detector": "^1.0.5"
             },
-            "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files"
-            },
             "bin": [
                 "phpunit"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "11.5-dev"
+                    "dev-main": "12.5-dev"
                 }
             },
             "autoload": {
@@ -9306,56 +9656,40 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.42"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.38"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/sponsors.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
-                    "type": "tidelift"
+                    "url": "https://phpunit.de/sponsoring.html",
+                    "type": "other"
                 }
             ],
-            "time": "2025-09-28T12:09:13+00:00"
+            "time": "2026-10-05T05:49:30+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "3.0.2",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180"
+                "reference": "7d05781b13f7dec9043a629a21d086ed74582a15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180",
-                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/7d05781b13f7dec9043a629a21d086ed74582a15",
+                "reference": "7d05781b13f7dec9043a629a21d086ed74582a15",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.5.25"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "4.2-dev"
                 }
             },
             "autoload": {
@@ -9379,152 +9713,51 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
                 "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/4.2.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                }
-            ],
-            "time": "2024-07-03T04:41:36+00:00"
-        },
-        {
-            "name": "sebastian/code-unit",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64",
-                "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^11.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Collection of value objects that represent the PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "security": "https://github.com/sebastianbergmann/code-unit/security/policy",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3"
-            },
-            "funding": [
+                },
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-03-19T07:56:08+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "4.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "183a9b2632194febd219bb9246eee421dad8d45e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e",
-                "reference": "183a9b2632194febd219bb9246eee421dad8d45e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^11.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1"
-            },
-            "funding": [
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                 {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/cli-parser",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T04:45:54+00:00"
+            "time": "2026-05-17T05:29:34+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.3.2",
+            "version": "7.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8"
+                "reference": "7c65c1e79836812819705b473a90c12399542485"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85c77556683e6eee4323e4c5468641ca0237e2e8",
-                "reference": "85c77556683e6eee4323e4c5468641ca0237e2e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7c65c1e79836812819705b473a90c12399542485",
+                "reference": "7c65c1e79836812819705b473a90c12399542485",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-mbstring": "*",
-                "php": ">=8.2",
-                "sebastian/diff": "^6.0",
-                "sebastian/exporter": "^6.0"
+                "php": ">=8.3",
+                "sebastian/diff": "^7.0",
+                "sebastian/exporter": "^7.0.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.4"
+                "phpunit/phpunit": "^12.5.25"
             },
             "suggest": {
                 "ext-bcmath": "For comparing BcMath\\Number objects"
@@ -9532,7 +9765,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.3-dev"
+                    "dev-main": "7.1-dev"
                 }
             },
             "autoload": {
@@ -9572,7 +9805,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.2"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.8"
             },
             "funding": [
                 {
@@ -9592,33 +9825,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-10T08:07:46+00:00"
+            "time": "2026-05-21T04:45:25+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "4.0.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0"
+                "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0",
-                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/bad4316aba5303d0221f43f8cee37eb58d384bbb",
+                "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^5.0",
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -9642,7 +9875,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
                 "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/5.0.0"
             },
             "funding": [
                 {
@@ -9650,33 +9883,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T04:49:50+00:00"
+            "time": "2025-02-07T04:55:25+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "6.0.2",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
+                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^12.5.33",
+                "symfony/process": "^7.4.17"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -9709,35 +9942,47 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T04:53:05+00:00"
+            "time": "2026-08-25T15:35:54+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "7.2.1",
+            "version": "8.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4"
+                "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a5c75038693ad2e8d4b6c15ba2403532647830c4",
-                "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/9d32c685773823b1983e256ae4ecd48a10d6e439",
+                "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.3"
+                "phpunit/phpunit": "^12.5.26"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -9745,7 +9990,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "7.2-dev"
+                    "dev-main": "8.1-dev"
                 }
             },
             "autoload": {
@@ -9773,7 +10018,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/7.2.1"
+                "source": "https://github.com/sebastianbergmann/environment/tree/8.1.2"
             },
             "funding": [
                 {
@@ -9793,34 +10038,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-21T11:55:47+00:00"
+            "time": "2026-05-25T13:40:20+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "6.3.2",
+            "version": "7.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "70a298763b40b213ec087c51c739efcaa90bcd74"
+                "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/70a298763b40b213ec087c51c739efcaa90bcd74",
-                "reference": "70a298763b40b213ec087c51c739efcaa90bcd74",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23",
+                "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": ">=8.2",
-                "sebastian/recursion-context": "^6.0"
+                "php": ">=8.3",
+                "sebastian/recursion-context": "^7.0.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.3"
+                "phpunit/phpunit": "^12.5.25"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.3-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -9863,7 +10108,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
                 "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.2"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/7.0.3"
             },
             "funding": [
                 {
@@ -9883,35 +10128,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-24T06:12:51+00:00"
+            "time": "2026-05-20T04:37:17+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "7.0.2",
+            "version": "8.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "3be331570a721f9a4b5917f4209773de17f747d7"
+                "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7",
-                "reference": "3be331570a721f9a4b5917f4209773de17f747d7",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b164d3274d6537ab462591c5755f76a8f5b1aae9",
+                "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "sebastian/object-reflector": "^4.0",
-                "sebastian/recursion-context": "^6.0"
+                "php": ">=8.3",
+                "sebastian/object-reflector": "^5.0",
+                "sebastian/recursion-context": "^7.0.1"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.5.28"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "7.0-dev"
+                    "dev-main": "8.0-dev"
                 }
             },
             "autoload": {
@@ -9937,41 +10182,53 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
                 "security": "https://github.com/sebastianbergmann/global-state/security/policy",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.3"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T04:57:36+00:00"
+            "time": "2026-06-01T15:10:33+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "3.0.1",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a"
+                "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a",
-                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d543b8ef219dcd8da262cbb958639a96bedba10e",
+                "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^5.0",
-                "php": ">=8.2"
+                "nikic/php-parser": "^5.7.0",
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.5.25"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -9995,42 +10252,54 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
                 "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/4.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/lines-of-code",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-07-03T04:58:38+00:00"
+            "time": "2026-05-19T16:22:07+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "6.0.1",
+            "version": "7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "f5b498e631a74204185071eb41f33f38d64608aa"
+                "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa",
-                "reference": "f5b498e631a74204185071eb41f33f38d64608aa",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1effe8e9b8e068e9ae228e542d5d11b5d16db894",
+                "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
-                "sebastian/object-reflector": "^4.0",
-                "sebastian/recursion-context": "^6.0"
+                "php": ">=8.3",
+                "sebastian/object-reflector": "^5.0",
+                "sebastian/recursion-context": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -10053,7 +10322,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
                 "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1"
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/7.0.0"
             },
             "funding": [
                 {
@@ -10061,32 +10330,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:00:13+00:00"
+            "time": "2025-02-07T04:57:48+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "4.0.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9"
+                "reference": "4bfa827c969c98be1e527abd576533293c634f6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9",
-                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/4bfa827c969c98be1e527abd576533293c634f6a",
+                "reference": "4bfa827c969c98be1e527abd576533293c634f6a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -10109,7 +10378,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
                 "security": "https://github.com/sebastianbergmann/object-reflector/security/policy",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1"
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/5.0.0"
             },
             "funding": [
                 {
@@ -10117,32 +10386,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:01:32+00:00"
+            "time": "2025-02-07T04:58:17+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "6.0.3",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc"
+                "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/f6458abbf32a6c8174f8f26261475dc133b3d9dc",
-                "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/0b01998a7d5b1f122911a66bebcb8d46f0c82d8c",
+                "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.3"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -10173,7 +10442,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
                 "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.3"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.1"
             },
             "funding": [
                 {
@@ -10193,32 +10462,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T04:42:22+00:00"
+            "time": "2025-08-13T04:44:59+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "5.1.3",
+            "version": "6.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449"
+                "reference": "82ff822c2edc46724be9f7411d3163021f602773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f77d2d4e78738c98d9a68d2596fe5e8fa380f449",
-                "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/82ff822c2edc46724be9f7411d3163021f602773",
+                "reference": "82ff822c2edc46724be9f7411d3163021f602773",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.3"
+                "phpunit/phpunit": "^12.5.25"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -10242,7 +10511,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "security": "https://github.com/sebastianbergmann/type/security/policy",
-                "source": "https://github.com/sebastianbergmann/type/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/type/tree/6.0.4"
             },
             "funding": [
                 {
@@ -10262,29 +10531,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-09T06:55:48+00:00"
+            "time": "2026-05-20T06:45:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "5.0.2",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
+                "reference": "9e935a16187e14f39b0e79910dabd614972cdb26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
-                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/9e935a16187e14f39b0e79910dabd614972cdb26",
+                "reference": "9e935a16187e14f39b0e79910dabd614972cdb26",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -10308,49 +10577,61 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
                 "security": "https://github.com/sebastianbergmann/version/security/policy",
-                "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
+                "source": "https://github.com/sebastianbergmann/version/tree/6.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/version",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2024-10-09T05:16:32+00:00"
+            "time": "2026-10-04T05:50:08+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.4",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119"
+                "reference": "bbdc3d0532623e21838b7041a4364383a8126f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/bbdc3d0532623e21838b7041a4364383a8126f96",
+                "reference": "bbdc3d0532623e21838b7041a4364383a8126f96",
                 "shasum": ""
             },
             "require": {
+                "ext-libxml": "*",
                 "ext-simplexml": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
+                "php": ">=7.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+                "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31"
+            },
+            "suggest": {
+                "ext-iconv": "For accurate character length calculation when the checked files contain multi-byte characters.",
+                "ext-pcntl": "For parallel processing support via the --parallel CLI option."
             },
             "bin": [
                 "bin/phpcbf",
                 "bin/phpcs"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
@@ -10369,7 +10650,7 @@
                     "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.",
             "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
@@ -10400,25 +10681,26 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-09-05T05:47:09+00:00"
+            "time": "2026-08-06T02:45:27+00:00"
         },
         {
             "name": "ssddanbrown/asserthtml",
-            "version": "v3.1.0",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://codeberg.org/danb/asserthtml",
-                "reference": "cf8206171d667d43e1bdde17d67191f30e95c8a0"
+                "reference": "0811b5c8d541f344c193bd7f2c2d79d13d23b141"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://codeberg.org/api/v1/repos/danb/asserthtml/archive/%prettyVersion%.zip"
+                "url": "https://codeberg.org/api/v1/repos/danb/asserthtml/archive/%prettyVersion%.zip",
+                "reference": "0811b5c8d541f344c193bd7f2c2d79d13d23b141"
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
                 "php": ">=8.1",
-                "phpunit/phpunit": "^10.0|^11.0",
+                "phpunit/phpunit": "^10.0|^11.0|^12.0|^13.0",
                 "symfony/css-selector": "^6.0|^7.0",
                 "symfony/dom-crawler": "^6.0|^7.0"
             },
@@ -10444,7 +10726,7 @@
             ],
             "description": "HTML Content Assertions for PHPUnit",
             "homepage": "https://codeberg.org/danb/asserthtml",
-            "time": "2025-01-11T13:35:55+00:00"
+            "time": "2026-03-04T14:19:44+00:00"
         },
         {
             "name": "staabm/side-effects-detector",
@@ -10500,26 +10782,27 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v7.3.3",
+            "version": "v7.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba"
+                "reference": "6b037d62595666cf65de867073c9a1f00184be0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/efa076ea0eeff504383ff0dcf827ea5ce15690ba",
-                "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6b037d62595666cf65de867073c9a1f00184be0c",
+                "reference": "6b037d62595666cf65de867073c9a1f00184be0c",
                 "shasum": ""
             },
             "require": {
                 "masterminds/html5": "^2.6",
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "^6.4|^7.0"
+                "symfony/css-selector": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -10547,7 +10830,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v7.3.3"
+                "source": "https://github.com/symfony/dom-crawler/tree/v7.4.17"
             },
             "funding": [
                 {
@@ -10567,27 +10850,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-06T20:13:54+00:00"
+            "time": "2026-08-21T17:40:08+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/7989e43bf381af0eac72e4f0ca5bcbfa81658be4",
+                "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^8.1"
             },
             "type": "library",
             "autoload": {
@@ -10609,7 +10892,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/2.0.1"
             },
             "funding": [
                 {
@@ -10617,7 +10900,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2025-12-08T11:19:18+00:00"
         }
     ],
     "aliases": [],
@@ -10626,19 +10909,18 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.2.0",
+        "php": "^8.3.0",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-xml": "*",
         "ext-zip": "*"
     },
     "platform-dev": {},
     "platform-overrides": {
-        "php": "8.2.0"
+        "php": "8.3.0"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/crowdin.yml b/crowdin.yml
index 32f2ad05225..53869eabdf3 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,9 +1,13 @@
+project_id: "377219"
 project_identifier: bookstack
+api_token_env: CROWDIN_PERSONAL_TOKEN
+
 base_path: .
 preserve_hierarchy: false
 pull_request_title: Updated translations with latest Crowdin changes
 pull_request_labels:
-  - ":earth_africa: Translations"
+  - "Translations"
+
 files:
   - source: /lang/en/*.php
     translation: /lang/%two_letters_code%/%original_file_name%
diff --git a/database/factories/Access/Mfa/MfaValueFactory.php b/database/factories/Access/Mfa/MfaValueFactory.php
new file mode 100644
index 00000000000..03036b6086e
--- /dev/null
+++ b/database/factories/Access/Mfa/MfaValueFactory.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Database\Factories\Access\Mfa;
+
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Access\Mfa\MfaValue>
+ */
+class MfaValueFactory extends Factory
+{
+    protected $model = \BookStack\Access\Mfa\MfaValue::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'method' => 'totp',
+            'value' => '123456',
+        ];
+    }
+}
diff --git a/database/factories/Access/SocialAccountFactory.php b/database/factories/Access/SocialAccountFactory.php
new file mode 100644
index 00000000000..814f47b5884
--- /dev/null
+++ b/database/factories/Access/SocialAccountFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories\Access;
+
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Access\SocialAccount>
+ */
+class SocialAccountFactory extends Factory
+{
+    protected $model = \BookStack\Access\SocialAccount::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'driver' => 'github',
+            'driver_id' => '123456',
+            'avatar' => '',
+        ];
+    }
+}
diff --git a/database/factories/Activity/Models/ActivityFactory.php b/database/factories/Activity/Models/ActivityFactory.php
new file mode 100644
index 00000000000..06ec07ced06
--- /dev/null
+++ b/database/factories/Activity/Models/ActivityFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Database\Factories\Activity\Models;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Activity\Models\Activity>
+ */
+class ActivityFactory extends Factory
+{
+    protected $model = \BookStack\Activity\Models\Activity::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        $activities = ActivityType::all();
+        $activity = $activities[array_rand($activities)];
+        return [
+            'type' => $activity,
+            'detail' => 'Activity detail for ' . $activity,
+            'user_id' => User::factory(),
+            'ip' => $this->faker->ipv4(),
+            'loggable_id' => null,
+            'loggable_type' => null,
+        ];
+    }
+}
diff --git a/database/factories/Activity/Models/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
index 844bc399381..2b7fb9ac901 100644
--- a/database/factories/Activity/Models/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -2,6 +2,7 @@
 
 namespace Database\Factories\Activity\Models;
 
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CommentFactory extends Factory
@@ -13,6 +14,11 @@ class CommentFactory extends Factory
      */
     protected $model = \BookStack\Activity\Models\Comment::class;
 
+    /**
+     * A static counter to provide a unique local_id for each comment.
+     */
+    protected static int $nextLocalId = 1000;
+
     /**
      * Define the model's default state.
      *
@@ -22,13 +28,18 @@ public function definition()
     {
         $text = $this->faker->paragraph(1);
         $html = '<p>' . $text . '</p>';
+        $nextLocalId = static::$nextLocalId++;
+
+        $user = User::query()->first();
 
         return [
             'html'      => $html,
             'parent_id' => null,
-            'local_id'  => 1,
+            'local_id'  => $nextLocalId,
             'content_ref' => '',
             'archived' => false,
+            'created_by' => $user ?? User::factory(),
+            'updated_by' => $user ?? User::factory(),
         ];
     }
 }
diff --git a/database/factories/Activity/Models/FavouriteFactory.php b/database/factories/Activity/Models/FavouriteFactory.php
new file mode 100644
index 00000000000..75fba86b371
--- /dev/null
+++ b/database/factories/Activity/Models/FavouriteFactory.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Database\Factories\Activity\Models;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Activity\Models\Favourite>
+ */
+class FavouriteFactory extends Factory
+{
+    protected $model = \BookStack\Activity\Models\Favourite::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        $book = Book::query()->first();
+
+        return [
+            'user_id' => User::factory(),
+            'favouritable_id' => $book->id,
+            'favouritable_type' => 'book',
+        ];
+    }
+}
diff --git a/database/factories/Activity/Models/WatchFactory.php b/database/factories/Activity/Models/WatchFactory.php
new file mode 100644
index 00000000000..0f8b9e6f759
--- /dev/null
+++ b/database/factories/Activity/Models/WatchFactory.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Database\Factories\Activity\Models;
+
+use BookStack\Activity\WatchLevels;
+use BookStack\Entities\Models\Book;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Activity\Models\Watch>
+ */
+class WatchFactory extends Factory
+{
+    protected $model = \BookStack\Activity\Models\Watch::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        $book = Book::factory()->create();
+
+        return [
+            'user_id' => User::factory(),
+            'watchable_id' => $book->id,
+            'watchable_type' => 'book',
+            'level' => WatchLevels::NEW,
+        ];
+    }
+}
diff --git a/database/factories/Entities/Models/ChapterFactory.php b/database/factories/Entities/Models/ChapterFactory.php
index 1fc49933ef7..abf554ac894 100644
--- a/database/factories/Entities/Models/ChapterFactory.php
+++ b/database/factories/Entities/Models/ChapterFactory.php
@@ -26,7 +26,8 @@ public function definition()
             'name'        => $this->faker->sentence(),
             'slug'        => Str::random(10),
             'description' => $description,
-            'description_html' => '<p>' . e($description) . '</p>'
+            'description_html' => '<p>' . e($description) . '</p>',
+            'priority' => 5,
         ];
     }
 }
diff --git a/database/factories/Entities/Models/DeletionFactory.php b/database/factories/Entities/Models/DeletionFactory.php
new file mode 100644
index 00000000000..2368447cd72
--- /dev/null
+++ b/database/factories/Entities/Models/DeletionFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories\Entities\Models;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Entities\Models\Deletion>
+ */
+class DeletionFactory extends Factory
+{
+    protected $model = \BookStack\Entities\Models\Deletion::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'deleted_by' => User::factory(),
+            'deletable_id' => Page::factory(),
+            'deletable_type' => 'page',
+        ];
+    }
+}
diff --git a/database/factories/Entities/Models/PageFactory.php b/database/factories/Entities/Models/PageFactory.php
index 8115700950c..538ee5f3ec2 100644
--- a/database/factories/Entities/Models/PageFactory.php
+++ b/database/factories/Entities/Models/PageFactory.php
@@ -17,10 +17,8 @@ class PageFactory extends Factory
 
     /**
      * Define the model's default state.
-     *
-     * @return array
      */
-    public function definition()
+    public function definition(): array
     {
         $html = '<p>' . implode('</p>', $this->faker->paragraphs(5)) . '</p>';
 
@@ -31,6 +29,7 @@ public function definition()
             'text'           => strip_tags($html),
             'revision_count' => 1,
             'editor'         => 'wysiwyg',
+            'priority'       => 1,
         ];
     }
 }
diff --git a/database/factories/Entities/Models/PageRevisionFactory.php b/database/factories/Entities/Models/PageRevisionFactory.php
new file mode 100644
index 00000000000..180cf435c4a
--- /dev/null
+++ b/database/factories/Entities/Models/PageRevisionFactory.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Database\Factories\Entities\Models;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class PageRevisionFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = \BookStack\Entities\Models\PageRevision::class;
+
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        $html = '<p>' . implode('</p>', $this->faker->paragraphs(5)) . '</p>';
+        $page = Page::query()->first();
+
+        return [
+            'page_id'        => $page->id,
+            'name'           => $this->faker->sentence(),
+            'html'           => $html,
+            'text'           => strip_tags($html),
+            'created_by'     => User::factory(),
+            'slug'           => $page->slug,
+            'book_slug'      => $page->book->slug,
+            'markdown'       => strip_tags($html),
+            'summary'        => $this->faker->sentence(),
+            'revision_number' => rand(1, 4000),
+        ];
+    }
+}
diff --git a/database/factories/Entities/Models/PageUpdateDraftFactory.php b/database/factories/Entities/Models/PageUpdateDraftFactory.php
new file mode 100644
index 00000000000..fc6168c98cc
--- /dev/null
+++ b/database/factories/Entities/Models/PageUpdateDraftFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Database\Factories\Entities\Models;
+
+use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class PageUpdateDraftFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = \BookStack\Entities\Models\PageUpdateDraft::class;
+
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        $html = '<p>' . implode('</p>', $this->faker->paragraphs(5)) . '</p>';
+        $page = Page::query()->first();
+
+        return [
+            'page_id'        => $page->id,
+            'name'           => $this->faker->sentence(),
+            'html'           => $html,
+            'markdown'       => strip_tags($html),
+            'summary'        => $this->faker->sentence(),
+            'created_by'     => User::factory(),
+        ];
+    }
+}
diff --git a/database/factories/Entities/Models/SlugHistoryFactory.php b/database/factories/Entities/Models/SlugHistoryFactory.php
new file mode 100644
index 00000000000..c8c57e09c5f
--- /dev/null
+++ b/database/factories/Entities/Models/SlugHistoryFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories\Entities\Models;
+
+use BookStack\Entities\Models\Book;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\BookStack\Entities\Models\SlugHistory>
+ */
+class SlugHistoryFactory extends Factory
+{
+    protected $model = \BookStack\Entities\Models\SlugHistory::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'sluggable_id' => Book::factory(),
+            'sluggable_type' => 'book',
+            'slug' => $this->faker->slug(),
+            'parent_slug' => null,
+        ];
+    }
+}
diff --git a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
index 0e25c1d6052..a8f1843ed92 100644
--- a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
+++ b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
@@ -25,9 +25,6 @@ public function up(): void
                 $table->unsignedInteger('owner_id')->nullable()->index();
             });
         }
-
-        // Rebuild permissions
-        app(JointPermissionBuilder::class)->rebuildForAll();
     }
 
     /**
diff --git a/database/migrations/2025_09_15_132850_create_entities_table.php b/database/migrations/2025_09_15_132850_create_entities_table.php
new file mode 100644
index 00000000000..6c890d7191d
--- /dev/null
+++ b/database/migrations/2025_09_15_132850_create_entities_table.php
@@ -0,0 +1,71 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('entities', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('type', 10)->index();
+            $table->string('name');
+            $table->string('slug')->index();
+
+            $table->unsignedBigInteger('book_id')->nullable()->index();
+            $table->unsignedBigInteger('chapter_id')->nullable()->index();
+            $table->unsignedInteger('priority')->nullable();
+
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable()->index();
+            $table->timestamp('deleted_at')->nullable()->index();
+
+            $table->unsignedInteger('created_by')->nullable();
+            $table->unsignedInteger('updated_by')->nullable();
+            $table->unsignedInteger('owned_by')->nullable()->index();
+
+            $table->primary(['id', 'type'], 'entities_pk');
+        });
+
+        Schema::create('entity_container_data', function (Blueprint $table) {
+            $table->unsignedBigInteger('entity_id');
+            $table->string('entity_type', 10);
+            $table->text('description');
+            $table->text('description_html');
+
+            $table->unsignedBigInteger('default_template_id')->nullable();
+            $table->unsignedInteger('image_id')->nullable();
+            $table->unsignedInteger('sort_rule_id')->nullable();
+
+            $table->primary(['entity_id', 'entity_type'], 'entity_container_data_pk');
+        });
+
+        Schema::create('entity_page_data', function (Blueprint $table) {
+            $table->unsignedBigInteger('page_id')->primary();
+
+            $table->boolean('draft')->index();
+            $table->boolean('template')->index();
+            $table->unsignedInteger('revision_count');
+            $table->string('editor', 50);
+
+            $table->longText('html');
+            $table->longText('text');
+            $table->longText('markdown');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('entities');
+        Schema::dropIfExists('entity_container_data');
+        Schema::dropIfExists('entity_page_data');
+    }
+};
diff --git a/database/migrations/2025_09_15_134701_migrate_entity_data.php b/database/migrations/2025_09_15_134701_migrate_entity_data.php
new file mode 100644
index 00000000000..7b4beef0673
--- /dev/null
+++ b/database/migrations/2025_09_15_134701_migrate_entity_data.php
@@ -0,0 +1,90 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Start a transaction to avoid leaving a message DB on error
+        DB::beginTransaction();
+
+        // Migrate book/shelf data to entities
+        foreach (['books' => 'book', 'bookshelves' => 'bookshelf'] as $table => $type) {
+            DB::table('entities')->insertUsing([
+                'id', 'type', 'name', 'slug', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+            ], DB::table($table)->select([
+                'id', DB::raw("'{$type}'"), 'name', 'slug', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+            ]));
+        }
+
+        // Migrate chapter data to entities
+        DB::table('entities')->insertUsing([
+            'id', 'type', 'name', 'slug', 'book_id', 'priority', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+        ], DB::table('chapters')->select([
+            'id', DB::raw("'chapter'"), 'name', 'slug', 'book_id', 'priority', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+        ]));
+
+        DB::table('entities')->insertUsing([
+            'id', 'type', 'name', 'slug', 'book_id', 'chapter_id', 'priority', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+        ], DB::table('pages')->select([
+            'id', DB::raw("'page'"), 'name', 'slug', 'book_id', 'chapter_id', 'priority', 'created_at', 'updated_at', 'deleted_at', 'created_by', 'updated_by', 'owned_by',
+        ]));
+
+        // Migrate shelf data to entity_container_data
+        DB::table('entity_container_data')->insertUsing([
+            'entity_id', 'entity_type', 'description', 'description_html', 'image_id',
+        ], DB::table('bookshelves')->select([
+            'id', DB::raw("'bookshelf'"), 'description', 'description_html', 'image_id',
+        ]));
+
+        // Migrate book data to entity_container_data
+        DB::table('entity_container_data')->insertUsing([
+            'entity_id', 'entity_type', 'description', 'description_html', 'default_template_id', 'image_id', 'sort_rule_id'
+        ], DB::table('books')->select([
+            'id', DB::raw("'book'"), 'description', 'description_html', 'default_template_id', 'image_id', 'sort_rule_id'
+        ]));
+
+        // Migrate chapter data to entity_container_data
+        DB::table('entity_container_data')->insertUsing([
+            'entity_id', 'entity_type', 'description', 'description_html', 'default_template_id',
+        ], DB::table('chapters')->select([
+            'id', DB::raw("'chapter'"), 'description', 'description_html', 'default_template_id',
+        ]));
+
+        // Migrate page data to entity_page_data
+        DB::table('entity_page_data')->insertUsing([
+            'page_id', 'draft', 'template', 'revision_count', 'editor', 'html', 'text', 'markdown',
+        ], DB::table('pages')->select([
+            'id', 'draft', 'template', 'revision_count', 'editor', 'html', 'text', 'markdown',
+        ]));
+
+        // Fix up data - Convert 0 id references to null
+        DB::table('entities')->where('created_by', '=', 0)->update(['created_by' => null]);
+        DB::table('entities')->where('updated_by', '=', 0)->update(['updated_by' => null]);
+        DB::table('entities')->where('owned_by', '=', 0)->update(['owned_by' => null]);
+        DB::table('entities')->where('chapter_id', '=', 0)->update(['chapter_id' => null]);
+
+        // Fix up data - Convert any missing id-based references to null
+        $userIdQuery = DB::table('users')->select('id');
+        DB::table('entities')->whereNotIn('created_by', $userIdQuery)->update(['created_by' => null]);
+        DB::table('entities')->whereNotIn('updated_by', $userIdQuery)->update(['updated_by' => null]);
+        DB::table('entities')->whereNotIn('owned_by', $userIdQuery)->update(['owned_by' => null]);
+        DB::table('entities')->whereNotIn('chapter_id', DB::table('chapters')->select('id'))->update(['chapter_id' => null]);
+
+        // Commit our changes within our transaction
+        DB::commit();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // No action here since the actual data remains in the database for the old tables,
+        // so data reversion actions are done in a later migration when the old tables are dropped.
+    }
+};
diff --git a/database/migrations/2025_09_15_134751_update_entity_relation_columns.php b/database/migrations/2025_09_15_134751_update_entity_relation_columns.php
new file mode 100644
index 00000000000..f8622d7c682
--- /dev/null
+++ b/database/migrations/2025_09_15_134751_update_entity_relation_columns.php
@@ -0,0 +1,125 @@
+<?php
+
+use BookStack\Permissions\JointPermissionBuilder;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * @var array<string, string|array<string>> $columnByTable
+     */
+    protected static array $columnByTable = [
+        'activities' => 'loggable_id',
+        'attachments' => 'uploaded_to',
+        'bookshelves_books' => ['bookshelf_id', 'book_id'],
+        'comments' => 'entity_id',
+        'deletions' => 'deletable_id',
+        'entity_permissions' => 'entity_id',
+        'favourites' => 'favouritable_id',
+        'images' => 'uploaded_to',
+        'joint_permissions' => 'entity_id',
+        'page_revisions' => 'page_id',
+        'references' => ['from_id', 'to_id'],
+        'search_terms' => 'entity_id',
+        'tags' => 'entity_id',
+        'views' => 'viewable_id',
+        'watches' => 'watchable_id',
+    ];
+
+    protected static array $nullable = [
+        'activities.loggable_id',
+        'images.uploaded_to',
+    ];
+
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Drop foreign key constraints
+        Schema::table('bookshelves_books', function (Blueprint $table) {
+            $table->dropForeign(['book_id']);
+            $table->dropForeign(['bookshelf_id']);
+        });
+
+        // Update column types to unsigned big integers
+        foreach (static::$columnByTable as $table => $column) {
+            $tableName = $table;
+            Schema::table($table, function (Blueprint $table) use ($tableName, $column) {
+                if (is_string($column)) {
+                    $column = [$column];
+                }
+
+                foreach ($column as $col) {
+                    if (in_array($tableName . '.' . $col, static::$nullable)) {
+                        $table->unsignedBigInteger($col)->nullable()->change();
+                    } else {
+                        $table->unsignedBigInteger($col)->change();
+                    }
+                }
+            });
+        }
+
+        // Convert image and activity zero values to null
+        DB::table('images')->where('uploaded_to', '=', 0)->update(['uploaded_to' => null]);
+        DB::table('activities')->where('loggable_id', '=', 0)->update(['loggable_id' => null]);
+
+        // Clean up any orphaned gallery/drawio images to nullify their page relation
+        DB::table('images')
+            ->whereIn('type', ['gallery', 'drawio'])
+            ->whereNotIn('uploaded_to', function (Builder $query) {
+                $query->select('id')
+                    ->from('entities')
+                    ->where('type', '=', 'page');
+            })->update(['uploaded_to' => null]);
+
+        // Rebuild joint permissions if needed
+        // This was moved here from 2023_01_24_104625_refactor_joint_permissions_storage since the changes
+        // made for this release would mean our current logic would not be compatible with
+        // the database changes being made. This is based on a count since any joint permissions
+        // would have been truncated in the previous migration.
+        if (\Illuminate\Support\Facades\DB::table('joint_permissions')->count() === 0) {
+            app(JointPermissionBuilder::class)->rebuildForAll();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Convert image null values back to zeros
+        DB::table('images')->whereNull('uploaded_to')->update(['uploaded_to' => '0']);
+
+        // Revert columns to standard integers
+        foreach (static::$columnByTable as $table => $column) {
+            $tableName = $table;
+            Schema::table($table, function (Blueprint $table) use ($tableName, $column) {
+                if (is_string($column)) {
+                    $column = [$column];
+                }
+
+                foreach ($column as $col) {
+                    if ($tableName . '.' . $col === 'activities.loggable_id') {
+                        $table->unsignedInteger($col)->nullable()->change();
+                    } else if ($tableName . '.' . $col === 'images.uploaded_to') {
+                        $table->unsignedInteger($col)->default(0)->change();
+                    } else {
+                        $table->unsignedInteger($col)->change();
+                    }
+                }
+            });
+        }
+
+        // Re-add foreign key constraints
+        Schema::table('bookshelves_books', function (Blueprint $table) {
+            $table->foreign('bookshelf_id')->references('id')->on('bookshelves')
+                ->onUpdate('cascade')->onDelete('cascade');
+            $table->foreign('book_id')->references('id')->on('books')
+                ->onUpdate('cascade')->onDelete('cascade');
+        });
+    }
+};
diff --git a/database/migrations/2025_09_15_134813_drop_old_entity_tables.php b/database/migrations/2025_09_15_134813_drop_old_entity_tables.php
new file mode 100644
index 00000000000..d6360f74db1
--- /dev/null
+++ b/database/migrations/2025_09_15_134813_drop_old_entity_tables.php
@@ -0,0 +1,162 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::dropIfExists('pages');
+        Schema::dropIfExists('chapters');
+        Schema::dropIfExists('books');
+        Schema::dropIfExists('bookshelves');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::create('pages', function (Blueprint $table) {
+            $table->unsignedInteger('id', true)->primary();
+            $table->integer('book_id')->index();
+            $table->integer('chapter_id')->index();
+            $table->string('name');
+            $table->string('slug')->index();
+            $table->longText('html');
+            $table->longText('text');
+            $table->integer('priority')->index();
+
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable()->index();
+            $table->integer('created_by')->index();
+            $table->integer('updated_by')->index();
+
+            $table->boolean('draft')->default(0)->index();
+            $table->longText('markdown');
+            $table->integer('revision_count');
+            $table->boolean('template')->default(0)->index();
+            $table->timestamp('deleted_at')->nullable();
+
+            $table->unsignedInteger('owned_by')->index();
+            $table->string('editor', 50)->default('');
+        });
+
+        Schema::create('chapters', function (Blueprint $table) {
+            $table->unsignedInteger('id', true)->primary();
+            $table->integer('book_id')->index();
+            $table->string('slug')->index();
+            $table->text('name');
+            $table->text('description');
+            $table->integer('priority')->index();
+
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable();
+            $table->integer('created_by')->index();
+            $table->integer('updated_by')->index();
+
+            $table->timestamp('deleted_at')->nullable();
+            $table->unsignedInteger('owned_by')->index();
+            $table->text('description_html');
+            $table->integer('default_template_id')->nullable();
+        });
+
+        Schema::create('books', function (Blueprint $table) {
+            $table->unsignedInteger('id', true)->primary();
+            $table->string('name');
+            $table->string('slug')->index();
+            $table->text('description');
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable();
+
+            $table->integer('created_by')->index();
+            $table->integer('updated_by')->index();
+
+            $table->integer('image_id')->nullable();
+            $table->timestamp('deleted_at')->nullable();
+            $table->unsignedInteger('owned_by')->index();
+
+            $table->integer('default_template_id')->nullable();
+            $table->text('description_html');
+            $table->unsignedInteger('sort_rule_id')->nullable();
+        });
+
+        Schema::create('bookshelves', function (Blueprint $table) {
+            $table->unsignedInteger('id', true)->primary();
+            $table->string('name', 180);
+            $table->string('slug', 180)->index();
+            $table->text('description');
+
+            $table->integer('created_by')->index();
+            $table->integer('updated_by')->index();
+            $table->integer('image_id')->nullable();
+
+            $table->timestamp('created_at')->nullable();
+            $table->timestamp('updated_at')->nullable();
+            $table->timestamp('deleted_at')->nullable();
+
+            $table->unsignedInteger('owned_by')->index();
+            $table->text('description_html');
+        });
+
+        DB::beginTransaction();
+
+        // Revert nulls back to zeros
+        DB::table('entities')->whereNull('created_by')->update(['created_by' => 0]);
+        DB::table('entities')->whereNull('updated_by')->update(['updated_by' => 0]);
+        DB::table('entities')->whereNull('owned_by')->update(['owned_by' => 0]);
+        DB::table('entities')->whereNull('chapter_id')->update(['chapter_id' => 0]);
+
+        // Restore data back into pages table
+        $pageFields = [
+            'id', 'book_id', 'chapter_id', 'name', 'slug', 'html', 'text', 'priority', 'created_at', 'updated_at',
+            'created_by', 'updated_by', 'draft', 'markdown', 'revision_count', 'template', 'deleted_at', 'owned_by', 'editor'
+        ];
+        $pageQuery = DB::table('entities')->select($pageFields)
+            ->leftJoin('entity_page_data', 'entities.id', '=', 'entity_page_data.page_id')
+            ->where('type', '=', 'page');
+        DB::table('pages')->insertUsing($pageFields, $pageQuery);
+
+        // Restore data back into chapters table
+        $containerJoinClause = function (JoinClause $join) {
+            return $join->on('entities.id', '=', 'entity_container_data.entity_id')
+                ->on('entities.type', '=', 'entity_container_data.entity_type');
+        };
+        $chapterFields = [
+            'id', 'book_id', 'slug', 'name', 'description', 'priority', 'created_at', 'updated_at', 'created_by', 'updated_by',
+            'deleted_at', 'owned_by', 'description_html', 'default_template_id'
+        ];
+        $chapterQuery = DB::table('entities')->select($chapterFields)
+            ->leftJoin('entity_container_data', $containerJoinClause)
+            ->where('type', '=', 'chapter');
+        DB::table('chapters')->insertUsing($chapterFields, $chapterQuery);
+
+        // Restore data back into books table
+        $bookFields = [
+            'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'image_id',
+            'deleted_at', 'owned_by', 'default_template_id', 'description_html', 'sort_rule_id'
+        ];
+        $bookQuery = DB::table('entities')->select($bookFields)
+            ->leftJoin('entity_container_data', $containerJoinClause)
+            ->where('type', '=', 'book');
+        DB::table('books')->insertUsing($bookFields, $bookQuery);
+
+        // Restore data back into bookshelves table
+        $shelfFields = [
+            'id', 'name', 'slug', 'description',  'created_by', 'updated_by', 'image_id', 'created_at', 'updated_at',
+            'deleted_at', 'owned_by', 'description_html',
+        ];
+        $shelfQuery = DB::table('entities')->select($shelfFields)
+            ->leftJoin('entity_container_data', $containerJoinClause)
+            ->where('type', '=', 'bookshelf');
+        DB::table('bookshelves')->insertUsing($shelfFields, $shelfQuery);
+
+        DB::commit();
+    }
+};
diff --git a/database/migrations/2025_10_18_163331_clean_user_id_references.php b/database/migrations/2025_10_18_163331_clean_user_id_references.php
new file mode 100644
index 00000000000..42e67013900
--- /dev/null
+++ b/database/migrations/2025_10_18_163331_clean_user_id_references.php
@@ -0,0 +1,76 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    protected static array $toNullify = [
+        'attachments' => ['created_by', 'updated_by'],
+        'comments' => ['created_by', 'updated_by'],
+        'deletions' => ['deleted_by'],
+        'entities' => ['created_by', 'updated_by', 'owned_by'],
+        'images' => ['created_by', 'updated_by'],
+        'imports' => ['created_by'],
+        'joint_permissions' => ['owner_id'],
+        'page_revisions' => ['created_by'],
+    ];
+
+    protected static array $toClean = [
+        'api_tokens' => ['user_id'],
+        'email_confirmations' => ['user_id'],
+        'favourites' => ['user_id'],
+        'mfa_values' => ['user_id'],
+        'role_user' => ['user_id'],
+        'sessions' => ['user_id'],
+        'social_accounts' => ['user_id'],
+        'user_invites' => ['user_id'],
+        'views' => ['user_id'],
+        'watches' => ['user_id'],
+    ];
+
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $idSelectQuery = DB::table('users')->select('id');
+
+        foreach (self::$toNullify as $tableName => $columns) {
+            Schema::table($tableName, function (Blueprint $table) use ($columns) {
+                foreach ($columns as $columnName) {
+                    $table->unsignedInteger($columnName)->nullable()->change();
+                }
+            });
+
+            foreach ($columns as $columnName) {
+                DB::table($tableName)->where($columnName, '=', 0)->update([$columnName => null]);
+                DB::table($tableName)->whereNotIn($columnName, $idSelectQuery)->update([$columnName => null]);
+            }
+        }
+
+        foreach (self::$toClean as $tableName => $columns) {
+            foreach ($columns as $columnName) {
+                DB::table($tableName)->whereNotIn($columnName, $idSelectQuery)->delete();
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        foreach (self::$toNullify as $tableName => $columns) {
+            foreach ($columns as $columnName) {
+                DB::table($tableName)->whereNull($columnName)->update([$columnName => 0]);
+            }
+
+            Schema::table($tableName, function (Blueprint $table) use ($columns) {
+                foreach ($columns as $columnName) {
+                    $table->unsignedInteger($columnName)->nullable(false)->change();
+                }
+            });
+        }
+    }
+};
diff --git a/database/migrations/2025_10_22_134507_update_comments_relation_field_names.php b/database/migrations/2025_10_22_134507_update_comments_relation_field_names.php
new file mode 100644
index 00000000000..de13453def3
--- /dev/null
+++ b/database/migrations/2025_10_22_134507_update_comments_relation_field_names.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->renameColumn('entity_id', 'commentable_id');
+            $table->renameColumn('entity_type', 'commentable_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('comments', function (Blueprint $table) {
+            $table->renameColumn('commentable_id', 'entity_id');
+            $table->renameColumn('commentable_type', 'entity_type');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_23_161812_create_slug_history_table.php b/database/migrations/2025_11_23_161812_create_slug_history_table.php
new file mode 100644
index 00000000000..df30bf03006
--- /dev/null
+++ b/database/migrations/2025_11_23_161812_create_slug_history_table.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create the table for storing slug history
+        Schema::create('slug_history', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('sluggable_type', 10)->index();
+            $table->unsignedBigInteger('sluggable_id')->index();
+            $table->string('slug')->index();
+            $table->string('parent_slug')->nullable()->index();
+            $table->timestamps();
+        });
+
+        // Migrate in slugs from page revisions
+        $revisionSlugQuery = DB::table('page_revisions')
+            ->select([
+                DB::raw('\'page\' as sluggable_type'),
+                'page_id as sluggable_id',
+                'slug',
+                'book_slug as parent_slug',
+                DB::raw('min(created_at) as created_at'),
+                DB::raw('min(updated_at) as updated_at'),
+            ])
+            ->where('type', '=', 'version')
+            ->groupBy(['sluggable_id', 'slug', 'parent_slug']);
+
+        DB::table('slug_history')->insertUsing(
+            ['sluggable_type', 'sluggable_id', 'slug', 'parent_slug', 'created_at', 'updated_at'],
+            $revisionSlugQuery,
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('slug_history');
+    }
+};
diff --git a/database/migrations/2025_12_15_140219_create_mention_history_table.php b/database/migrations/2025_12_15_140219_create_mention_history_table.php
new file mode 100644
index 00000000000..ff7b6a98139
--- /dev/null
+++ b/database/migrations/2025_12_15_140219_create_mention_history_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('mention_history', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('mentionable_type', 50)->index();
+            $table->unsignedBigInteger('mentionable_id')->index();
+            $table->unsignedInteger('from_user_id');
+            $table->unsignedInteger('to_user_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('mention_history');
+    }
+};
diff --git a/database/migrations/2025_12_19_103417_add_views_viewable_type_index.php b/database/migrations/2025_12_19_103417_add_views_viewable_type_index.php
new file mode 100644
index 00000000000..38d1cb45069
--- /dev/null
+++ b/database/migrations/2025_12_19_103417_add_views_viewable_type_index.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('views', function (Blueprint $table) {
+            $table->index('viewable_type', 'views_viewable_type_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('views', function (Blueprint $table) {
+            $table->dropIndex('views_viewable_type_index');
+        });
+    }
+};
diff --git a/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php b/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
new file mode 100644
index 00000000000..e4b51ff7026
--- /dev/null
+++ b/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
@@ -0,0 +1,67 @@
+<?php
+
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create new revision-view-all permission
+        $permissionId = DB::table('role_permissions')->insertGetId([
+            'name'         => 'revision-view-all',
+            'created_at'   => Carbon::now()->toDateTimeString(),
+            'updated_at'   => Carbon::now()->toDateTimeString(),
+        ]);
+
+        // Get ids of page view permissions
+        $pageViewPermissions = DB::table('role_permissions')
+            ->whereIn('name', [
+                'page-view-own',
+                'page-view-all',
+            ])->get();
+
+        if ($pageViewPermissions->count() === 0) {
+            return;
+        }
+
+        // Get role ids which have page view permission
+        $applicableRoleIds = DB::table('permission_role')
+            ->whereIn('permission_id', $pageViewPermissions->pluck('id'))
+            ->pluck('role_id')
+            ->unique()
+            ->all();
+
+        // Assign the new permission to relevant roles
+        $newPermissionRoles = array_values(array_map(function (int $roleId) use ($permissionId) {
+            return [
+                'role_id'       => $roleId,
+                'permission_id' => $permissionId,
+            ];
+        }, $applicableRoleIds));
+
+        DB::table('permission_role')->insert($newPermissionRoles);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Get the permission to remove
+        $revisionViewPermission = DB::table('role_permissions')
+            ->where('name', '=', 'revision-view-all')
+            ->first();
+
+        if (!$revisionViewPermission) {
+            return;
+        }
+
+        // Remove the permission, and its use on roles, from the database
+        DB::table('permission_role')->where('permission_id', '=', $revisionViewPermission->id)->delete();
+        DB::table('role_permissions')->where('id', '=', $revisionViewPermission->id)->delete();
+    }
+};
diff --git a/database/migrations/2026_07_27_201402_update_users_external_auth_id_collation.php b/database/migrations/2026_07_27_201402_update_users_external_auth_id_collation.php
new file mode 100644
index 00000000000..9f9267c8800
--- /dev/null
+++ b/database/migrations/2026_07_27_201402_update_users_external_auth_id_collation.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('external_auth_id')
+                ->collation('utf8mb4_bin')
+                ->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('external_auth_id')
+                ->change();
+        });
+    }
+};
diff --git a/database/migrations/2026_10_10_130201_align_cache_and_jobs_schema_to_laravel.php b/database/migrations/2026_10_10_130201_align_cache_and_jobs_schema_to_laravel.php
new file mode 100644
index 00000000000..96c46781feb
--- /dev/null
+++ b/database/migrations/2026_10_10_130201_align_cache_and_jobs_schema_to_laravel.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('jobs', function (Blueprint $table) {
+            $table->unsignedSmallInteger('attempts')->change();
+        });
+
+        Schema::table('failed_jobs', function (Blueprint $table) {
+            $table->string('connection')->change();
+            $table->string('queue')->change();
+
+            $table->index(['connection', 'queue', 'failed_at'], 'fail_queue_time_index');
+        });
+
+        Schema::table('cache', function (Blueprint $table) {
+            $table->bigInteger('expiration')->change()->index('cache_expiration_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('jobs', function (Blueprint $table) {
+            $table->unsignedTinyInteger('attempts')->change();
+        });
+
+        Schema::table('failed_jobs', function (Blueprint $table) {
+            $table->dropIndex('fail_queue_time_index');
+
+            $table->text('connection')->change();
+            $table->text('queue')->change();
+        });
+
+        Schema::table('cache', function (Blueprint $table) {
+            $table->dropIndex('cache_expiration_index');
+            $table->integer('expiration')->change();
+        });
+    }
+};
diff --git a/database/migrations/2026_11_01_111505_split_page_drafts_from_revisions.php b/database/migrations/2026_11_01_111505_split_page_drafts_from_revisions.php
new file mode 100644
index 00000000000..2c8c41d0696
--- /dev/null
+++ b/database/migrations/2026_11_01_111505_split_page_drafts_from_revisions.php
@@ -0,0 +1,79 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create new page update drafts page
+        Schema::create('page_update_drafts', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('page_id')->index();
+            $table->string('name');
+            $table->longText('html');
+            $table->longText('markdown');
+            $table->string('summary')->nullable();
+            $table->unsignedInteger('created_by')->nullable()->index();
+            $table->timestamps();
+        });
+
+        // Craft a query to get all existing update drafts
+        $pageDraftsQuery = DB::table('page_revisions')
+            ->select(['page_id', 'name', 'html', 'markdown', 'summary', 'created_by', 'created_at', 'updated_at'])
+            ->where('type', '=', 'update_draft');
+
+        // Insert them into our new table
+        DB::table('page_update_drafts')->insertUsing(
+            ['page_id', 'name', 'html', 'markdown', 'summary', 'created_by', 'created_at', 'updated_at'],
+            $pageDraftsQuery,
+        );
+
+        // Delete existing drafts from page_revisions
+        DB::table('page_revisions')
+            ->where('type', '!=', 'version')
+            ->delete();
+
+        // Remove the no-longer-needed type column from the revisions table
+        Schema::table('page_revisions', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Restore the type column on page revisions
+        Schema::table('page_revisions', function (Blueprint $table) {
+            $table->string('type')->default('version')->index();
+        });
+
+        // Fetch all page update drafts
+        $updateDraftsQuery = DB::table('page_update_drafts')->select(
+            [
+                'page_id', 'name', 'html', 'markdown', 'created_by', 'created_at', 'updated_at', 'summary',
+                DB::raw("'' as slug"),
+                DB::raw("'' as book_slug"),
+                DB::raw("'update_draft' as type"),
+                DB::raw("0 as revision_number"),
+            ]
+        );
+
+        // Insert update drafts back into page revisions
+        DB::table('page_revisions')->insertUsing(
+            ['page_id', 'name', 'html', 'markdown', 'created_by', 'created_at', 'updated_at', 'summary', 'slug', 'book_slug', 'type', 'revision_number'],
+            $updateDraftsQuery,
+        );
+
+        // Drop the page_update_drafts_table
+        Schema::dropIfExists('page_update_drafts');
+    }
+};
diff --git a/database/migrations/2026_11_01_114728_update_page_revisions_with_unique_numbers.php b/database/migrations/2026_11_01_114728_update_page_revisions_with_unique_numbers.php
new file mode 100644
index 00000000000..e902b6a8da7
--- /dev/null
+++ b/database/migrations/2026_11_01_114728_update_page_revisions_with_unique_numbers.php
@@ -0,0 +1,80 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Find duplicate per-page revision numbers
+        $existingDuplicates = DB::table('page_revisions')
+            ->select(['page_id', 'revision_number'])
+            ->selectExpression('count(*)', 'count')
+            ->groupBy('page_id', 'revision_number')
+            ->having('count', '>', 1)
+            ->get();
+
+        // Get the page ids where duplicates exist
+        $pageIds = $existingDuplicates->pluck('page_id')->unique()->toArray();
+
+        // Get the revision count values from pages
+        $pageRevCounts = DB::table('entity_page_data')
+            ->select('page_id', 'revision_count')
+            ->whereIn('page_id', $pageIds)
+            ->get()
+            ->pluck('revision_count', 'page_id')
+            ->all();
+
+        foreach ($pageIds as $pageId) {
+            $revisions = DB::table('page_revisions')
+                ->select(['id', 'page_id', 'revision_number'])
+                ->where('page_id', '=', $pageId)
+                ->orderBy('created_at', 'asc')
+                ->orderBy('id', 'asc')
+                ->get()
+                ->all();
+
+            $maxRevisionNum = $pageRevCounts[$pageId] ?? 0;
+            foreach ($revisions as $revision) {
+                if ($revision->revision_number > $maxRevisionNum) {
+                    $maxRevisionNum = $revision->revision_number;
+                }
+            }
+
+            $trackedRevisionNumbers = [];
+            foreach ($revisions as $revision) {
+                if (isset($trackedRevisionNumbers[$revision->revision_number])) {
+                    $maxRevisionNum++;
+                    DB::table('page_revisions')
+                        ->where('id', '=', $revision->id)
+                        ->update(['revision_number' => $maxRevisionNum]);
+                    $trackedRevisionNumbers[$maxRevisionNum] = true;
+                    continue;
+                }
+
+                $trackedRevisionNumbers[$revision->revision_number] = true;
+            }
+        }
+
+        // Create a new unique index to enforce unique per-page revision numbers
+        Schema::table('page_revisions', function (Blueprint $table) {
+            $table->unique(['page_id', 'revision_number'], 'page_revision_unique_number');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('page_revisions', function (Blueprint $table) {
+            $table->dropUnique('page_revision_unique_number');
+        });
+    }
+};
diff --git a/database/seeders/DummyContentSeeder.php b/database/seeders/DummyContentSeeder.php
index a4383be50a2..845bea8e40f 100644
--- a/database/seeders/DummyContentSeeder.php
+++ b/database/seeders/DummyContentSeeder.php
@@ -12,7 +12,9 @@
 use BookStack\Search\SearchIndex;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
@@ -20,10 +22,8 @@ class DummyContentSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Create an editor user
         $editorUser = User::factory()->create();
@@ -39,40 +39,58 @@ public function run()
 
         $byData = ['created_by' => $editorUser->id, 'updated_by' => $editorUser->id, 'owned_by' => $editorUser->id];
 
-        Book::factory()->count(5)->create($byData)
+        Book::factory()->count(5)->make($byData)
             ->each(function ($book) use ($byData) {
+                $book->save();
                 $chapters = Chapter::factory()->count(3)->create($byData)
                     ->each(function ($chapter) use ($book, $byData) {
                         $pages = Page::factory()->count(3)->make(array_merge($byData, ['book_id' => $book->id]));
-                        $chapter->pages()->saveMany($pages);
+                        $this->saveManyOnRelation($pages, $chapter->pages());
                     });
                 $pages = Page::factory()->count(3)->make($byData);
-                $book->chapters()->saveMany($chapters);
-                $book->pages()->saveMany($pages);
+                $this->saveManyOnRelation($chapters, $book->chapters());
+                $this->saveManyOnRelation($pages, $book->pages());
             });
 
-        $largeBook = Book::factory()->create(array_merge($byData, ['name' => 'Large book' . Str::random(10)]));
+        $largeBook = Book::factory()->make(array_merge($byData, ['name' => 'Large book' . Str::random(10)]));
+        $largeBook->save();
+
         $pages = Page::factory()->count(200)->make($byData);
         $chapters = Chapter::factory()->count(50)->make($byData);
-        $largeBook->pages()->saveMany($pages);
-        $largeBook->chapters()->saveMany($chapters);
+        $this->saveManyOnRelation($pages, $largeBook->pages());
+        $this->saveManyOnRelation($chapters, $largeBook->chapters());
+
+        $shelves = Bookshelf::factory()->count(10)->make($byData);
+        foreach ($shelves as $shelf) {
+            $shelf->save();
+        }
 
-        $shelves = Bookshelf::factory()->count(10)->create($byData);
         $largeBook->shelves()->attach($shelves->pluck('id'));
 
         // Assign API permission to editor role and create an API key
         $apiPermission = RolePermission::getByName('access-api');
         $editorRole->attachPermission($apiPermission);
         $token = (new ApiToken())->forceFill([
-            'user_id'    => $editorUser->id,
-            'name'       => 'Testing API key',
+            'user_id' => $editorUser->id,
+            'name' => 'Testing API key',
             'expires_at' => ApiToken::defaultExpiry(),
-            'secret'     => Hash::make('password'),
-            'token_id'   => 'apitoken',
+            'secret' => Hash::make('password'),
+            'token_id' => 'apitoken',
         ]);
         $token->save();
 
         app(JointPermissionBuilder::class)->rebuildForAll();
         app(SearchIndex::class)->indexAllEntities();
     }
+
+    /**
+     * Inefficient workaround for saving many on a relation since we can't directly insert
+     * entities since we split them across tables.
+     */
+    protected function saveManyOnRelation(Collection $entities, HasMany $relation): void
+    {
+        foreach ($entities as $entity) {
+            $relation->save($entity);
+        }
+    }
 }
diff --git a/dev/api/requests/comments-create.json b/dev/api/requests/comments-create.json
new file mode 100644
index 00000000000..abc6832d8ec
--- /dev/null
+++ b/dev/api/requests/comments-create.json
@@ -0,0 +1,5 @@
+{
+	"page_id": 2646,
+	"html": "<p>Can the title be updated?</p>",
+	"content_ref": "bkmrk-page-title:7341676876991010:3-14"
+}
\ No newline at end of file
diff --git a/dev/api/requests/comments-update.json b/dev/api/requests/comments-update.json
new file mode 100644
index 00000000000..bbcf114f30d
--- /dev/null
+++ b/dev/api/requests/comments-update.json
@@ -0,0 +1,4 @@
+{
+	"html": "<p>Can this comment be updated??????</p>",
+	"archived": true
+}
\ No newline at end of file
diff --git a/dev/api/requests/image-gallery-read-data-for-url.http b/dev/api/requests/image-gallery-read-data-for-url.http
new file mode 100644
index 00000000000..1892600f437
--- /dev/null
+++ b/dev/api/requests/image-gallery-read-data-for-url.http
@@ -0,0 +1 @@
+GET /api/image-gallery/url/data?url=https%3A%2F%2Fbookstack.example.com%2Fuploads%2Fimages%2Fgallery%2F2025-10%2Fmy-image.png
diff --git a/dev/api/requests/tags-list-values.http b/dev/api/requests/tags-list-values.http
new file mode 100644
index 00000000000..6dd3f49fc0b
--- /dev/null
+++ b/dev/api/requests/tags-list-values.http
@@ -0,0 +1 @@
+GET /api/tags/values-for-name?name=Category
diff --git a/dev/api/responses/books-read.json b/dev/api/responses/books-read.json
index afeebade619..0c8ff473df5 100644
--- a/dev/api/responses/books-read.json
+++ b/dev/api/responses/books-read.json
@@ -52,7 +52,7 @@
       "name": "Cool Animals",
       "slug": "cool-animals",
       "book_id": 16,
-      "chapter_id": 0,
+      "chapter_id": null,
       "draft": false,
       "template": false,
       "created_at": "2021-12-19T18:22:11.000000Z",
@@ -79,5 +79,17 @@
     "path": "/uploads/images/cover_book/2020-01/sjovall_m117hUWMu40.jpg",
     "type": "cover_book",
     "uploaded_to": 16
-  }
+  },
+  "shelves": [
+    {
+      "id": 1,
+      "name": "Great reads",
+      "slug": "great-reads"
+    },
+    {
+      "id": 5,
+      "name": "Personal Books",
+      "slug": "personal-books"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/dev/api/responses/comments-create.json b/dev/api/responses/comments-create.json
new file mode 100644
index 00000000000..6fec5c101ab
--- /dev/null
+++ b/dev/api/responses/comments-create.json
@@ -0,0 +1,13 @@
+{
+	"id": 167,
+	"commentable_id": 2646,
+	"commentable_type": "page",
+	"parent_id": null,
+	"local_id": 29,
+	"created_by": 1,
+	"updated_by": 1,
+	"created_at": "2025-10-24T14:05:41.000000Z",
+	"updated_at": "2025-10-24T14:05:41.000000Z",
+	"content_ref": "bkmrk-page-title:7341676876991010:3-14",
+	"archived": false
+}
\ No newline at end of file
diff --git a/dev/api/responses/comments-list.json b/dev/api/responses/comments-list.json
new file mode 100644
index 00000000000..a0f638120a2
--- /dev/null
+++ b/dev/api/responses/comments-list.json
@@ -0,0 +1,29 @@
+{
+	"data": [
+		{
+			"id": 1,
+			"commentable_id": 2607,
+			"commentable_type": "page",
+			"parent_id": null,
+			"local_id": 1,
+			"content_ref": "",
+			"created_by": 1,
+			"updated_by": 1,
+			"created_at": "2022-04-20T08:43:27.000000Z",
+			"updated_at": "2022-04-20T08:43:27.000000Z"
+		},
+		{
+			"id": 18,
+			"commentable_id": 2607,
+			"commentable_type": "page",
+			"parent_id": 1,
+			"local_id": 2,
+			"content_ref": "",
+			"created_by": 3,
+			"updated_by": 3,
+			"created_at": "2022-11-15T08:12:35.000000Z",
+			"updated_at": "2022-11-15T08:12:35.000000Z"
+		}
+	],
+	"total": 88
+}
\ No newline at end of file
diff --git a/dev/api/responses/comments-read.json b/dev/api/responses/comments-read.json
new file mode 100644
index 00000000000..054b8ad1900
--- /dev/null
+++ b/dev/api/responses/comments-read.json
@@ -0,0 +1,38 @@
+{
+	"id": 22,
+	"commentable_id": 2646,
+	"commentable_type": "page",
+	"html": "<p>This page looks great!<\/p>\n",
+	"parent_id": null,
+	"local_id": 2,
+	"created_by": {
+		"id": 1,
+		"name": "Admin",
+		"slug": "admin"
+	},
+	"updated_by": {
+		"id": 1,
+		"name": "Admin",
+		"slug": "admin"
+	},
+	"created_at": "2023-06-07T07:50:56.000000Z",
+	"updated_at": "2023-06-07T07:50:56.000000Z",
+	"content_ref": "",
+	"archived": false,
+	"replies": [
+		{
+			"id": 34,
+			"commentable_id": 2646,
+			"commentable_type": "page",
+			"html": "<p>Thanks for the comment!<\/p>\n",
+			"parent_id": 2,
+			"local_id": 10,
+			"created_by": 2,
+			"updated_by": 2,
+			"created_at": "2023-06-07T13:46:25.000000Z",
+			"updated_at": "2023-06-07T13:46:25.000000Z",
+			"content_ref": "",
+			"archived": false
+		}
+	]
+}
\ No newline at end of file
diff --git a/dev/api/responses/comments-update.json b/dev/api/responses/comments-update.json
new file mode 100644
index 00000000000..ce5ed264441
--- /dev/null
+++ b/dev/api/responses/comments-update.json
@@ -0,0 +1,13 @@
+{
+	"id": 167,
+	"commentable_id": 2646,
+	"commentable_type": "page",
+	"parent_id": null,
+	"local_id": 29,
+	"created_by": 1,
+	"updated_by": 1,
+	"created_at": "2025-10-24T14:05:41.000000Z",
+	"updated_at": "2025-10-24T14:09:56.000000Z",
+	"content_ref": "bkmrk-page-title:7341676876991010:3-14",
+	"archived": true
+}
\ No newline at end of file
diff --git a/dev/api/responses/pages-create.json b/dev/api/responses/pages-create.json
index 11f5ab8c8a5..705dea6f619 100644
--- a/dev/api/responses/pages-create.json
+++ b/dev/api/responses/pages-create.json
@@ -1,7 +1,7 @@
 {
 	"id": 358,
 	"book_id": 1,
-	"chapter_id": 0,
+	"chapter_id": null,
 	"name": "My API Page",
 	"slug": "my-api-page",
 	"html": "<p id=\"bkmrk-my-new-api-page\">my new API page</p>",
diff --git a/dev/api/responses/pages-read.json b/dev/api/responses/pages-read.json
index 2f3538964d4..e38a9cf9242 100644
--- a/dev/api/responses/pages-read.json
+++ b/dev/api/responses/pages-read.json
@@ -1,7 +1,7 @@
 {
 	"id": 306,
 	"book_id": 1,
-	"chapter_id": 0,
+	"chapter_id": null,
 	"name": "A page written in markdown",
 	"slug": "a-page-written-in-markdown",
 	"html": "<h1 id=\"bkmrk-this-is-my-cool-page\">This is my cool page! With some included text</h1>",
@@ -29,6 +29,79 @@
 	"revision_count": 5,
 	"template": false,
 	"editor": "wysiwyg",
+	"comments": {
+		"active": [
+			{
+				"comment": {
+					"id": 22,
+					"commentable_id": 306,
+					"commentable_type": "page",
+					"html": "<p>Does this need revising?<\/p>\n",
+					"parent_id": null,
+					"local_id": 1,
+					"created_by": {
+						"id": 1,
+						"name": "Admin",
+						"slug": "admin"
+					},
+					"updated_by": 1,
+					"created_at": "2023-06-07T07:50:56.000000Z",
+					"updated_at": "2023-06-07T07:50:56.000000Z",
+					"content_ref": "",
+					"archived": false
+				},
+				"depth": 0,
+				"children": [
+					{
+						"comment": {
+							"id": 34,
+							"commentable_id": 2646,
+							"commentable_type": "page",
+							"html": "<p>I think it's okay!<\/p>\n",
+							"parent_id": 1,
+							"local_id": 2,
+							"created_by": {
+								"id": 2,
+								"name": "Editor",
+								"slug": "editor"
+							},
+							"updated_by": 1,
+							"created_at": "2023-06-07T13:46:25.000000Z",
+							"updated_at": "2023-06-07T13:46:25.000000Z",
+							"content_ref": "",
+							"archived": false
+						},
+						"depth": 1,
+						"children": []
+					}
+				]
+			}
+		],
+		"archived": [
+			{
+				"comment": {
+					"id": 21,
+					"commentable_id": 2646,
+					"commentable_type": "page",
+					"html": "<p>The title needs to be fixed<\/p>\n",
+					"parent_id": null,
+					"local_id": 3,
+					"created_by": {
+						"id": 2,
+						"name": "Editor",
+						"slug": "editor"
+					},
+					"updated_by": 1,
+					"created_at": "2023-06-07T07:50:49.000000Z",
+					"updated_at": "2025-10-24T08:37:22.000000Z",
+					"content_ref": "",
+					"archived": true
+				},
+				"depth": 0,
+				"children": []
+			}
+		]
+	},
 	"tags": [
 		{
 			"name": "Category",
diff --git a/dev/api/responses/recycle-bin-list.json b/dev/api/responses/recycle-bin-list.json
index 853070839e9..19167ec05fa 100644
--- a/dev/api/responses/recycle-bin-list.json
+++ b/dev/api/responses/recycle-bin-list.json
@@ -10,7 +10,7 @@
       "deletable": {
         "id": 2582,
         "book_id": 25,
-        "chapter_id": 0,
+        "chapter_id": null,
         "name": "A Wonderful Page",
         "slug": "a-wonderful-page",
         "priority": 9,
diff --git a/dev/api/responses/search-book.json b/dev/api/responses/search-book.json
new file mode 100644
index 00000000000..93587f73e5e
--- /dev/null
+++ b/dev/api/responses/search-book.json
@@ -0,0 +1,64 @@
+{
+  "data": [
+    {
+      "id": 84,
+      "book_id": 1,
+      "slug": "a-chapter-for-cats",
+      "name": "A chapter for cats",
+      "created_at": "2021-11-14T15:57:35.000000Z",
+      "updated_at": "2021-11-14T15:57:35.000000Z",
+      "type": "chapter",
+      "url": "https://example.com/books/cats/chapter/a-chapter-for-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "preview_html": {
+        "name": "A chapter for <strong>cats</strong>",
+        "content": "...once a bunch of <strong>cats</strong> named tony...behaviour of <strong>cats</strong> is unsuitable"
+      },
+      "tags": []
+    },
+    {
+      "name": "The hows and whys of cats",
+      "id": 396,
+      "slug": "the-hows-and-whys-of-cats",
+      "book_id": 1,
+      "chapter_id": 75,
+      "draft": false,
+      "template": false,
+      "created_at": "2021-05-15T16:28:10.000000Z",
+      "updated_at": "2021-11-14T15:56:49.000000Z",
+      "type": "page",
+      "url": "https://example.com/books/cats/page/the-hows-and-whys-of-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "chapter": {
+        "id": 75,
+        "name": "A chapter for cats",
+        "slug": "a-chapter-for-cats"
+      },
+      "preview_html": {
+        "name": "The hows and whys of <strong>cats</strong>",
+        "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
+      },
+      "tags": [
+        {
+          "name": "Animal",
+          "value": "Cat",
+          "order": 0
+        },
+        {
+          "name": "Category",
+          "value": "Top Content",
+          "order": 0
+        }
+      ]
+    }
+  ],
+  "total": 2
+}
diff --git a/dev/api/responses/search-chapter.json b/dev/api/responses/search-chapter.json
new file mode 100644
index 00000000000..55c277a4fce
--- /dev/null
+++ b/dev/api/responses/search-chapter.json
@@ -0,0 +1,72 @@
+{
+  "data": [
+    {
+      "name": "The hows and whys of cats",
+      "id": 396,
+      "slug": "the-hows-and-whys-of-cats",
+      "book_id": 1,
+      "chapter_id": 75,
+      "draft": false,
+      "template": false,
+      "created_at": "2021-05-15T16:28:10.000000Z",
+      "updated_at": "2021-11-14T15:56:49.000000Z",
+      "type": "page",
+      "url": "https://example.com/books/cats/page/the-hows-and-whys-of-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "chapter": {
+        "id": 75,
+        "name": "A chapter for cats",
+        "slug": "a-chapter-for-cats"
+      },
+      "preview_html": {
+        "name": "The hows and whys of <strong>cats</strong>",
+        "content": "...people ask why <strong>cats</strong>? but there are...the reason that <strong>cats</strong> are fast are due to..."
+      },
+      "tags": [
+        {
+          "name": "Animal",
+          "value": "Cat",
+          "order": 0
+        },
+        {
+          "name": "Category",
+          "value": "Top Content",
+          "order": 0
+        }
+      ]
+    },
+    {
+      "name": "How advanced are cats?",
+      "id": 362,
+      "slug": "how-advanced-are-cats",
+      "book_id": 1,
+      "chapter_id": 75,
+      "draft": false,
+      "template": false,
+      "created_at": "2020-11-29T21:55:07.000000Z",
+      "updated_at": "2021-11-14T16:02:39.000000Z",
+      "type": "page",
+      "url": "https://example.com/books/cats/page/how-advanced-are-cats",
+      "book": {
+        "id": 1,
+        "name": "Cats",
+        "slug": "cats"
+      },
+      "chapter": {
+        "id": 75,
+        "name": "A chapter for cats",
+        "slug": "a-chapter-for-cats"
+      },
+      "preview_html": {
+        "name": "How advanced are <strong>cats</strong>?",
+        "content": "<strong>cats</strong> are some of the most advanced animals in the world."
+      },
+      "tags": []
+    }
+  ],
+  "total": 2
+}
diff --git a/dev/api/responses/tags-list-names.json b/dev/api/responses/tags-list-names.json
new file mode 100644
index 00000000000..c0c8e7b2231
--- /dev/null
+++ b/dev/api/responses/tags-list-names.json
@@ -0,0 +1,32 @@
+{
+	"data": [
+		{
+			"name": "Category",
+			"values": 8,
+			"usages": 184,
+			"page_count": 3,
+			"chapter_count": 8,
+			"book_count": 171,
+			"shelf_count": 2
+		},
+		{
+			"name": "Review Due",
+			"values": 2,
+			"usages": 2,
+			"page_count": 1,
+			"chapter_count": 0,
+			"book_count": 1,
+			"shelf_count": 0
+		},
+		{
+			"name": "Type",
+			"values": 2,
+			"usages": 2,
+			"page_count": 0,
+			"chapter_count": 1,
+			"book_count": 1,
+			"shelf_count": 0
+		}
+	],
+	"total": 3
+}
\ No newline at end of file
diff --git a/dev/api/responses/tags-list-values.json b/dev/api/responses/tags-list-values.json
new file mode 100644
index 00000000000..37926b8463c
--- /dev/null
+++ b/dev/api/responses/tags-list-values.json
@@ -0,0 +1,32 @@
+{
+	"data": [
+		{
+			"name": "Category",
+			"value": "Cool Stuff",
+			"usages": 3,
+			"page_count": 1,
+			"chapter_count": 0,
+			"book_count": 2,
+			"shelf_count": 0
+		},
+		{
+			"name": "Category",
+			"value": "Top Content",
+			"usages": 168,
+			"page_count": 0,
+			"chapter_count": 3,
+			"book_count": 165,
+			"shelf_count": 0
+		},
+		{
+			"name": "Category",
+			"value": "Learning",
+			"usages": 2,
+			"page_count": 0,
+			"chapter_count": 0,
+			"book_count": 0,
+			"shelf_count": 2
+		}
+	],
+	"total": 3
+}
\ No newline at end of file
diff --git a/dev/build/esbuild.js b/dev/build/esbuild.mjs
similarity index 52%
rename from dev/build/esbuild.js
rename to dev/build/esbuild.mjs
index 63387d612ce..fa223115750 100644
--- a/dev/build/esbuild.js
+++ b/dev/build/esbuild.mjs
@@ -1,12 +1,15 @@
 #!/usr/bin/env node
 
-const esbuild = require('esbuild');
-const path = require('path');
-const fs = require('fs');
+import * as esbuild from 'esbuild';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import * as process from "node:process";
 
 // Check if we're building for production
 // (Set via passing `production` as first argument)
-const isProd = process.argv[2] === 'production';
+const mode = process.argv[2];
+const isProd = mode === 'production';
+const __dirname = import.meta.dirname;
 
 // Gather our input files
 const entryPoints = {
@@ -17,11 +20,16 @@ const entryPoints = {
     wysiwyg: path.join(__dirname, '../../resources/js/wysiwyg/index.ts'),
 };
 
+// Watch styles so we can reload on change
+if (mode === 'watch') {
+    entryPoints['styles-dummy'] = path.join(__dirname, '../../public/dist/styles.css');
+}
+
 // Locate our output directory
 const outdir = path.join(__dirname, '../../public/dist');
 
-// Build via esbuild
-esbuild.build({
+// Define the options for esbuild
+const options = {
     bundle: true,
     metafile: true,
     entryPoints,
@@ -33,6 +41,7 @@ esbuild.build({
     minify: isProd,
     logLevel: 'info',
     loader: {
+        '.html': 'copy',
         '.svg': 'text',
     },
     absWorkingDir: path.join(__dirname, '../..'),
@@ -45,6 +54,34 @@ esbuild.build({
         js: '// See the "/licenses" URI for full package license details',
         css: '/* See the "/licenses" URI for full package license details */',
     },
-}).then(result => {
+};
+
+if (mode === 'watch') {
+    options.inject = [
+        path.join(__dirname, './livereload.js'),
+    ];
+}
+
+const ctx = await esbuild.context(options);
+
+if (mode === 'watch') {
+    // Watch for changes and rebuild on change
+    ctx.watch({});
+    let {hosts, port} = await ctx.serve({
+        servedir: path.join(__dirname, '../../public'),
+        cors: {
+            origin: '*',
+        }
+    });
+} else {
+    // Build with meta output for analysis
+    const result = await ctx.rebuild();
+    const outputs = result.metafile.outputs;
+    const files = Object.keys(outputs);
+    for (const file of files) {
+        const output = outputs[file];
+        console.log(`Written: ${file} @ ${Math.round(output.bytes / 1000)}kB`);
+    }
     fs.writeFileSync('esbuild-meta.json', JSON.stringify(result.metafile));
-}).catch(() => process.exit(1));
+    process.exit(0);
+}
diff --git a/dev/build/livereload.js b/dev/build/livereload.js
new file mode 100644
index 00000000000..c2d8ac62007
--- /dev/null
+++ b/dev/build/livereload.js
@@ -0,0 +1,35 @@
+if (!window.__dev_reload_listening) {
+    listen();
+    window.__dev_reload_listening = true;
+}
+
+
+function listen() {
+    console.log('Listening for livereload events...');
+    new EventSource("http://127.0.0.1:8000/esbuild").addEventListener('change', e => {
+        const { added, removed, updated } = JSON.parse(e.data);
+
+        if (!added.length && !removed.length && updated.length > 0) {
+            const updatedPath = updated.filter(path => path.endsWith('.css'))[0]
+            if (!updatedPath) return;
+
+            const links = [...document.querySelectorAll("link[rel='stylesheet']")];
+            for (const link of links) {
+                const url = new URL(link.href);
+                const name = updatedPath.replace('-dummy', '');
+
+                if (url.pathname.endsWith(name)) {
+                    const next = link.cloneNode();
+                    next.href = name + '?version=' + Math.random().toString(36).slice(2);
+                    next.onload = function() {
+                        link.remove();
+                    };
+                    link.after(next);
+                    return
+                }
+            }
+        }
+
+        location.reload()
+    });
+}
\ No newline at end of file
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index edab90ca1c5..90e6804f9cf 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-apache
+FROM php:8.5-apache
 
 # Install additional dependencies
 RUN apt-get update && \
@@ -14,6 +14,9 @@ RUN apt-get update && \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
+# Mark /app as safe for Git >= 2.35.2
+RUN git config --system --add safe.directory /app
+
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
     docker-php-ext-configure gd --with-freetype --with-jpeg && \
diff --git a/dev/docker/db-testing/Containerfile b/dev/docker/db-testing/Containerfile
new file mode 100644
index 00000000000..411e2197b67
--- /dev/null
+++ b/dev/docker/db-testing/Containerfile
@@ -0,0 +1,30 @@
+FROM ubuntu:24.04
+
+# Install additional dependencies
+RUN apt-get update && \
+    apt-get install -y \
+        git \
+		wget \
+        zip \
+        unzip \
+		php \
+		php-bcmath php-curl php-mbstring php-gd php-xml php-zip php-mysql php-ldap \
+       && \
+    rm -rf /var/lib/apt/lists/*
+
+# Take branch as an argument so we can choose which BookStack
+# branch to test against
+ARG BRANCH=development
+
+# Download BookStack & install PHP deps
+RUN mkdir -p /var/www && \
+    git clone https://codeberg.org/bookstack/bookstack.git --branch "$BRANCH" --single-branch /var/www/bookstack && \
+    cd /var/www/bookstack && \
+    wget https://raw.githubusercontent.com/composer/getcomposer.org/f3108f64b4e1c1ce6eb462b159956461592b3e3e/web/installer -O - -q | php -- --quiet --filename=composer && \
+    php composer install
+
+# Set the BookStack dir as the default working dir
+WORKDIR /var/www/bookstack
+
+# Set the default action as running php
+ENTRYPOINT ["/bin/php"]
diff --git a/dev/docker/db-testing/readme.md b/dev/docker/db-testing/readme.md
new file mode 100644
index 00000000000..3e3261eb313
--- /dev/null
+++ b/dev/docker/db-testing/readme.md
@@ -0,0 +1,36 @@
+# Database Testing Suite
+
+This container setup is designed to run BookStack's test suite against each major database version we support
+across MySQL and MariaDB to ensure compatibility and highlight any potential issues before a release.
+This is a fairly slow and heavy process, so is designed to just be run manually before a release which
+makes changes to the database schema, or a release which makes significant changes to database queries.
+
+### Running
+
+Everything is ran via the `run.sh` script. This will:
+
+- Optionally, accept a branch of BookStack to use for testing.
+- Use podman if available, otherwise fall back to docker.
+- Build the container image from the `Containerfile`.
+  - This will include a built-in copy of the chosen BookStack branch. 
+- Cycle through each major supported database version:
+  - Migrate and seed the database.
+  - Run the full PHP test suite.
+
+If there's a failure for a database version, the script will prompt if you'd like to continue or stop testing.
+
+This script should be ran from this `db-testing` directory:
+
+```bash
+# Enter this directory
+cd dev/docker/db-testing
+
+# Runs for the 'development' branch by default
+./run.sh
+
+# Run for a specific branch
+./run.sh v25-11
+
+# Run, but skip the build step
+./run.sh --skip-build
+```
diff --git a/dev/docker/db-testing/run.sh b/dev/docker/db-testing/run.sh
new file mode 100755
index 00000000000..a0c2a3bc599
--- /dev/null
+++ b/dev/docker/db-testing/run.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+BRANCH=development
+SKIP_BUILD=0
+
+# Parse arguments: --skip-build, plus an optional branch name
+for arg in "$@"; do
+  case "$arg" in
+    --skip-build)
+      SKIP_BUILD=1
+      ;;
+    *)
+      BRANCH="$arg"
+      ;;
+  esac
+done
+
+# Use podman if available, otherwise fall back to docker
+if command -v podman >/dev/null 2>&1; then
+  ENGINE=podman
+elif command -v docker >/dev/null 2>&1; then
+  ENGINE=docker
+else
+  echo "Failed to find podman or docker in PATH"
+  exit 1
+fi
+
+# Build the container with a known name
+if [ "$SKIP_BUILD" -eq 1 ]; then
+  echo "Skipping app container build"
+else
+  $ENGINE build --no-cache --build-arg BRANCH="$BRANCH" -t bookstack:db-testing .
+  if [ $? -ne 0 ]; then
+    echo "Failed to build app container for testing"
+    exit 1
+  fi
+fi
+
+# List of database containers to test against
+containers=(
+  "docker.io/library/mysql:8.0"
+  "docker.io/library/mysql:8.4"
+  "docker.io/library/mysql:9.5"
+  "docker.io/library/mariadb:10.6"
+  "docker.io/library/mariadb:10.11"
+  "docker.io/library/mariadb:11.4"
+  "docker.io/library/mariadb:11.8"
+  "docker.io/library/mariadb:12.0"
+)
+
+# Pre-clean-up from prior runs
+$ENGINE stop bs-dbtest-db
+$ENGINE network rm bs-dbtest-net
+
+# Cycle over each database image
+for img in "${containers[@]}"; do
+  echo "Starting tests with $img..."
+  $ENGINE network create bs-dbtest-net
+  $ENGINE run -d --rm --name "bs-dbtest-db" \
+    -e MYSQL_DATABASE=bookstack-test \
+    -e MYSQL_USER=bookstack \
+    -e MYSQL_PASSWORD=bookstack \
+    -e MYSQL_ROOT_PASSWORD=password \
+	  --network=bs-dbtest-net \
+    "$img"
+  sleep 20
+  APP_RUN="$ENGINE run -it --rm --network=bs-dbtest-net -e TEST_DATABASE_URL=\"mysql://bookstack:bookstack@bs-dbtest-db:3306\" bookstack:db-testing"
+  $APP_RUN artisan migrate --force --database=mysql_testing
+  $APP_RUN artisan db:seed --force --class=DummyContentSeeder --database=mysql_testing
+  $APP_RUN vendor/bin/phpunit
+  if [ $? -eq 0 ]; then
+    echo "$img - Success"
+  else
+    echo "$img - Error"
+    read -p "Stop script? [y/N] " ans
+    [[ $ans == [yY] ]] && exit 0
+  fi
+
+  $ENGINE stop "bs-dbtest-db"
+  $ENGINE network rm bs-dbtest-net
+done
diff --git a/dev/docs/development.md b/dev/docs/development.md
index ea3e692a198..2c73a0256c5 100644
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -3,11 +3,11 @@
 All development on BookStack is currently done on the `development` branch. 
 When it's time for a release the `development` branch is merged into release with built & minified CSS & JS then tagged at its version. Here are the current development requirements:
 
-* [Node.js](https://nodejs.org/en/) v20.0+
+* [Node.js](https://nodejs.org/en/) v22.0+
 
 ## Building CSS & JavaScript Assets
 
-This project uses SASS for CSS development and this is built, along with the JavaScript, using a range of npm scripts. The below npm commands can be used to install the dependencies & run the build tasks:
+This project uses SASS for CSS development which is built, along with the JavaScript, using a range of npm scripts. The below npm commands can be used to install the dependencies & run the build tasks:
 
 ``` bash
 # Install NPM Dependencies
@@ -37,7 +37,7 @@ We use tools to manage code standards and formatting within the project. If subm
 
 ### PHP
 
-PHP code standards are managed by [using PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer).
+PHP code standards are managed by [using PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer).
 Static analysis is in place using [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan).
 The below commands can be used to utilise these tools:
 
@@ -113,4 +113,4 @@ docker-compose run app php vendor/bin/phpunit
 ### Debugging
 
 The docker-compose setup ships with Xdebug, which you can listen to on port 9090.
-NB : For some editors like Visual Studio Code, you might need to map your workspace folder to the /app folder within the docker container for this to work.
+NB: For some editors like Visual Studio Code, you might need to map your workspace folder to the /app folder within the docker container for this to work.
diff --git a/dev/docs/javascript-code.md b/dev/docs/javascript-code.md
index e5f491839f0..4de6223d811 100644
--- a/dev/docs/javascript-code.md
+++ b/dev/docs/javascript-code.md
@@ -161,3 +161,7 @@ window.$components.firstOnElement(element, name);
 There are a range of available events that are emitted as part of a public & supported API for accessing or extending JavaScript libraries & components used in the system.
 
 Details on these events can be found in the [JavaScript Public Events file](javascript-public-events.md).
+
+## WYSIWYG Editor API
+
+Details on the API for our custom-built WYSIWYG editor can be found in the [WYSIWYG JavaScript API file](./wysiwyg-js-api.md).
\ No newline at end of file
diff --git a/dev/docs/javascript-public-events.md b/dev/docs/javascript-public-events.md
index 4f68daaebf0..e9ea014ef46 100644
--- a/dev/docs/javascript-public-events.md
+++ b/dev/docs/javascript-public-events.md
@@ -60,7 +60,7 @@ This event is called when the markdown editor loads, post configuration but befo
 
 #### Event Data
 
-- `markdownIt` - A references to the [MarkdownIt](https://markdown-it.github.io/markdown-it/#MarkdownIt) instance used to render markdown to HTML (Just for the preview).
+- `markdownIt` - A reference to the [MarkdownIt](https://markdown-it.github.io/markdown-it/#MarkdownIt) instance used to render markdown to HTML (Just for the preview).
 - `displayEl` - The IFrame Element that wraps the HTML preview display.
 - `cmEditorView` - The CodeMirror [EditorView](https://codemirror.net/docs/ref/#view.EditorView) instance used for the markdown input editor.
 
@@ -79,7 +79,7 @@ window.addEventListener('editor-markdown::setup', event => {
 This event is called as the embedded diagrams.net drawing editor loads, to allow configuration of the diagrams.net interface.
 See [this diagrams.net page](https://www.diagrams.net/doc/faq/configure-diagram-editor) for details on the available options for the configure event.
 
-If using a custom diagrams.net instance, via the `DRAWIO` option, you will need to ensure  your DRAWIO option URL has the `configure=1` query parameter.
+If using a custom diagrams.net instance, via the `DRAWIO` option, you will need to ensure your DRAWIO option URL has the `configure=1` query parameter.
 
 #### Event Data
 
@@ -134,6 +134,47 @@ window.addEventListener('editor-tinymce::setup', event => {
 });
 ```
 
+### `editor-wysiwyg::post-init`
+
+This is called after the (new custom-built Lexical-based) WYSIWYG editor has been initialised.
+
+#### Event Data
+
+- `usage` - A string label to identify the usage type of the WYSIWYG editor in BookStack.
+- `api` - An instance to the WYSIWYG editor API, as documented in the [WYSIWYG JavaScript API file](./wysiwyg-js-api.md).
+
+##### Example
+
+The below example shows how you'd use this API to create a button, with that button added to the main toolbar of the page editor, which inserts bold "Hello!" text on press:
+
+<details>
+<summary>Show Example</summary>
+
+```javascript
+window.addEventListener('editor-wysiwyg::post-init', event => {
+    const {usage, api} = event.detail;
+    // Check that it's the page editor which is being loaded
+    if (usage !== 'page-editor') {
+        return;
+    }
+    
+    // Create a custom button which inserts bold hello text on press
+    const button = api.ui.createButton({
+        label: 'Greet',
+        action: () => {
+            api.content.insertHtml(`<strong>Hello!</strong>`);
+        }
+    });
+    
+    // Add the button to the start of the first section within the main toolbar
+    const toolbar = api.ui.getMainToolbar();
+    if (toolbar) {
+      toolbar.getSections()[0]?.addButton(button, 0);   
+    }
+});
+```
+</details>
+
 ### `library-cm6::configure-theme`
 
 This event is called whenever a CodeMirror instance is loaded, as a method to configure the theme used by CodeMirror. This applies to all CodeMirror instances including in-page code blocks, editors using in BookStack settings, and the Page markdown editor.
@@ -142,7 +183,7 @@ This event is called whenever a CodeMirror instance is loaded, as a method to co
 
 - `darkModeActive` - A boolean to indicate if the current view/page is being loaded with dark mode active.
 - `registerViewTheme(builder)` - A method that can be called to register a new view (CodeMirror UI) theme.
-  - `builder` - A function that will return  an object that will be passed into the CodeMirror [EditorView.theme()](https://codemirror.net/docs/ref/#view.EditorView^theme) function as a StyleSpec.
+  - `builder` - A function that will return an object that will be passed into the CodeMirror [EditorView.theme()](https://codemirror.net/docs/ref/#view.EditorView^theme) function as a StyleSpec.
 - `registerHighlightStyle(builder)` - A method that can be called to register a new HighlightStyle (code highlighting) theme.
   - `builder` - A function, that receives a reference to [Tag.tags](https://lezer.codemirror.net/docs/ref/#highlight.tags) and returns an array of [TagStyle](https://codemirror.net/docs/ref/#language.TagStyle) objects.
 
@@ -301,7 +342,7 @@ This event is called just after any CodeMirror instances are initialised so that
 
 ##### Example
 
-The below shows how you'd prepend some default text to all content (page) code blocks.
+The below example shows how you'd prepend some default text to all content (page) code blocks.
 
 <details>
 <summary>Show Example</summary>
@@ -318,4 +359,4 @@ window.addEventListener('library-cm6::post-init', event => {
     }
 });
 ```
-</details>
\ No newline at end of file
+</details>
diff --git a/dev/docs/logical-theme-system.md b/dev/docs/logical-theme-system.md
index 0063c4e8bac..77028e917f7 100644
--- a/dev/docs/logical-theme-system.md
+++ b/dev/docs/logical-theme-system.md
@@ -74,7 +74,7 @@ Theme::registerCommand(new SayHelloCommand());
 
 ## Available Events
 
-All available events dispatched by BookStack are exposed as static properties on the `\BookStack\Theming\ThemeEvents` class, which can be found within the file `app/Theming/ThemeEvents.php` relative to your root BookStack folder. Alternatively, the events for the latest release can be [seen on GitHub here](https://github.com/BookStackApp/BookStack/blob/release/app/Theming/ThemeEvents.php).
+All available events dispatched by BookStack are exposed as static properties on the `\BookStack\Theming\ThemeEvents` class, which can be found within the file `app/Theming/ThemeEvents.php` relative to your root BookStack folder. Alternatively, the events for the latest release can be [seen on Codeberg here](https://codeberg.org/bookstack/bookstack/src/branch/release/app/Theming/ThemeEvents.php).
 
 The comments above each constant with the `ThemeEvents.php` file describe the dispatch conditions of the event, in addition to the arguments the action will receive. The comments may also describe any ways the return value of the action may be used. 
 
@@ -99,6 +99,41 @@ Theme::listen(ThemeEvents::APP_BOOT, function($app) {
 });
 ```
 
+## Custom View Registration Example
+
+Using the logical theme system, you can register custom views to be rendered before/after other existing views, providing a flexible way to add content without needing to override and/or replicate existing content. This is done by listening to the `THEME_REGISTER_VIEWS`.
+
+**Note:** You don't need to use this to override existing views, or register whole new main views to use, since that's done automatically based on their existence. This is just for advanced capabilities like inserting before/after existing views.
+
+This event provides a `ThemeViews` instance which has the following methods made available:
+
+- `renderBefore(string $targetView, string $localView, int $priority)`
+- `renderAfter(string $targetView, string $localView, int $priority)`
+
+The target view is the name of that which we want to insert our custom view relative to.
+The local view is the name of the view we want to add and render.
+The priority provides a suggestion to the ordering of view display, with lower numbers being shown first. This defaults to 50 if not provided.
+
+Here's an example of this in use:
+
+```php
+<?php
+
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\Theming\ThemeViews;
+
+Theme::listen(ThemeEvents::THEME_REGISTER_VIEWS, function (ThemeViews $themeViews) {
+    $themeViews->renderBefore('layouts.parts.header', 'welcome-banner', 4);
+    $themeViews->renderAfter('layouts.parts.header', 'information-alert');
+    $themeViews->renderAfter('layouts.parts.header', 'additions.password-notice', 20);
+});
+```
+
+In this example, we're inserting custom views before and after the main header bar.
+BookStack will look for a `welcome-banner.blade.php` file within our theme folder (or a theme module view folder) to render before the header. It'll look for the `information-alert.blade.php` and `additions/password-notice.blade.php` views to render afterwards.
+The password notice will be shown above the information alert view, since it has a specified priority of 20, whereas the information alert view would default to a priority of 50.
+
 ## Custom Command Registration Example
 
 The logical theme system supports adding custom [artisan commands](https://laravel.com/docs/8.x/artisan) to BookStack.
@@ -158,4 +193,111 @@ Theme::addSocialDriver('reddit', [
     $driver->with(['prompt' => 'select_account']);
     $driver->scopes(['open_id']);
 });
-```
\ No newline at end of file
+```
+
+## Custom View Layout Block Example
+
+By listening to the `ThemeEvents::VIEW_BLOCKS_REGISTER` event, it's possible to register
+custom view blocks which can be shown in a layout in the application. View blocks are typically the sections shown in the sidebar,
+or the cards shown on the home view.
+
+As an example of using this system, we'll define a custom view block which will show on the default home view to state how many
+books there are in the system.
+To start, we'll need to create a custom class to represent our view block.
+This must implement `\BookStack\View\ViewBlockInterface`, but we'd advise extending `\BookStack\View\BaseViewBlock` since this will
+be used as a core reference implementation, and is intended to be forward compatible with future changes:
+
+```php
+use BookStack\Entities\Queries\BookQueries;
+use BookStack\View\BaseViewBlock;
+use BookStack\View\ViewBlockManager;
+
+class BookTotalBlock extends BaseViewBlock {
+
+    public function __construct(
+        protected BookQueries $bookQueries
+    ) {
+    }
+
+    public static function getId(): string
+    {
+        return 'custom_book_total_block';
+    }
+
+    public static function getLabel(): string
+    {
+        return 'Total books display';
+    }
+
+    public function getView(array $viewData): string
+    {
+        return 'blocks.total-books';
+    }
+
+    public function getViewData(array $viewData): array
+    {
+        $totalBooks = $this->bookQueries->visibleForList()->count();
+        return [
+            'totalBooks' => $totalBooks,
+        ];
+    }
+}
+```
+
+The interface has a few required methods:
+
+- The `getId` method must provide a unique per-block-type string ID.
+- The `getLabel` method must provide a general string label for the block.
+- The `getView` method provides a string path to a view file (Can be one custom registered).
+  - This is provided the available view data at time of render, so it can be dynamic based on context. 
+- The `getViewData` method is called when the block is being rendered, and it should return an array of data which will be merged with existing view data.
+  - This is also provided with the available view data, for use as context.
+
+In this example, we're also making use of the `BookQueries` internal BookStack class.
+You're able to inject any other dependent classes/services via the constructor like this, and BookStack will attempt to auto-resolve them.
+_Keep in mind that any used internal BookStack services or classes are not assured to be stable, so may receive breaking changes on update._
+
+We can then register our custom block class using the logical theme system like so:
+
+```php
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\View\ViewBlockManager;
+
+Theme::listen(ThemeEvents::VIEW_BLOCKS_REGISTER, function (ViewBlockManager $manager) {
+    $manager->register(
+        'home-default',       // The location/layout where this block will be displayed
+        'right',              // The default position for the block within the location
+        BookTotalBlock::class // The block class to register
+    );
+});
+```
+
+Available locations and positions can be found in the [ViewBlockDefaults](../../app/View/ViewBlockDefaults.php)
+class, with locations being the top-level keys, and positions for each location being the nested keys.
+
+The above registration code would typically be within your `functions.php` theme file.
+You could also define the above block class in the same file, or separate it into its own class file
+and include it from the `functions.php` via a `require_once()` call.
+
+Lastly, we'll need to create the view for the registered block.
+In our example we return `blocks.total-books` from the `getView` method, so our view needs to be located at
+`blocks/total-books.blade.php` from a view providing directory. 
+In a theme folder, we can just create it at `blocks/total-books.blade.php` within the folder path.
+If we were building in a module, we'd need to create this at `views/blocks/total-books.blade.php` within our module folder.
+For our example, we'll use this content to make use of the data we're passing to the view:
+
+```html
+<div class="card mb-xl">
+  <h3 class="card-title">Total Books</h3>
+  <div class="px-m pb-xs">
+    <p>
+      There are currently {{ $totalBooks }} books in the system!
+    </p>
+  </div>
+</div>
+```
+
+This will then show up on the default home grid view, in the right column.
+The exact position within that location may change depending on user preferences, but the block will be limited
+to the layout location provided during registration unless it has also been registered for other locations.
diff --git a/dev/docs/php-testing.md b/dev/docs/php-testing.md
index 1bd4a414ff3..7aa7b272bdb 100644
--- a/dev/docs/php-testing.md
+++ b/dev/docs/php-testing.md
@@ -4,7 +4,7 @@ BookStack has many test cases defined within the `tests/` directory of the app.
 
 ## Setup
 
-The application tests are mostly functional, rather than unit tests, meaning they simulate user actions and system components and therefore these require use of the database. To avoid potential conflicts within your development environment, the tests use a separate database. This is defined via a specific `mysql_testing` database connection in our configuration, and expects to use the following database access details:
+The application tests are mostly functional, rather than unit tests, meaning they simulate user actions and system components, and therefore these require use of the database. To avoid potential conflicts within your development environment, the tests use a separate database. This is defined via a specific `mysql_testing` database connection in our configuration, and expects to use the following database access details:
 
 - Host: `127.0.0.1`
 - Username: `bookstack-test`
@@ -39,6 +39,12 @@ php vendor/bin/phpunit --filter test_default_homepage_visible
 
 # Filter to a particular test class name
 php vendor/bin/phpunit --filter HomepageTest
+
+# Run slow tests
+php vendor/bin/phpunit --group slow
+
+# Run language list check
+php vendor/bin/phpunit --group lang
 ```
 
 If the codebase needs to be tested with deprecations, this can be done via uncommenting the relevant line within the `TestCase@setUp` function.  This is not expected for most PRs to the project, but instead used for maintenance tasks like dependency & PHP upgrades.
diff --git a/dev/docs/release-process.md b/dev/docs/release-process.md
index 758d6db4cfc..75e9a5ae61d 100644
--- a/dev/docs/release-process.md
+++ b/dev/docs/release-process.md
@@ -12,13 +12,13 @@ Feature releases are generally larger, bringing new features in addition to fixe
 
 ### Release Planning Process
 
-Each BookStack release will have a [milestone](https://github.com/BookStackApp/BookStack/milestones) created with issues & pull requests assigned to it to define what will be in that release. Milestones are built up then worked through until complete at which point, after some testing and documentation updates, the release will be deployed.
+Each BookStack release will have a [milestone](https://codeberg.org/bookstack/bookstack/milestones) created with issues & pull requests assigned to it to define what will be in that release. Milestones are built up then worked through until complete at which point, after some testing and documentation updates, the release will be deployed.
 
 ### Release Announcements
 
-Feature releases, and some patch releases, will be accompanied by a post on the [BookStack blog](https://www.bookstackapp.com/blog/) which will provide additional detail on features, changes & updates otherwise the [GitHub release page](https://github.com/BookStackApp/BookStack/releases) will show a list of changes. You can sign up to be alerted to new BookStack blog posts (once per week maximum) [at this link](https://updates.bookstackapp.com/signup/bookstack-news-and-updates).
+Feature releases, and some patch releases, will be accompanied by a post on the [BookStack blog](https://www.bookstackapp.com/blog/) which will provide additional detail on features, changes & updates otherwise the [Codeberg release page](https://codeberg.org/bookstack/bookstack/releases) will show a list of changes. You can sign up to be alerted to new BookStack blog posts (once per week maximum) [at this link](https://updates.bookstackapp.com/signup/bookstack-news-and-updates).
 
 ### Release Technical Process
 
 Deploying a release, at a high level, simply involves merging the development branch into the release branch before then building & committing any release-only assets.
-A helper script [can be found in our](https://github.com/BookStackApp/devops/blob/main/meta-scripts/bookstack-release-steps) devops repo which provides the steps and commands for deploying a new release. 
\ No newline at end of file
+A helper script [can be found in our](https://codeberg.org/bookstack/devops/src/branch/main/meta-scripts/bookstack-release-steps) devops repo which provides the steps and commands for deploying a new release. 
\ No newline at end of file
diff --git a/dev/docs/theme-system-modules.md b/dev/docs/theme-system-modules.md
new file mode 100644
index 00000000000..0086ac9c013
--- /dev/null
+++ b/dev/docs/theme-system-modules.md
@@ -0,0 +1,73 @@
+# Theme System Modules
+
+A theme system module is a collection of customizations using the [visual](visual-theme-system.md) and [logical](logical-theme-system.md) theme systems, provided along with some metadata, that can be installed alongside other modules within a theme. They can effectively be thought of as "plugins" or "extensions" that can be applied in addition to any customizations in the active theme.
+
+### Module Location
+
+Modules are contained within a folder themselves, which should be located inside a `modules` folder within a [BookStack theme folder](visual-theme-system.md#getting-started). 
+As an example, starting from the `themes/` top-level folder of a BookStack instance:
+
+```txt
+themes
+└── my-theme
+    └── modules
+        ├── module-a
+        │   └── bookstack-module.json
+        └── module-b
+            └── bookstack-module.json
+```
+
+### Module Format
+
+A module exists as a folder in the location [as detailed above](#module-location).
+The content within the module folder should then follow this format:
+
+- `bookstack-module.json` - REQUIRED - A JSON file containing [the metadata](#module-json-metadata) for the module.
+- `functions.php` - OPTIONAL - A PHP file containing code for the [logical theme system](logical-theme-system.md).
+- `head/` - OPTIONAL - A folder containing HTML files which will be included into the HTML head of app-views.
+- `icons/` - OPTIONAL - A folder containing any icons to use as per [the visual theme system](visual-theme-system.md#customizing-icons).
+- `lang/` - OPTIONAL - A folder containing any language files to use as per [the visual theme system](visual-theme-system.md#customizing-text-content).
+- `public/` - OPTIONAL - A folder containing any files to expose into public web-space as per [the visual theme system](visual-theme-system.md#publicly-accessible-files).
+- `views/` - OPTIONAL - A folder containing any view additions or overrides as per [the visual theme system](visual-theme-system.md#customizing-view-files).
+
+You can create additional directories/files for your own needs within the module, but ideally name them something unique to prevent conflicts with the above structure.
+
+### Module JSON Metadata
+
+Modules are required to have a `bookstack-module.json` file in the top level directory of the module.
+This must be a JSON file with the following properties:
+
+- `name` - string - An (ideally unique) name for the module.
+- `description` - string - A short description of the module.
+- `version` - string - A string version number generally following [semantic versioning](https://semver.org/).
+  - Examples: `v0.4.0`, `4.3.12`,  `v0.1.0-beta4`.
+
+### Customization Order/Precedence
+
+It's possible that multiple modules may override/customize the same content.
+Right now, there's no assurance in regard to the order in which modules may be loaded.
+Generally they will be used/searched in order of their module folder name, but this is not assured and should not be relied upon.
+
+It's also possible that modules customize the same content as the configured theme.
+In this scenario, the theme takes precedence. Modules are designed to be more portable and instance abstract, whereas the theme folder would typically be specific to the instance. 
+This allows the theme to be used to customize or override module content for the BookStack instance, without altering the module code itself.
+
+### Module Best Practices
+
+Here are some general best practices when it comes to creating modules:
+
+- Use a unique name and clear description so the user can understand the purpose of the module.
+- Increment the metadata version on change, keeping to [semver](https://semver.org/) to indicate compatibility of new versions.
+- Where possible, prefer to [insert views before/after](logical-theme-system.md#custom-view-registration-example) instead of overriding existing views, to reduce likelihood of conflicts or update troubles.
+- When using/registering custom views, use some level of unique namespacing within the view path to prevent potential conflicts with other customizations.
+  - For example, I may store a view within my module as `views/my-module-name-welcome.blade.php`, to be registered as 'my-module-name-welcome'.
+  - This is important since views may be resolved from other modules or the active theme, which may/will override your module level view.
+
+### Distribution Format
+
+Modules are expected to be distributed as a compressed ZIP file, where the ZIP contents follow that of a module folder.
+Contents may optionally be placed within a nested folder inside the ZIP.
+BookStack provides a `php artisan bookstack:install-module` command which allows modules to be installed from these ZIP files, either from a local path or from a web URL.
+Currently, there's a hardcoded total filesize limit of 50MB for module contents installed via this method.
+
+There is not yet any direct update mechanism for modules, although this is something we may introduce in the future.
\ No newline at end of file
diff --git a/dev/docs/visual-theme-system.md b/dev/docs/visual-theme-system.md
index 8a76ddb00e0..327660be52e 100644
--- a/dev/docs/visual-theme-system.md
+++ b/dev/docs/visual-theme-system.md
@@ -4,7 +4,7 @@ BookStack allows visual customization via the theme system which enables you to
 
 This is part of the theme system alongside the [logical theme system](./logical-theme-system.md).
 
-**Note:** This theme system itself is maintained and supported but usages of this system, including the files you are able to override, are not considered stable and may change upon any update. You should test any customizations made after updates.
+**Note:** This theme system itself is maintained and supported, but usages of this system, including the files you are able to override, are not considered stable and may change upon any update. You should test any customizations made after updates.
 
 ## Getting Started
 
@@ -18,6 +18,9 @@ You'll need to tell BookStack to use your theme via the `APP_THEME` option in yo
 Content placed in your `themes/<theme_name>/` folder will override the original view files found in the `resources/views` folder. These files are typically [Laravel Blade](https://laravel.com/docs/10.x/blade) files.
 As an example, I could override the `resources/views/books/parts/list-item.blade.php` file with my own template at the path `themes/<theme_name>/books/parts/list-item.blade.php`. 
 
+In addition to overriding original views, this could be used to add new views for use via the [logical theme system](logical-theme-system.md).
+By using the `THEME_REGISTER_VIEWS` logical event, you can also register your views to be rendered before/after existing views. An example of this can be found in our [logical theme guidance](logical-theme-system.md#custom-view-registration-example).
+
 ## Customizing Icons
 
 SVG files placed in a `themes/<theme_name>/icons` folder will override any icons of the same name within `resources/icons`. You'd typically want to follow the format convention of the existing icons, where no XML deceleration is included and no width & height attributes are set, to ensure optimal compatibility. 
@@ -50,7 +53,7 @@ configured application theme.
 
 There are some considerations to these publicly served files:
 
-- Only a predetermined range "web safe" content-types are currently served.
+- Only a predetermined range of "web safe" content-types are currently served.
   - This limits running into potential insecure scenarios in serving problematic file types.
 - A static 1-day cache time it set on files served from this folder.
   - You can use alternative cache-breaking techniques (change of query string) upon changes if needed. 
diff --git a/dev/docs/wysiwyg-js-api.md b/dev/docs/wysiwyg-js-api.md
new file mode 100644
index 00000000000..869bf8c492a
--- /dev/null
+++ b/dev/docs/wysiwyg-js-api.md
@@ -0,0 +1,136 @@
+# WYSIWYG JavaScript API
+
+**Warning: This API is currently in development and may change without notice.**
+
+Feedback is very much welcomed via this issue: https://codeberg.org/bookstack/bookstack/issues/5937
+
+This document covers the JavaScript API for the (newer Lexical-based) WYSIWYG editor.
+This API is built and designed to abstract the internals of the editor away
+to provide a stable interface for performing common customizations.
+
+Only the methods and properties documented here are guaranteed to be stable **once this API
+is out of initial development**.
+Other elements may be accessible but are not designed to be used directly, and therefore may change
+without notice.
+Stable parts of the API may still change where needed, but such changes would be noted as part of BookStack update advisories.
+
+The methods shown here are documented using standard TypeScript notation.
+
+## Overview
+
+The API is provided as an object, which itself provides a number of modules
+via its properties:
+
+- `ui` - Provides methods related to the UI of the editor, like buttons and toolbars.
+- `content` - Provides methods related to the live user content being edited upon.
+
+Each of these modules, and the relevant types used within, are documented in detail below.
+
+The API object itself is provided via the [editor-wysiwyg::post-init](./javascript-public-events.md#editor-wysiwygpost-init)
+JavaScript public event, so you can access it like so:
+
+```javascript
+window.addEventListener('editor-wysiwyg::post-init', event => {
+    const {api} = event.detail;
+});
+```
+
+---
+
+## UI Module
+
+This module provides methods related to the UI of the editor, like buttons and toolbars.
+
+### Methods
+
+#### createButton(options: object): EditorApiButton
+
+Creates a new button which can be used by other methods.
+This takes an option object with the following properties:
+
+- `label` - string, optional - Used for the button text if no icon provided, or the button tooltip if an icon is provided.
+- `icon` - string, optional - The icon to use for the button. Expected to be an SVG string.
+- `action` - callback, required - The action to perform when the button is clicked.
+
+The function returns an [EditorApiButton](#editorapibutton) object.
+
+**Example**
+
+```javascript
+const button = api.ui.createButton({
+    label: 'Warn',
+    icon: '<svg>...</svg>',
+    action: () => {
+        window.alert('You clicked the button!');
+    }
+});
+```
+
+### getMainToolbar(): EditorApiToolbar
+
+Get the main editor toolbar. This is typically the toolbar at the top of the editor.
+The function returns an [EditorApiToolbar](#editorapitoolbar) object, or null if no toolbar is found.
+
+**Example**
+
+```javascript
+const toolbar = api.ui.getMainToolbar();
+const sections = toolbar?.getSections() || [];
+if (sections.length > 0) {
+    sections[0].addButton(button);
+}
+```
+
+### Types
+
+These are types which may be provided from UI module methods.
+
+#### EditorApiButton
+
+Represents a button created via the `createButton` method.
+This has the following methods:
+
+- `setActive(isActive: boolean): void` - Sets whether the button should be in an active state or not (typically active buttons appear as pressed).
+
+#### EditorApiToolbar
+
+Represents a toolbar within the editor. This is a bar typically containing sets of buttons.
+This has the following methods:
+
+- `getSections(): EditorApiToolbarSection[]` - Provides the main [EditorApiToolbarSections](#editorapitoolbarsection) contained within this toolbar.
+
+#### EditorApiToolbarSection
+
+Represents a section of the main editor toolbar, which contains a set of buttons.
+This has the following methods:
+
+- `getLabel(): string` - Provides the string label of the section.
+- `addButton(button: EditorApiButton, targetIndex: number = -1): void` - Adds a button to the section.
+  - By default, this will append the button, although a target index can be provided to insert at a specific position.
+
+---
+
+## Content Module
+
+This module provides methods related to the live user content being edited within the editor.
+
+### Methods
+
+#### insertHtml(html: string, position: string = 'selection'): void
+
+Inserts the given HTML string at the given position string.
+The position, if not provided, will default to `'selection'`, replacing any existing selected content (or inserting at the selection if there's no active selection range).
+Valid position string values are: `selection`, `start` and `end`. `start` & `end` are relative to the whole editor document.
+The HTML is not assured to be added to the editor exactly as provided, since it will be parsed and serialised to fit the editor's internal known model format. Different parts of the HTML content may be handled differently depending on if it's block or inline content.
+
+The function does not return anything.
+
+**Example**
+
+```javascript
+// Basic insert at selection
+api.content.insertHtml('<p>Hello <strong>world</strong>!</p>');
+
+// Insert at the start of the editor content
+api.content.insertHtml('<p>I\'m at the start!</p>', 'start');
+```
\ No newline at end of file
diff --git a/dev/licensing/js-library-licenses.txt b/dev/licensing/js-library-licenses.txt
index b5fa446a468..1abd39ec14a 100644
--- a/dev/licensing/js-library-licenses.txt
+++ b/dev/licensing/js-library-licenses.txt
@@ -1,16 +1,3 @@
-abab
-License: BSD-3-Clause
-License File: node_modules/abab/LICENSE.md
-Source: git+https://github.com/jsdom/abab.git
-Link: https://github.com/jsdom/abab#readme
------------
-acorn-globals
-License: MIT
-License File: node_modules/acorn-globals/LICENSE
-Copyright: Copyright (c) 2014 Forbes Lindesay
-Source: https://github.com/ForbesLindesay/acorn-globals.git
-Link: https://github.com/ForbesLindesay/acorn-globals.git
------------
 acorn-jsx
 License: MIT
 License File: node_modules/acorn-jsx/LICENSE
@@ -34,8 +21,10 @@ Link: https://github.com/acornjs/acorn
 -----------
 agent-base
 License: MIT
-Source: git://github.com/TooTallNate/node-agent-base.git
-Link: git://github.com/TooTallNate/node-agent-base.git
+License File: node_modules/agent-base/LICENSE
+Copyright: Copyright (c) 2013 Nathan Rajlich <******@***********.***>
+Source: https://github.com/TooTallNate/proxy-agents.git
+Link: https://github.com/TooTallNate/proxy-agents.git
 -----------
 ajv
 License: MIT
@@ -80,8 +69,9 @@ Source: zeit/arg
 Link: zeit/arg
 -----------
 argparse
-License: Python-2.0
+License: MIT
 License File: node_modules/argparse/LICENSE
+Copyright: Copyright (C) 2012 by Vitaly Puzrin
 Source: nodeca/argparse
 Link: nodeca/argparse
 -----------
@@ -92,34 +82,6 @@ Copyright: Copyright (c) 2023 Inspect JS
 Source: git+https://github.com/inspect-js/array-buffer-byte-length.git
 Link: https://github.com/inspect-js/array-buffer-byte-length#readme
 -----------
-array-includes
-License: MIT
-License File: node_modules/array-includes/LICENSE
-Copyright: Copyright (C) 2015 Jordan Harband
-Source: git://github.com/es-shims/array-includes.git
-Link: git://github.com/es-shims/array-includes.git
------------
-array.prototype.findlastindex
-License: MIT
-License File: node_modules/array.prototype.findlastindex/LICENSE
-Copyright: Copyright (c) 2021 ECMAScript Shims
-Source: git+https://github.com/es-shims/Array.prototype.findLastIndex.git
-Link: https://github.com/es-shims/Array.prototype.findLastIndex#readme
------------
-array.prototype.flat
-License: MIT
-License File: node_modules/array.prototype.flat/LICENSE
-Copyright: Copyright (c) 2017 ECMAScript Shims
-Source: git://github.com/es-shims/Array.prototype.flat.git
-Link: git://github.com/es-shims/Array.prototype.flat.git
------------
-array.prototype.flatmap
-License: MIT
-License File: node_modules/array.prototype.flatmap/LICENSE
-Copyright: Copyright (c) 2017 ECMAScript Shims
-Source: git://github.com/es-shims/Array.prototype.flatMap.git
-Link: git://github.com/es-shims/Array.prototype.flatMap.git
------------
 arraybuffer.prototype.slice
 License: MIT
 License File: node_modules/arraybuffer.prototype.slice/LICENSE
@@ -134,20 +96,6 @@ Copyright: Copyright (c) 2016 EduardoRFS
 Source: git+https://github.com/ljharb/async-function.git
 Link: https://github.com/ljharb/async-function#readme
 -----------
-async
-License: MIT
-License File: node_modules/async/LICENSE
-Copyright: Copyright (c) 2010-2018 Caolan McMahon
-Source: https://github.com/caolan/async.git
-Link: https://caolan.github.io/async/
------------
-asynckit
-License: MIT
-License File: node_modules/asynckit/LICENSE
-Copyright: Copyright (c) 2016 Alex Indigo
-Source: git+https://github.com/alexindigo/asynckit.git
-Link: https://github.com/alexindigo/asynckit#readme
------------
 available-typed-arrays
 License: MIT
 License File: node_modules/available-typed-arrays/LICENSE
@@ -194,9 +142,14 @@ Link: https://github.com/jestjs/jest.git
 balanced-match
 License: MIT
 License File: node_modules/balanced-match/LICENSE.md
-Copyright: Copyright (c) 2013 Julian Gruber &lt;******@************.***&gt;
 Source: git://github.com/juliangruber/balanced-match.git
-Link: https://github.com/juliangruber/balanced-match
+Link: git://github.com/juliangruber/balanced-match.git
+-----------
+baseline-browser-mapping
+License: Apache-2.0
+License File: node_modules/baseline-browser-mapping/LICENSE.txt
+Source: git+https://github.com/web-platform-dx/baseline-browser-mapping.git
+Link: git+https://github.com/web-platform-dx/baseline-browser-mapping.git
 -----------
 binary-extensions
 License: MIT
@@ -209,9 +162,8 @@ Link: sindresorhus/binary-extensions
 brace-expansion
 License: MIT
 License File: node_modules/brace-expansion/LICENSE
-Copyright: Copyright (c) 2013 Julian Gruber <******@************.***>
-Source: git://github.com/juliangruber/brace-expansion.git
-Link: https://github.com/juliangruber/brace-expansion
+Source: git+https://github.com/juliangruber/brace-expansion.git
+Link: git+https://github.com/juliangruber/brace-expansion.git
 -----------
 braces
 License: MIT
@@ -239,12 +191,11 @@ License: Apache-2.0
 Source: https://github.com/facebook/watchman
 Link: https://facebook.github.io/watchman/docs/bser.html
 -----------
-buffer-from
+cacheable
 License: MIT
-License File: node_modules/buffer-from/LICENSE
-Copyright: Copyright (c) 2016, 2018 Linus Unnebäck
-Source: LinusU/buffer-from
-Link: LinusU/buffer-from
+License File: node_modules/cacheable/LICENSE
+Source: git+https://github.com/jaredwray/cacheable.git
+Link: git+https://github.com/jaredwray/cacheable.git
 -----------
 call-bind-apply-helpers
 License: MIT
@@ -318,7 +269,7 @@ ci-info
 License: MIT
 License File: node_modules/ci-info/LICENSE
 Copyright: Copyright (c) 2016 Thomas Watson Steen
-Source: https://github.com/watson/ci-info.git
+Source: github:watson/ci-info
 Link: https://github.com/watson/ci-info
 -----------
 cjs-module-lexer
@@ -369,13 +320,6 @@ License File: node_modules/color-name/LICENSE
 Source: git@github.com:colorjs/color-name.git
 Link: https://github.com/colorjs/color-name
 -----------
-combined-stream
-License: MIT
-License File: node_modules/combined-stream/License
-Copyright: Copyright (c) 2011 Debuggable Limited <*****@**********.***>
-Source: git://github.com/felixge/node-combined-stream.git
-Link: https://github.com/felixge/node-combined-stream
------------
 concat-map
 License: MIT
 License File: node_modules/concat-map/LICENSE
@@ -390,13 +334,6 @@ All rights reserved.
 Source: git://github.com/thlorenz/convert-source-map.git
 Link: https://github.com/thlorenz/convert-source-map
 -----------
-create-jest
-License: MIT
-License File: node_modules/create-jest/LICENSE
-Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
-Source: https://github.com/jestjs/jest.git
-Link: https://github.com/jestjs/jest.git
------------
 create-require
 License: MIT
 License File: node_modules/create-require/LICENSE
@@ -408,8 +345,8 @@ crelt
 License: MIT
 License File: node_modules/crelt/LICENSE
 Copyright: Copyright (C) 2020 by Marijn Haverbeke <******@*********.******>
-Source: git+https://github.com/marijnh/crelt.git
-Link: https://github.com/marijnh/crelt#readme
+Source: git+https://code.haverbeke.berlin/marijn/crelt.git
+Link: https://code.haverbeke.berlin/marijn/crelt
 -----------
 cross-spawn
 License: MIT
@@ -418,13 +355,6 @@ Copyright: Copyright (c) 2018 Made With MOXY Lda <*****@****.******>
 Source: git@github.com:moxystudio/node-cross-spawn.git
 Link: https://github.com/moxystudio/node-cross-spawn
 -----------
-cssom
-License: MIT
-License File: node_modules/cssom/LICENSE.txt
-Copyright: Copyright (c) Nikita Vasilyev
-Source: NV/CSSOM
-Link: NV/CSSOM
------------
 cssstyle
 License: MIT
 License File: node_modules/cssstyle/LICENSE
@@ -515,18 +445,11 @@ Copyright: Copyright (C) 2015 Jordan Harband
 Source: git://github.com/ljharb/define-properties.git
 Link: git://github.com/ljharb/define-properties.git
 -----------
-delayed-stream
-License: MIT
-License File: node_modules/delayed-stream/License
-Copyright: Copyright (c) 2011 Debuggable Limited <*****@**********.***>
-Source: git://github.com/felixge/node-delayed-stream.git
-Link: https://github.com/felixge/node-delayed-stream
------------
 detect-libc
 License: Apache-2.0
 License File: node_modules/detect-libc/LICENSE
-Source: git://github.com/lovell/detect-libc
-Link: git://github.com/lovell/detect-libc
+Source: git://github.com/lovell/detect-libc.git
+Link: git://github.com/lovell/detect-libc.git
 -----------
 detect-newline
 License: MIT
@@ -535,13 +458,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/detect-newline
 Link: sindresorhus/detect-newline
 -----------
-diff-sequences
-License: MIT
-License File: node_modules/diff-sequences/LICENSE
-Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
-Source: https://github.com/jestjs/jest.git
-Link: https://github.com/jestjs/jest.git
------------
 diff
 License: BSD-3-Clause
 License File: node_modules/diff/LICENSE
@@ -549,18 +465,6 @@ Copyright: Copyright (c) 2009-2015, Kevin Decker <********@*****.***>
 Source: git://github.com/kpdecker/jsdiff.git
 Link: git://github.com/kpdecker/jsdiff.git
 -----------
-doctrine
-License: Apache-2.0
-License File: node_modules/doctrine/LICENSE
-Source: eslint/doctrine
-Link: https://github.com/eslint/doctrine
------------
-domexception
-License: MIT
-License File: node_modules/domexception/LICENSE.txt
-Source: jsdom/domexception
-Link: jsdom/domexception
------------
 dunder-proto
 License: MIT
 License File: node_modules/dunder-proto/LICENSE
@@ -568,18 +472,17 @@ Copyright: Copyright (c) 2024 ECMAScript Shims
 Source: git+https://github.com/es-shims/dunder-proto.git
 Link: https://github.com/es-shims/dunder-proto#readme
 -----------
-ejs
-License: Apache-2.0
-License File: node_modules/ejs/LICENSE
-Source: git://github.com/mde/ejs.git
-Link: https://github.com/mde/ejs
+eastasianwidth
+License: MIT
+Source: git://github.com/komagata/eastasianwidth.git
+Link: git://github.com/komagata/eastasianwidth.git
 -----------
 electron-to-chromium
 License: ISC
 License File: node_modules/electron-to-chromium/LICENSE
 Copyright: Copyright 2018 Kilian Valkhof
-Source: https://github.com/kilian/electron-to-chromium/
-Link: https://github.com/kilian/electron-to-chromium/
+Source: git+https://github.com/Kilian/electron-to-chromium.git
+Link: git+https://github.com/Kilian/electron-to-chromium.git
 -----------
 emittery
 License: MIT
@@ -609,6 +512,13 @@ Copyright: Copyright (c) 2015 JD Ballard
 Source: qix-/node-error-ex
 Link: qix-/node-error-ex
 -----------
+es-abstract-get
+License: MIT
+License File: node_modules/es-abstract-get/LICENSE
+Copyright: Copyright (c) 2026 Jordan Harband
+Source: git+https://github.com/ljharb/es-abstract-get.git
+Link: https://github.com/ljharb/es-abstract-get#readme
+-----------
 es-abstract
 License: MIT
 License File: node_modules/es-abstract/LICENSE
@@ -630,6 +540,13 @@ Copyright: Copyright (c) 2024 Jordan Harband
 Source: git+https://github.com/ljharb/es-errors.git
 Link: https://github.com/ljharb/es-errors#readme
 -----------
+es-module-lexer
+License: MIT
+License File: node_modules/es-module-lexer/LICENSE
+Copyright: Copyright (C) 2018-2022 Guy Bedford
+Source: git+https://github.com/guybedford/es-module-lexer.git
+Link: https://github.com/guybedford/es-module-lexer#readme
+-----------
 es-object-atoms
 License: MIT
 License File: node_modules/es-object-atoms/LICENSE
@@ -644,13 +561,6 @@ Copyright: Copyright (c) 2022 ECMAScript Shims
 Source: git+https://github.com/es-shims/es-set-tostringtag.git
 Link: https://github.com/es-shims/es-set-tostringtag#readme
 -----------
-es-shim-unscopables
-License: MIT
-License File: node_modules/es-shim-unscopables/LICENSE
-Copyright: Copyright (c) 2022 Jordan Harband
-Source: git+https://github.com/ljharb/es-shim-unscopables.git
-Link: https://github.com/ljharb/es-shim-unscopables#readme
------------
 es-to-primitive
 License: MIT
 License File: node_modules/es-to-primitive/LICENSE
@@ -679,34 +589,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/escape-string-regexp
 Link: sindresorhus/escape-string-regexp
 -----------
-escodegen
-License: BSD-2-Clause
-License File: node_modules/escodegen/LICENSE.BSD
-Copyright: Copyright (C) 2012 Yusuke Suzuki (twitter: @Constellation) and other contributors.
-Source: http://github.com/estools/escodegen.git
-Link: http://github.com/estools/escodegen
------------
-eslint-import-resolver-node
-License: MIT
-License File: node_modules/eslint-import-resolver-node/LICENSE
-Copyright: Copyright (c) 2015 Ben Mosher
-Source: https://github.com/import-js/eslint-plugin-import
-Link: https://github.com/import-js/eslint-plugin-import
------------
-eslint-module-utils
-License: MIT
-License File: node_modules/eslint-module-utils/LICENSE
-Copyright: Copyright (c) 2015 Ben Mosher
-Source: git+https://github.com/import-js/eslint-plugin-import.git
-Link: https://github.com/import-js/eslint-plugin-import#readme
------------
-eslint-plugin-import
-License: MIT
-License File: node_modules/eslint-plugin-import/LICENSE
-Copyright: Copyright (c) 2015 Ben Mosher
-Source: https://github.com/import-js/eslint-plugin-import
-Link: https://github.com/import-js/eslint-plugin-import
------------
 eslint-scope
 License: BSD-2-Clause
 License File: node_modules/eslint-scope/LICENSE
@@ -772,9 +654,10 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/execa
 Link: sindresorhus/execa
 -----------
-exit
-Source: git://github.com/cowboy/node-exit.git
-Link: https://github.com/cowboy/node-exit
+exit-x
+License: MIT
+Source: git://github.com/gruntjs/node-exit-x.git
+Link: https://github.com/gruntjs/node-exit-x
 -----------
 expect
 License: MIT
@@ -813,14 +696,8 @@ Link: https://facebook.github.io/watchman/
 file-entry-cache
 License: MIT
 License File: node_modules/file-entry-cache/LICENSE
-Copyright: Copyright (c) Roy Riojas & Jared Wray
-Source: jaredwray/file-entry-cache
-Link: jaredwray/file-entry-cache
------------
-filelist
-License: Apache-2.0
-Source: git://github.com/mde/filelist.git
-Link: https://github.com/mde/filelist
+Source: git+https://github.com/jaredwray/cacheable.git
+Link: git+https://github.com/jaredwray/cacheable.git
 -----------
 fill-range
 License: MIT
@@ -839,9 +716,8 @@ Link: sindresorhus/find-up
 flat-cache
 License: MIT
 License File: node_modules/flat-cache/LICENSE
-Copyright: Copyright (c) Roy Riojas and Jared Wray
-Source: jaredwray/flat-cache
-Link: jaredwray/flat-cache
+Source: git+https://github.com/jaredwray/cacheable.git
+Link: git+https://github.com/jaredwray/cacheable.git
 -----------
 flatted
 License: ISC
@@ -857,19 +733,12 @@ Copyright: Copyright (c) 2012 Raynos.
 Source: https://github.com/Raynos/for-each.git
 Link: https://github.com/Raynos/for-each
 -----------
-form-data
-License: MIT
-License File: node_modules/form-data/License
-Copyright: Copyright (c) 2012 Felix Geisendörfer (*****@**********.***) and contributors
-Source: git://github.com/form-data/form-data.git
-Link: git://github.com/form-data/form-data.git
------------
-fs.realpath
+foreground-child
 License: ISC
-License File: node_modules/fs.realpath/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: git+https://github.com/isaacs/fs.realpath.git
-Link: git+https://github.com/isaacs/fs.realpath.git
+License File: node_modules/foreground-child/LICENSE
+Copyright: Copyright (c) 2015-2023 Isaac Z. Schlueter and Contributors
+Source: git+https://github.com/tapjs/foreground-child.git
+Link: git+https://github.com/tapjs/foreground-child.git
 -----------
 function-bind
 License: MIT
@@ -892,6 +761,13 @@ Copyright: Copyright (c) 2019 Jordan Harband
 Source: git+https://github.com/inspect-js/functions-have-names.git
 Link: https://github.com/inspect-js/functions-have-names#readme
 -----------
+generator-function
+License: MIT
+License File: node_modules/generator-function/LICENSE.md
+Copyright: Copyright (c) 2015 Tiancheng “Timothy” Gu
+Source: git+https://github.com/TimothyGu/generator-function.git
+Link: https://github.com/TimothyGu/generator-function#readme
+-----------
 gensync
 License: MIT
 License File: node_modules/gensync/LICENSE
@@ -949,11 +825,10 @@ Source: gulpjs/glob-parent
 Link: gulpjs/glob-parent
 -----------
 glob
-License: ISC
-License File: node_modules/glob/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: git://github.com/isaacs/node-glob.git
-Link: git://github.com/isaacs/node-glob.git
+License: BlueOak-1.0.0
+License File: node_modules/glob/LICENSE.md
+Source: git@github.com:isaacs/node-glob.git
+Link: git@github.com:isaacs/node-glob.git
 -----------
 globals
 License: MIT
@@ -983,6 +858,13 @@ Copyright: Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contri
 Source: https://github.com/isaacs/node-graceful-fs
 Link: https://github.com/isaacs/node-graceful-fs
 -----------
+handlebars
+License: MIT
+License File: node_modules/handlebars/LICENSE
+Copyright: Copyright (C) 2011-2019 by Yehuda Katz
+Source: https://github.com/handlebars-lang/handlebars.js.git
+Link: https://handlebarsjs.com/
+-----------
 has-bigints
 License: MIT
 License File: node_modules/has-bigints/LICENSE
@@ -1025,6 +907,13 @@ Copyright: Copyright (c) 2021 Inspect JS
 Source: git+https://github.com/inspect-js/has-tostringtag.git
 Link: https://github.com/inspect-js/has-tostringtag#readme
 -----------
+hashery
+License: MIT
+License File: node_modules/hashery/LICENSE
+Copyright: Copyright (c) 2025 Jared Wray
+Source: https://github.com/jaredwray/hashery.git
+Link: https://github.com/jaredwray/hashery.git
+-----------
 hasown
 License: MIT
 License File: node_modules/hasown/LICENSE
@@ -1032,6 +921,12 @@ Copyright: Copyright (c) Jordan Harband and contributors
 Source: git+https://github.com/inspect-js/hasOwn.git
 Link: https://github.com/inspect-js/hasOwn#readme
 -----------
+hookified
+License: MIT
+License File: node_modules/hookified/LICENSE
+Source: git+https://github.com/jaredwray/hookified.git
+Link: https://github.com/jaredwray/hookified#readme
+-----------
 hosted-git-info
 License: ISC
 License File: node_modules/hosted-git-info/LICENSE
@@ -1054,13 +949,17 @@ Link: https://github.com/WebReflection/html-escaper
 -----------
 http-proxy-agent
 License: MIT
-Source: git://github.com/TooTallNate/node-http-proxy-agent.git
-Link: git://github.com/TooTallNate/node-http-proxy-agent.git
+License File: node_modules/http-proxy-agent/LICENSE
+Copyright: Copyright (c) 2013 Nathan Rajlich <******@***********.***>
+Source: https://github.com/TooTallNate/proxy-agents.git
+Link: https://github.com/TooTallNate/proxy-agents.git
 -----------
 https-proxy-agent
 License: MIT
-Source: git://github.com/TooTallNate/node-https-proxy-agent.git
-Link: git://github.com/TooTallNate/node-https-proxy-agent.git
+License File: node_modules/https-proxy-agent/LICENSE
+Copyright: Copyright (c) 2013 Nathan Rajlich <******@***********.***>
+Source: https://github.com/TooTallNate/proxy-agents.git
+Link: https://github.com/TooTallNate/proxy-agents.git
 -----------
 human-signals
 License: Apache-2.0
@@ -1093,13 +992,6 @@ Copyright: Copyright (c) 2014-present, Lee Byron and other contributors.
 Source: git://github.com/immutable-js/immutable-js.git
 Link: https://immutable-js.com
 -----------
-import-fresh
-License: MIT
-License File: node_modules/import-fresh/license
-Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
-Source: sindresorhus/import-fresh
-Link: sindresorhus/import-fresh
------------
 import-local
 License: MIT
 License File: node_modules/import-local/license
@@ -1112,20 +1004,6 @@ License: MIT
 Source: https://github.com/jensyt/imurmurhash-js
 Link: https://github.com/jensyt/imurmurhash-js
 -----------
-inflight
-License: ISC
-License File: node_modules/inflight/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter
-Source: https://github.com/npm/inflight.git
-Link: https://github.com/isaacs/inflight
------------
-inherits
-License: ISC
-License File: node_modules/inherits/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter
-Source: git://github.com/isaacs/inherits
-Link: git://github.com/isaacs/inherits
------------
 internal-slot
 License: MIT
 License File: node_modules/internal-slot/LICENSE
@@ -1203,6 +1081,13 @@ Copyright: Copyright (c) 2015 Jordan Harband
 Source: git://github.com/inspect-js/is-date-object.git
 Link: git://github.com/inspect-js/is-date-object.git
 -----------
+is-document.all
+License: MIT
+License File: node_modules/is-document.all/LICENSE
+Copyright: Copyright (c) 2026 Inspect JS
+Source: git+https://github.com/inspect-js/is-document.all.git
+Link: https://github.com/inspect-js/is-document.all#readme
+-----------
 is-extglob
 License: MIT
 License File: node_modules/is-extglob/LICENSE
@@ -1398,10 +1283,11 @@ Copyright: Copyright 2012-2015 Yahoo! Inc.
 Source: git+ssh://git@github.com/istanbuljs/istanbuljs.git
 Link: https://istanbul.js.org/
 -----------
-jake
-License: Apache-2.0
-Source: git://github.com/jakejs/jake.git
-Link: git://github.com/jakejs/jake.git
+jackspeak
+License: BlueOak-1.0.0
+License File: node_modules/jackspeak/LICENSE.md
+Source: git+https://github.com/isaacs/jackspeak.git
+Link: git+https://github.com/isaacs/jackspeak.git
 -----------
 jest-changed-files
 License: MIT
@@ -1466,13 +1352,6 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
-jest-get-type
-License: MIT
-License File: node_modules/jest-get-type/LICENSE
-Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
-Source: https://github.com/jestjs/jest.git
-Link: https://github.com/jestjs/jest.git
------------
 jest-haste-map
 License: MIT
 License File: node_modules/jest-haste-map/LICENSE
@@ -1508,11 +1387,6 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
-jest-pnp-resolver
-License: MIT
-Source: https://github.com/arcanis/jest-pnp-resolver.git
-Link: https://github.com/arcanis/jest-pnp-resolver
------------
 jest-regex-util
 License: MIT
 License File: node_modules/jest-regex-util/LICENSE
@@ -1602,14 +1476,14 @@ License: MIT
 License File: node_modules/js-yaml/LICENSE
 Copyright: Copyright (C) 2011-2015 by Vitaly Puzrin
 Source: nodeca/js-yaml
-Link: nodeca/js-yaml
+Link: https://github.com/nodeca/js-yaml
 -----------
 jsdom
 License: MIT
 License File: node_modules/jsdom/LICENSE.txt
 Copyright: Copyright (c) 2010 Elijah Insua
-Source: jsdom/jsdom
-Link: jsdom/jsdom
+Source: git+https://github.com/jsdom/jsdom.git
+Link: git+https://github.com/jsdom/jsdom.git
 -----------
 jsesc
 License: MIT
@@ -1617,13 +1491,6 @@ License File: node_modules/jsesc/LICENSE-MIT.txt
 Source: https://github.com/mathiasbynens/jsesc.git
 Link: https://mths.be/jsesc
 -----------
-json-buffer
-License: MIT
-License File: node_modules/json-buffer/LICENSE
-Copyright: Copyright (c) 2013 Dominic Tarr
-Source: git://github.com/dominictarr/json-buffer.git
-Link: https://github.com/dominictarr/json-buffer
------------
 json-parse-better-errors
 License: MIT
 License File: node_modules/json-parse-better-errors/LICENSE.md
@@ -1661,16 +1528,12 @@ Link: http://json5.org/
 -----------
 keyv
 License: MIT
+License File: node_modules/keyv/LICENSE
+Copyright: Copyright (c) 2017-2021 Luke Childs
+Copyright (c) 2021-2022 Jared Wray
 Source: git+https://github.com/jaredwray/keyv.git
 Link: https://github.com/jaredwray/keyv
 -----------
-kleur
-License: MIT
-License File: node_modules/kleur/license
-Copyright: Copyright (c) Luke Edwards <****.*********@*****.***> (lukeed.com)
-Source: lukeed/kleur
-Link: lukeed/kleur
------------
 leven
 License: MIT
 License File: node_modules/leven/license
@@ -1699,20 +1562,6 @@ Copyright: Copyright (c) 2015 Vitaly Puzrin.
 Source: markdown-it/linkify-it
 Link: markdown-it/linkify-it
 -----------
-livereload-js
-License: MIT
-License File: node_modules/livereload-js/LICENSE
-Copyright: Copyright (c) 2010-2012 Andrey Tarantsov
-Source: git://github.com/livereload/livereload-js.git
-Link: https://github.com/livereload/livereload-js
------------
-livereload
-License: MIT
-License File: node_modules/livereload/LICENSE
-Copyright: Copyright (c) 2010 Joshua Peek
-Source: http://github.com/napcs/node-livereload.git
-Link: http://github.com/napcs/node-livereload.git
------------
 load-json-file
 License: MIT
 License File: node_modules/load-json-file/license
@@ -1739,12 +1588,6 @@ License File: node_modules/lodash.memoize/LICENSE
 Source: lodash/lodash
 Link: https://lodash.com/
 -----------
-lodash.merge
-License: MIT
-License File: node_modules/lodash.merge/LICENSE
-Source: lodash/lodash
-Link: https://lodash.com/
------------
 lodash.throttle
 License: MIT
 License File: node_modules/lodash.throttle/LICENSE
@@ -1772,13 +1615,6 @@ Copyright: Copyright 2014 Julien Fontanet
 Source: git://github.com/JsCommunity/make-error.git
 Link: https://github.com/JsCommunity/make-error
 -----------
-makeerror
-License: BSD-3-Clause
-License File: node_modules/makeerror/license
-Copyright: Copyright (c) 2014, Naitik Shah. All rights reserved.
-Source: https://github.com/daaku/nodejs-makeerror
-Link: https://github.com/daaku/nodejs-makeerror
------------
 markdown-it-task-lists
 License: ISC
 License File: node_modules/markdown-it-task-lists/LICENSE
@@ -1804,8 +1640,8 @@ mdurl
 License: MIT
 License File: node_modules/mdurl/LICENSE
 Copyright: Copyright (c) 2015 Vitaly Puzrin, Alex Kocharin.
-Source: markdown-it/mdurl
-Link: markdown-it/mdurl
+Source: git+https://github.com/markdown-it/mdurl.git
+Link: git+https://github.com/markdown-it/mdurl.git
 -----------
 memorystream
 License File: node_modules/memorystream/LICENSE
@@ -1820,29 +1656,6 @@ Copyright: Copyright (c) Stephen Sugden <**@*************.***> (stephensugden.co
 Source: grncdr/merge-stream
 Link: grncdr/merge-stream
 -----------
-micromatch
-License: MIT
-License File: node_modules/micromatch/LICENSE
-Copyright: Copyright (c) 2014-present, Jon Schlinkert.
-Source: micromatch/micromatch
-Link: https://github.com/micromatch/micromatch
------------
-mime-db
-License: MIT
-License File: node_modules/mime-db/LICENSE
-Copyright: Copyright (c) 2014 Jonathan Ong <**@***********.***>
-Copyright (c) 2015-2022 Douglas Christopher Wilson <****@*************.***>
-Source: jshttp/mime-db
-Link: jshttp/mime-db
------------
-mime-types
-License: MIT
-License File: node_modules/mime-types/LICENSE
-Copyright: Copyright (c) 2014 Jonathan Ong <**@***********.***>
-Copyright (c) 2015 Douglas Christopher Wilson <****@*************.***>
-Source: jshttp/mime-types
-Link: jshttp/mime-types
------------
 mimic-fn
 License: MIT
 License File: node_modules/mimic-fn/license
@@ -1851,11 +1664,10 @@ Source: sindresorhus/mimic-fn
 Link: sindresorhus/mimic-fn
 -----------
 minimatch
-License: ISC
-License File: node_modules/minimatch/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: git://github.com/isaacs/minimatch.git
-Link: git://github.com/isaacs/minimatch.git
+License: BlueOak-1.0.0
+License File: node_modules/minimatch/LICENSE.md
+Source: git@github.com:isaacs/minimatch
+Link: git@github.com:isaacs/minimatch
 -----------
 minimist
 License: MIT
@@ -1863,6 +1675,12 @@ License File: node_modules/minimist/LICENSE
 Source: git://github.com/minimistjs/minimist.git
 Link: https://github.com/minimistjs/minimist
 -----------
+minipass
+License: BlueOak-1.0.0
+License File: node_modules/minipass/LICENSE.md
+Source: https://github.com/isaacs/minipass
+Link: https://github.com/isaacs/minipass
+-----------
 ms
 License: MIT
 License File: node_modules/ms/license.md
@@ -1870,11 +1688,26 @@ Copyright: Copyright (c) 2020 Vercel, Inc.
 Source: vercel/ms
 Link: vercel/ms
 -----------
+napi-postinstall
+License: MIT
+License File: node_modules/napi-postinstall/LICENSE
+Copyright: Copyright (c) 2021-present UnTS
+Source: git+https://github.com/un-ts/napi-postinstall.git
+Link: git+https://github.com/un-ts/napi-postinstall.git
+-----------
 natural-compare
 License: MIT
 Source: git://github.com/litejs/natural-compare-lite.git
 Link: git://github.com/litejs/natural-compare-lite.git
 -----------
+neo-async
+License: MIT
+License File: node_modules/neo-async/LICENSE
+Copyright: Copyright (c) 2014-2018 Suguru Motegi
+Based on Async.js, Copyright Caolan McMahon
+Source: git@github.com:suguru03/neo-async.git
+Link: https://github.com/suguru03/neo-async
+-----------
 nice-try
 License: MIT
 License File: node_modules/nice-try/LICENSE
@@ -1900,8 +1733,8 @@ node-releases
 License: MIT
 License File: node_modules/node-releases/LICENSE
 Copyright: Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
-Source: git+https://github.com/chicoxyzzy/node-releases.git
-Link: git+https://github.com/chicoxyzzy/node-releases.git
+Source: https://github.com/chicoxyzzy/node-releases.git
+Link: https://github.com/chicoxyzzy/node-releases.git
 -----------
 normalize-package-data
 License: BSD-2-Clause
@@ -1935,8 +1768,8 @@ Link: sindresorhus/npm-run-path
 nwsapi
 License: MIT
 License File: node_modules/nwsapi/LICENSE
-Copyright: Copyright (c) 2007-2025 Diego Perini (http://www.iport.it/)
-Source: git://github.com/dperini/nwsapi.git
+Copyright: Copyright (c) 2007-2026 Diego Perini (http://www.iport.it/)
+Source: https://github.com/dperini/nwsapi.git
 Link: https://javascript.nwbox.com/nwsapi/
 -----------
 object-inspect
@@ -1960,34 +1793,6 @@ Copyright: Copyright (c) 2014 Jordan Harband
 Source: git://github.com/ljharb/object.assign.git
 Link: git://github.com/ljharb/object.assign.git
 -----------
-object.fromentries
-License: MIT
-License File: node_modules/object.fromentries/LICENSE
-Copyright: Copyright (c) 2018 Jordan Harband
-Source: git://github.com/es-shims/Object.fromEntries.git
-Link: git://github.com/es-shims/Object.fromEntries.git
------------
-object.groupby
-License: MIT
-License File: node_modules/object.groupby/LICENSE
-Copyright: Copyright (c) 2023 ECMAScript Shims
-Source: git+https://github.com/es-shims/Object.groupBy.git
-Link: https://github.com/es-shims/Object.groupBy#readme
------------
-object.values
-License: MIT
-License File: node_modules/object.values/LICENSE
-Copyright: Copyright (c) 2015 Jordan Harband
-Source: git://github.com/es-shims/Object.values.git
-Link: git://github.com/es-shims/Object.values.git
------------
-once
-License: ISC
-License File: node_modules/once/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: git://github.com/isaacs/once
-Link: git://github.com/isaacs/once
------------
 onetime
 License: MIT
 License File: node_modules/onetime/license
@@ -2002,14 +1807,6 @@ Copyright: Copyright (c) George Zahariev
 Source: git://github.com/gkz/optionator.git
 Link: https://github.com/gkz/optionator
 -----------
-opts
-License: BSD-2-Clause
-License File: node_modules/opts/LICENSE.txt
-Copyright: Copyright (c) 2010, Joey Mazzarelli
-All rights reserved.
-Source: github:khtdr/opts
-Link: http://khtdr.com/opts
------------
 own-keys
 License: MIT
 License File: node_modules/own-keys/LICENSE
@@ -2038,12 +1835,11 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/p-try
 Link: sindresorhus/p-try
 -----------
-parent-module
-License: MIT
-License File: node_modules/parent-module/license
-Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
-Source: sindresorhus/parent-module
-Link: sindresorhus/parent-module
+package-json-from-dist
+License: BlueOak-1.0.0
+License File: node_modules/package-json-from-dist/LICENSE.md
+Source: git+https://github.com/isaacs/package-json-from-dist.git
+Link: git+https://github.com/isaacs/package-json-from-dist.git
 -----------
 parse-json
 License: MIT
@@ -2066,13 +1862,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/path-exists
 Link: sindresorhus/path-exists
 -----------
-path-is-absolute
-License: MIT
-License File: node_modules/path-is-absolute/license
-Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
-Source: sindresorhus/path-is-absolute
-Link: sindresorhus/path-is-absolute
------------
 path-key
 License: MIT
 License File: node_modules/path-key/license
@@ -2087,6 +1876,12 @@ Copyright: Copyright (c) 2015 Javier Blanco
 Source: https://github.com/jbgutierrez/path-parse.git
 Link: https://github.com/jbgutierrez/path-parse#readme
 -----------
+path-scurry
+License: BlueOak-1.0.0
+License File: node_modules/path-scurry/LICENSE.md
+Source: git+https://github.com/isaacs/path-scurry
+Link: git+https://github.com/isaacs/path-scurry
+-----------
 path-type
 License: MIT
 License File: node_modules/path-type/license
@@ -2157,20 +1952,6 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
-prompts
-License: MIT
-License File: node_modules/prompts/license
-Copyright: Copyright (c) 2018 Terkel Gjervig Nielsen
-Source: terkelg/prompts
-Link: terkelg/prompts
------------
-psl
-License: MIT
-License File: node_modules/psl/LICENSE
-Copyright: Copyright (c) 2017 Lupo Montero ***********@*****.***
-Source: git@github.com:lupomontero/psl.git
-Link: git@github.com:lupomontero/psl.git
------------
 punycode.js
 License: MIT
 License File: node_modules/punycode.js/LICENSE-MIT.txt
@@ -2190,19 +1971,11 @@ Copyright: Copyright (c) 2018 Nicolas DUBIEN
 Source: git+https://github.com/dubzzz/pure-rand.git
 Link: https://github.com/dubzzz/pure-rand#readme
 -----------
-querystringify
+qified
 License: MIT
-License File: node_modules/querystringify/LICENSE
-Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
-Source: https://github.com/unshiftio/querystringify
-Link: https://github.com/unshiftio/querystringify
------------
-react-is
-License: MIT
-License File: node_modules/react-is/LICENSE
-Copyright: Copyright (c) Facebook, Inc. and its affiliates.
-Source: https://github.com/facebook/react.git
-Link: https://reactjs.org/
+License File: node_modules/qified/LICENSE
+Source: git+https://github.com/jaredwray/qified.git
+Link: https://github.com/jaredwray/qified#readme
 -----------
 read-pkg
 License: MIT
@@ -2246,13 +2019,6 @@ Copyright: Copyright (c) 2016, Contributors
 Source: git+ssh://git@github.com/yargs/require-main-filename.git
 Link: https://github.com/yargs/require-main-filename#readme
 -----------
-requires-port
-License: MIT
-License File: node_modules/requires-port/LICENSE
-Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
-Source: https://github.com/unshiftio/requires-port
-Link: https://github.com/unshiftio/requires-port
------------
 resolve-cwd
 License: MIT
 License File: node_modules/resolve-cwd/license
@@ -2267,19 +2033,19 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: sindresorhus/resolve-from
 Link: sindresorhus/resolve-from
 -----------
-resolve.exports
-License: MIT
-License File: node_modules/resolve.exports/license
-Copyright: Copyright (c) Luke Edwards <****.*********@*****.***> (lukeed.com)
-Source: lukeed/resolve.exports
-Link: lukeed/resolve.exports
------------
 resolve
 License: MIT
 License File: node_modules/resolve/LICENSE
 Copyright: Copyright (c) 2012 James Halliday
-Source: git://github.com/browserify/resolve.git
-Link: git://github.com/browserify/resolve.git
+Source: ssh://github.com/browserify/resolve.git
+Link: ssh://github.com/browserify/resolve.git
+-----------
+rrweb-cssom
+License: MIT
+License File: node_modules/rrweb-cssom/LICENSE.txt
+Copyright: Copyright (c) Nikita Vasilyev
+Source: rrweb-io/CSSOM
+Link: rrweb-io/CSSOM
 -----------
 safe-array-concat
 License: MIT
@@ -2412,13 +2178,6 @@ Copyright: Copyright (c) 2015, Contributors
 Source: https://github.com/tapjs/signal-exit.git
 Link: https://github.com/tapjs/signal-exit
 -----------
-sisteransi
-License: MIT
-License File: node_modules/sisteransi/license
-Copyright: Copyright (c) 2018 Terkel Gjervig Nielsen
-Source: https://github.com/terkelg/sisteransi
-Link: https://github.com/terkelg/sisteransi
------------
 slash
 License: MIT
 License File: node_modules/slash/license
@@ -2447,13 +2206,6 @@ All rights reserved.
 Source: 7rulnik/source-map-js
 Link: https://github.com/7rulnik/source-map-js
 -----------
-source-map-support
-License: MIT
-License File: node_modules/source-map-support/LICENSE.md
-Copyright: Copyright (c) 2014 Evan Wallace
-Source: https://github.com/evanw/node-source-map-support
-Link: https://github.com/evanw/node-source-map-support
------------
 source-map
 License: BSD-3-Clause
 License File: node_modules/source-map/LICENSE
@@ -2516,6 +2268,13 @@ Link: sindresorhus/string-length
 -----------
 string-width
 License: MIT
+License File: node_modules/string-width-cjs/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: sindresorhus/string-width
+Link: sindresorhus/string-width
+-----------
+string-width
+License: MIT
 License File: node_modules/string-width/license
 Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
 Source: sindresorhus/string-width
@@ -2551,6 +2310,13 @@ Link: git://github.com/es-shims/String.prototype.trimStart.git
 -----------
 strip-ansi
 License: MIT
+License File: node_modules/strip-ansi-cjs/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
+Source: chalk/strip-ansi
+Link: chalk/strip-ansi
+-----------
+strip-ansi
+License: MIT
 License File: node_modules/strip-ansi/license
 Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.com)
 Source: chalk/strip-ansi
@@ -2605,6 +2371,13 @@ Copyright: Copyright (c) 2015 Joris van der Wel
 Source: https://github.com/jsdom/js-symbol-tree.git
 Link: https://github.com/jsdom/js-symbol-tree#symbol-tree
 -----------
+synckit
+License: MIT
+License File: node_modules/synckit/LICENSE
+Copyright: Copyright (c) 2021 UnTS
+Source: https://github.com/un-ts/synckit.git
+Link: https://github.com/un-ts/synckit.git
+-----------
 test-exclude
 License: ISC
 License File: node_modules/test-exclude/LICENSE.txt
@@ -2612,12 +2385,19 @@ Copyright: Copyright (c) 2016, Contributors
 Source: git+https://github.com/istanbuljs/test-exclude.git
 Link: https://istanbul.js.org/
 -----------
-tmpl
-License: BSD-3-Clause
-License File: node_modules/tmpl/license
-Copyright: Copyright (c) 2014, Naitik Shah. All rights reserved.
-Source: https://github.com/daaku/nodejs-tmpl
-Link: https://github.com/daaku/nodejs-tmpl
+tldts-core
+License: MIT
+License File: node_modules/tldts-core/LICENSE
+Copyright: Copyright (c) 2017 Thomas Parisot, 2018 Rémi Berson
+Source: git+ssh://git@github.com/remusao/tldts.git
+Link: https://github.com/remusao/tldts#readme
+-----------
+tldts
+License: MIT
+License File: node_modules/tldts/LICENSE
+Copyright: Copyright (c) 2017 Thomas Parisot, 2018 Rémi Berson
+Source: git+ssh://git@github.com/remusao/tldts.git
+Link: https://github.com/remusao/tldts#readme
 -----------
 to-regex-range
 License: MIT
@@ -2654,13 +2434,6 @@ Copyright: Copyright (c) 2014 Blake Embrey (*****@***********.***)
 Source: git://github.com/TypeStrong/ts-node.git
 Link: https://typestrong.org/ts-node
 -----------
-tsconfig-paths
-License: MIT
-License File: node_modules/tsconfig-paths/LICENSE
-Copyright: Copyright (c) 2016 Jonas Kello
-Source: https://github.com/dividab/tsconfig-paths
-Link: https://github.com/dividab/tsconfig-paths
------------
 type-check
 License: MIT
 License File: node_modules/type-check/LICENSE
@@ -2722,6 +2495,13 @@ License File: node_modules/uc.micro/LICENSE.txt
 Source: markdown-it/uc.micro
 Link: markdown-it/uc.micro
 -----------
+uglify-js
+License: BSD-2-Clause
+License File: node_modules/uglify-js/LICENSE
+Copyright: Copyright 2012-2024 (c) Mihai Bazon <*****.*****@*****.***>
+Source: mishoo/UglifyJS
+Link: mishoo/UglifyJS
+-----------
 unbox-primitive
 License: MIT
 License File: node_modules/unbox-primitive/LICENSE
@@ -2736,12 +2516,10 @@ Copyright: Copyright (c) Matteo Collina and Undici contributors
 Source: git+https://github.com/nodejs/undici.git
 Link: https://undici.nodejs.org
 -----------
-universalify
+unrs-resolver
 License: MIT
-License File: node_modules/universalify/LICENSE
-Copyright: Copyright (c) 2017, Ryan Zimmerman <*******@*******.***>
-Source: git+https://github.com/RyanZim/universalify.git
-Link: https://github.com/RyanZim/universalify#readme
+Source: git+https://github.com/unrs/unrs-resolver.git
+Link: https://github.com/unrs/unrs-resolver
 -----------
 update-browserslist-db
 License: MIT
@@ -2757,13 +2535,6 @@ Copyright: Copyright 2011 Gary Court. All rights reserved.
 Source: http://github.com/garycourt/uri-js
 Link: https://github.com/garycourt/uri-js
 -----------
-url-parse
-License: MIT
-License File: node_modules/url-parse/LICENSE
-Copyright: Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
-Source: https://github.com/unshiftio/url-parse.git
-Link: https://github.com/unshiftio/url-parse.git
------------
 v8-compile-cache-lib
 License: MIT
 License File: node_modules/v8-compile-cache-lib/LICENSE
@@ -2797,13 +2568,6 @@ License File: node_modules/w3c-xmlserializer/LICENSE.md
 Source: jsdom/w3c-xmlserializer
 Link: jsdom/w3c-xmlserializer
 -----------
-walker
-License: Apache-2.0
-License File: node_modules/walker/LICENSE
-Copyright: Copyright 2013 Naitik Shah
-Source: https://github.com/daaku/nodejs-walker
-Link: https://github.com/daaku/nodejs-walker
------------
 webidl-conversions
 License: BSD-2-Clause
 License File: node_modules/webidl-conversions/LICENSE.md
@@ -2880,6 +2644,19 @@ Copyright: Copyright (c) 2014-2016, Jon Schlinkert
 Source: jonschlinkert/word-wrap
 Link: https://github.com/jonschlinkert/word-wrap
 -----------
+wordwrap
+License: MIT
+License File: node_modules/wordwrap/LICENSE
+Source: git://github.com/substack/node-wordwrap.git
+Link: git://github.com/substack/node-wordwrap.git
+-----------
+wrap-ansi
+License: MIT
+License File: node_modules/wrap-ansi-cjs/license
+Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindresorhus.com)
+Source: chalk/wrap-ansi
+Link: chalk/wrap-ansi
+-----------
 wrap-ansi
 License: MIT
 License File: node_modules/wrap-ansi/license
@@ -2887,13 +2664,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (sindresorhus.co
 Source: chalk/wrap-ansi
 Link: chalk/wrap-ansi
 -----------
-wrappy
-License: ISC
-License File: node_modules/wrappy/LICENSE
-Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
-Source: https://github.com/npm/wrappy
-Link: https://github.com/npm/wrappy
------------
 write-file-atomic
 License: ISC
 License File: node_modules/write-file-atomic/LICENSE.md
@@ -2965,11 +2735,30 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/yocto-queue
 Link: sindresorhus/yocto-queue
 -----------
-@ampproject/remapping
-License: Apache-2.0
-License File: node_modules/@ampproject/remapping/LICENSE
-Source: git+https://github.com/ampproject/remapping.git
-Link: git+https://github.com/ampproject/remapping.git
+@asamuzakjp/css-color
+License: MIT
+License File: node_modules/@asamuzakjp/css-color/LICENSE
+Copyright: Copyright (c) 2024 asamuzaK (Kazz)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+Source: git+https://github.com/asamuzaK/cssColor.git
+Link: https://github.com/asamuzaK/cssColor#readme
 -----------
 @babel/code-frame
 License: MIT
@@ -3216,19 +3005,31 @@ License File: node_modules/@bcoe/v8-coverage/LICENSE.md
 Source: git://github.com/demurgos/v8-coverage.git
 Link: https://demurgos.github.io/v8-coverage
 -----------
+@cacheable/memory
+License: MIT
+License File: node_modules/@cacheable/memory/LICENSE
+Source: git+https://github.com/jaredwray/cacheable.git
+Link: git+https://github.com/jaredwray/cacheable.git
+-----------
+@cacheable/utils
+License: MIT
+License File: node_modules/@cacheable/utils/LICENSE
+Source: git+https://github.com/jaredwray/cacheable.git
+Link: git+https://github.com/jaredwray/cacheable.git
+-----------
 @codemirror/autocomplete
 License: MIT
 License File: node_modules/@codemirror/autocomplete/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/autocomplete.git
-Link: https://github.com/codemirror/autocomplete.git
+Source: git+https://code.haverbeke.berlin/codemirror/autocomplete.git
+Link: git+https://code.haverbeke.berlin/codemirror/autocomplete.git
 -----------
 @codemirror/commands
 License: MIT
 License File: node_modules/@codemirror/commands/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/commands.git
-Link: https://github.com/codemirror/commands.git
+Source: git+https://code.haverbeke.berlin/codemirror/commands.git
+Link: git+https://code.haverbeke.berlin/codemirror/commands.git
 -----------
 @codemirror/lang-css
 License: MIT
@@ -3241,15 +3042,15 @@ Link: https://github.com/codemirror/lang-css.git
 License: MIT
 License File: node_modules/@codemirror/lang-html/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/lang-html.git
-Link: https://github.com/codemirror/lang-html.git
+Source: git+https://code.haverbeke.berlin/codemirror/lang-html.git
+Link: git+https://code.haverbeke.berlin/codemirror/lang-html.git
 -----------
 @codemirror/lang-javascript
 License: MIT
 License File: node_modules/@codemirror/lang-javascript/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/lang-javascript.git
-Link: https://github.com/codemirror/lang-javascript.git
+Source: git+https://github.com/codemirror/lang-javascript.git
+Link: git+https://github.com/codemirror/lang-javascript.git
 -----------
 @codemirror/lang-json
 License: MIT
@@ -3262,8 +3063,8 @@ Link: https://github.com/codemirror/lang-json.git
 License: MIT
 License File: node_modules/@codemirror/lang-markdown/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/lang-markdown.git
-Link: https://github.com/codemirror/lang-markdown.git
+Source: git+https://code.haverbeke.berlin/codemirror/lang-markdown.git
+Link: git+https://code.haverbeke.berlin/codemirror/lang-markdown.git
 -----------
 @codemirror/lang-php
 License: MIT
@@ -3283,36 +3084,36 @@ Link: https://github.com/codemirror/lang-xml.git
 License: MIT
 License File: node_modules/@codemirror/language/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/language.git
-Link: https://github.com/codemirror/language.git
+Source: git+https://code.haverbeke.berlin/codemirror/language.git
+Link: git+https://code.haverbeke.berlin/codemirror/language.git
 -----------
 @codemirror/legacy-modes
 License: MIT
 License File: node_modules/@codemirror/legacy-modes/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/legacy-modes.git
-Link: https://github.com/codemirror/legacy-modes.git
+Source: git+https://code.haverbeke.berlin/codemirror/legacy-modes.git
+Link: git+https://code.haverbeke.berlin/codemirror/legacy-modes.git
 -----------
 @codemirror/lint
 License: MIT
 License File: node_modules/@codemirror/lint/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/lint.git
-Link: https://github.com/codemirror/lint.git
+Source: git+https://code.haverbeke.berlin/codemirror/lint.git
+Link: git+https://code.haverbeke.berlin/codemirror/lint.git
 -----------
 @codemirror/search
 License: MIT
 License File: node_modules/@codemirror/search/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/search.git
-Link: https://github.com/codemirror/search.git
+Source: git+https://code.haverbeke.berlin/codemirror/search.git
+Link: git+https://code.haverbeke.berlin/codemirror/search.git
 -----------
 @codemirror/state
 License: MIT
 License File: node_modules/@codemirror/state/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/state.git
-Link: https://github.com/codemirror/state.git
+Source: git+https://code.haverbeke.berlin/codemirror/state.git
+Link: git+https://code.haverbeke.berlin/codemirror/state.git
 -----------
 @codemirror/theme-one-dark
 License: MIT
@@ -3325,8 +3126,8 @@ Link: https://github.com/codemirror/theme-one-dark.git
 License: MIT
 License File: node_modules/@codemirror/view/LICENSE
 Copyright: Copyright (C) 2018-2021 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/codemirror/view.git
-Link: https://github.com/codemirror/view.git
+Source: git+https://code.haverbeke.berlin/codemirror/view.git
+Link: git+https://code.haverbeke.berlin/codemirror/view.git
 -----------
 @cspotcode/source-map-support
 License: MIT
@@ -3335,6 +3136,40 @@ Copyright: Copyright (c) 2014 Evan Wallace
 Source: https://github.com/cspotcode/node-source-map-support
 Link: https://github.com/cspotcode/node-source-map-support
 -----------
+@csstools/color-helpers
+License: MIT-0
+License File: node_modules/@csstools/color-helpers/LICENSE.md
+Source: git+https://github.com/csstools/postcss-plugins.git
+Link: https://github.com/csstools/postcss-plugins/tree/main/packages/color-helpers#readme
+-----------
+@csstools/css-calc
+License: MIT
+License File: node_modules/@csstools/css-calc/LICENSE.md
+Copyright: Copyright 2022 Romain Menke, Antonio Laguna <*******@******.**>
+Source: git+https://github.com/csstools/postcss-plugins.git
+Link: https://github.com/csstools/postcss-plugins/tree/main/packages/css-calc#readme
+-----------
+@csstools/css-color-parser
+License: MIT
+License File: node_modules/@csstools/css-color-parser/LICENSE.md
+Copyright: Copyright 2022 Romain Menke, Antonio Laguna <*******@******.**>
+Source: git+https://github.com/csstools/postcss-plugins.git
+Link: https://github.com/csstools/postcss-plugins/tree/main/packages/css-color-parser#readme
+-----------
+@csstools/css-parser-algorithms
+License: MIT
+License File: node_modules/@csstools/css-parser-algorithms/LICENSE.md
+Copyright: Copyright 2022 Romain Menke, Antonio Laguna <*******@******.**>
+Source: git+https://github.com/csstools/postcss-plugins.git
+Link: https://github.com/csstools/postcss-plugins/tree/main/packages/css-parser-algorithms#readme
+-----------
+@csstools/css-tokenizer
+License: MIT
+License File: node_modules/@csstools/css-tokenizer/LICENSE.md
+Copyright: Copyright 2022 Romain Menke, Antonio Laguna <*******@******.**>
+Source: git+https://github.com/csstools/postcss-plugins.git
+Link: https://github.com/csstools/postcss-plugins/tree/main/packages/css-tokenizer#readme
+-----------
 @esbuild/linux-x64
 License: MIT
 Source: git+https://github.com/evanw/esbuild.git
@@ -3372,12 +3207,6 @@ License File: node_modules/@eslint/core/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
 Link: https://github.com/eslint/rewrite/tree/main/packages/core#readme
 -----------
-@eslint/eslintrc
-License: MIT
-License File: node_modules/@eslint/eslintrc/LICENSE
-Source: eslint/eslintrc
-Link: https://github.com/eslint/eslintrc#readme
------------
 @eslint/js
 License: MIT
 License File: node_modules/@eslint/js/LICENSE
@@ -3388,7 +3217,7 @@ Link: https://eslint.org
 License: Apache-2.0
 License File: node_modules/@eslint/object-schema/LICENSE
 Source: git+https://github.com/eslint/rewrite.git
-Link: https://github.com/eslint/rewrite#readme
+Link: https://github.com/eslint/rewrite/tree/main/packages/object-schema#readme
 -----------
 @eslint/plugin-kit
 License: Apache-2.0
@@ -3408,6 +3237,11 @@ License File: node_modules/@humanfs/node/LICENSE
 Source: git+https://github.com/humanwhocodes/humanfs.git
 Link: https://github.com/humanwhocodes/humanfs#readme
 -----------
+@humanfs/types
+License: Apache-2.0
+Source: git+https://github.com/humanwhocodes/humanfs.git
+Link: https://github.com/humanwhocodes/humanfs#readme
+-----------
 @humanwhocodes/module-importer
 License: Apache-2.0
 License File: node_modules/@humanwhocodes/module-importer/LICENSE
@@ -3420,6 +3254,13 @@ License File: node_modules/@humanwhocodes/retry/LICENSE
 Source: git+https://github.com/humanwhocodes/retry.git
 Link: git+https://github.com/humanwhocodes/retry.git
 -----------
+@isaacs/cliui
+License: ISC
+License File: node_modules/@isaacs/cliui/LICENSE.txt
+Copyright: Copyright (c) 2015, Contributors
+Source: yargs/cliui
+Link: yargs/cliui
+-----------
 @istanbuljs/load-nyc-config
 License: ISC
 License File: node_modules/@istanbuljs/load-nyc-config/LICENSE
@@ -3448,6 +3289,20 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://jestjs.io/
 -----------
+@jest/diff-sequences
+License: MIT
+License File: node_modules/@jest/diff-sequences/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+@jest/environment-jsdom-abstract
+License: MIT
+License File: node_modules/@jest/environment-jsdom-abstract/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
 @jest/environment
 License: MIT
 License File: node_modules/@jest/environment/LICENSE
@@ -3476,6 +3331,13 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
+@jest/get-type
+License: MIT
+License File: node_modules/@jest/get-type/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
 @jest/globals
 License: MIT
 License File: node_modules/@jest/globals/LICENSE
@@ -3483,6 +3345,27 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
+@jest/pattern
+License: MIT
+License File: node_modules/@jest/pattern/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
+react-is
+License: MIT
+License File: node_modules/@jest/react-is-18/LICENSE
+Copyright: Copyright (c) Facebook, Inc. and its affiliates.
+Source: https://github.com/facebook/react.git
+Link: https://reactjs.org/
+-----------
+react-is
+License: MIT
+License File: node_modules/@jest/react-is-19/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/react/react.git
+Link: https://react.dev/
+-----------
 @jest/reporters
 License: MIT
 License File: node_modules/@jest/reporters/LICENSE
@@ -3497,6 +3380,13 @@ Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
 Source: https://github.com/jestjs/jest.git
 Link: https://github.com/jestjs/jest.git
 -----------
+@jest/snapshot-utils
+License: MIT
+License File: node_modules/@jest/snapshot-utils/LICENSE
+Copyright: Copyright (c) Meta Platforms, Inc. and affiliates.
+Source: https://github.com/jestjs/jest.git
+Link: https://github.com/jestjs/jest.git
+-----------
 @jest/source-map
 License: MIT
 License File: node_modules/@jest/source-map/LICENSE
@@ -3539,6 +3429,13 @@ Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
 Source: git+https://github.com/jridgewell/sourcemaps.git
 Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/gen-mapping
 -----------
+@jridgewell/remapping
+License: MIT
+License File: node_modules/@jridgewell/remapping/LICENSE
+Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
+Source: git+https://github.com/jridgewell/sourcemaps.git
+Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/remapping
+-----------
 @jridgewell/resolve-uri
 License: MIT
 License File: node_modules/@jridgewell/resolve-uri/LICENSE
@@ -3560,6 +3457,21 @@ Copyright: Copyright 2024 Justin Ridgewell <******@*********.****>
 Source: git+https://github.com/jridgewell/sourcemaps.git
 Link: https://github.com/jridgewell/sourcemaps/tree/main/packages/trace-mapping
 -----------
+@keyv/bigmap
+License: MIT
+License File: node_modules/@keyv/bigmap/LICENSE
+Copyright: Copyright (c) Jared Wray
+Source: git+https://github.com/jaredwray/keyv.git
+Link: https://github.com/jaredwray/keyv
+-----------
+@keyv/serialize
+License: MIT
+License File: node_modules/@keyv/serialize/LICENSE
+Copyright: Copyright (c) 2017-2021 Luke Childs
+Copyright (c) 2021-2022 Jared Wray
+Source: git+https://github.com/jaredwray/keyv.git
+Link: https://github.com/jaredwray/keyv
+-----------
 @lezer/common
 License: MIT
 License File: node_modules/@lezer/common/LICENSE
@@ -3571,8 +3483,8 @@ Link: https://github.com/lezer-parser/common.git
 License: MIT
 License File: node_modules/@lezer/css/LICENSE
 Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/lezer-parser/css.git
-Link: https://github.com/lezer-parser/css.git
+Source: git+https://code.haverbeke.berlin/lezer/css.git
+Link: git+https://code.haverbeke.berlin/lezer/css.git
 -----------
 @lezer/generator
 License: MIT
@@ -3613,22 +3525,22 @@ Link: https://github.com/lezer-parser/json.git
 License: MIT
 License File: node_modules/@lezer/lr/LICENSE
 Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/lezer-parser/lr.git
-Link: https://github.com/lezer-parser/lr.git
+Source: git+https://code.haverbeke.berlin/lezer/lr.git
+Link: git+https://code.haverbeke.berlin/lezer/lr.git
 -----------
 @lezer/markdown
 License: MIT
 License File: node_modules/@lezer/markdown/LICENSE
 Copyright: Copyright (C) 2020 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/lezer-parser/markdown.git
-Link: https://github.com/lezer-parser/markdown.git
+Source: git+https://code.haverbeke.berlin/lezer/markdown.git
+Link: git+https://code.haverbeke.berlin/lezer/markdown.git
 -----------
 @lezer/php
 License: MIT
 License File: node_modules/@lezer/php/LICENSE
 Copyright: Copyright (C) 2018 by Marijn Haverbeke <******@*********.******> and others
-Source: https://github.com/lezer-parser/php.git
-Link: https://github.com/lezer-parser/php.git
+Source: git+https://code.haverbeke.berlin/lezer/php.git
+Link: git+https://code.haverbeke.berlin/lezer/php.git
 -----------
 @lezer/xml
 License: MIT
@@ -3641,8 +3553,8 @@ Link: https://github.com/lezer-parser/xml.git
 License: MIT
 License File: node_modules/@marijn/find-cluster-break/LICENSE
 Copyright: Copyright (C) 2024 by Marijn Haverbeke <******@*********.******>
-Source: git+https://github.com/marijnh/find-cluster-break.git
-Link: https://github.com/marijnh/find-cluster-break#readme
+Source: git+https://code.haverbeke.berlin/marijn/find-cluster-break.git
+Link: https://code.haverbeke.berlin/marijn/find-cluster-break
 -----------
 @parcel/watcher-linux-x64-glibc
 License: MIT
@@ -3651,13 +3563,6 @@ Copyright: Copyright (c) 2017-present Devon Govett
 Source: https://github.com/parcel-bundler/watcher.git
 Link: https://github.com/parcel-bundler/watcher.git
 -----------
-@parcel/watcher-linux-x64-musl
-License: MIT
-License File: node_modules/@parcel/watcher-linux-x64-musl/LICENSE
-Copyright: Copyright (c) 2017-present Devon Govett
-Source: https://github.com/parcel-bundler/watcher.git
-Link: https://github.com/parcel-bundler/watcher.git
------------
 @parcel/watcher
 License: MIT
 License File: node_modules/@parcel/watcher/LICENSE
@@ -3665,18 +3570,23 @@ Copyright: Copyright (c) 2017-present Devon Govett
 Source: https://github.com/parcel-bundler/watcher.git
 Link: https://github.com/parcel-bundler/watcher.git
 -----------
-@rtsao/scc
+@pkgjs/parseargs
 License: MIT
-License File: node_modules/@rtsao/scc/LICENSE
-Copyright: Copyright (c) 2019 Ryan Tsao
-Source: rtsao/scc
-Link: rtsao/scc
+License File: node_modules/@pkgjs/parseargs/LICENSE
+Source: git@github.com:pkgjs/parseargs.git
+Link: https://github.com/pkgjs/parseargs#readme
+-----------
+@pkgr/core
+License: MIT
+Source: git+https://github.com/un-ts/pkgr.git
+Link: https://github.com/un-ts/pkgr/blob/master/packages/core
 -----------
 @sinclair/typebox
 License: MIT
 License File: node_modules/@sinclair/typebox/license
-Source: https://github.com/sinclairzx81/typebox
-Link: https://github.com/sinclairzx81/typebox
+Copyright: Copyright (c) 2017-2026 Haydn Paterson
+Source: https://github.com/sinclairzx81/sinclair-typebox
+Link: https://github.com/sinclairzx81/sinclair-typebox
 -----------
 @sinonjs/commons
 License: BSD-3-Clause
@@ -3690,7 +3600,7 @@ Link: https://github.com/sinonjs/commons#readme
 License: BSD-3-Clause
 License File: node_modules/@sinonjs/fake-timers/LICENSE
 Copyright: Copyright (c) 2010-2014, Christian Johansen, *********@*********.**. All rights reserved.
-Source: https://github.com/sinonjs/fake-timers.git
+Source: git+https://github.com/sinonjs/fake-timers.git
 Link: https://github.com/sinonjs/fake-timers
 -----------
 @ssddanbrown/codemirror-lang-smarty
@@ -3703,13 +3613,6 @@ License: MIT
 License File: node_modules/@ssddanbrown/codemirror-lang-twig/LICENSE
 Copyright: Copyright (C) 2023 by Dan Brown, Marijn Haverbeke and others
 -----------
-@tootallnate/once
-License: MIT
-License File: node_modules/@tootallnate/once/LICENSE
-Copyright: Copyright (c) 2020 Nathan Rajlich
-Source: git://github.com/TooTallNate/once.git
-Link: git://github.com/TooTallNate/once.git
------------
 @tsconfig/node10
 License: MIT
 License File: node_modules/@tsconfig/node10/LICENSE
@@ -3766,19 +3669,19 @@ Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/babel__traverse
 -----------
-@types/estree
+@types/esrecurse
 License: MIT
-License File: node_modules/@types/estree/LICENSE
+License File: node_modules/@types/esrecurse/LICENSE
 Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/estree
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/esrecurse
 -----------
-@types/graceful-fs
+@types/estree
 License: MIT
-License File: node_modules/@types/graceful-fs/LICENSE
+License File: node_modules/@types/estree/LICENSE
 Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
-Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/graceful-fs
+Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/estree
 -----------
 @types/istanbul-lib-coverage
 License: MIT
@@ -3822,11 +3725,6 @@ Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/json-schema
 -----------
-@types/json5
-License: MIT
-Source: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
-Link: https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
------------
 @types/linkify-it
 License: MIT
 License File: node_modules/@types/linkify-it/LICENSE
@@ -3889,3 +3787,15 @@ License File: node_modules/@types/yargs/LICENSE
 Copyright: Copyright (c) Microsoft Corporation.
 Source: https://github.com/DefinitelyTyped/DefinitelyTyped.git
 Link: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs
+-----------
+@ungap/structured-clone
+License: ISC
+License File: node_modules/@ungap/structured-clone/LICENSE
+Copyright: Copyright (c) 2021, Andrea Giammarchi, @WebReflection
+Source: git+https://github.com/ungap/structured-clone.git
+Link: https://github.com/ungap/structured-clone#readme
+-----------
+@unrs/resolver-binding-linux-x64-gnu
+License: MIT
+Source: git+https://github.com/unrs/unrs-resolver.git
+Link: https://github.com/unrs/unrs-resolver
diff --git a/dev/licensing/php-library-licenses.txt b/dev/licensing/php-library-licenses.txt
index f1ca23c9f56..da17c901f48 100644
--- a/dev/licensing/php-library-licenses.txt
+++ b/dev/licensing/php-library-licenses.txt
@@ -8,12 +8,12 @@ aws/aws-sdk-php
 License: Apache-2.0
 License File: vendor/aws/aws-sdk-php/LICENSE
 Source: https://github.com/aws/aws-sdk-php.git
-Link: http://aws.amazon.com/sdkforphp
+Link: https://aws.amazon.com/sdk-for-php
 -----------
 bacon/bacon-qr-code
 License: BSD-2-Clause
 License File: vendor/bacon/bacon-qr-code/LICENSE
-Copyright: Copyright (c) 2017, Ben Scholzen 'DASPRiD'
+Copyright: Copyright (c) 2017-present, Ben Scholzen 'DASPRiD'
 All rights reserved.
 Source: https://github.com/Bacon/BaconQrCode.git
 Link: https://github.com/Bacon/BaconQrCode
@@ -98,12 +98,19 @@ Copyright: Copyright (c) 2013-2023 Eduardo Gulias Davis
 Source: https://github.com/egulias/EmailValidator.git
 Link: https://github.com/egulias/EmailValidator
 -----------
+ezyang/htmlpurifier
+License: LGPL-2.1-or-later
+License File: vendor/ezyang/htmlpurifier/LICENSE
+Copyright: Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+Source: https://github.com/ezyang/htmlpurifier.git
+Link: http://htmlpurifier.org/
+-----------
 firebase/php-jwt
 License: BSD-3-Clause
 License File: vendor/firebase/php-jwt/LICENSE
 Copyright: Copyright (c) 2011, Neuman Vong
-Source: https://github.com/firebase/php-jwt.git
-Link: https://github.com/firebase/php-jwt
+Source: https://github.com/googleapis/php-jwt.git
+Link: https://github.com/googleapis/php-jwt
 -----------
 fruitcake/php-cors
 License: MIT
@@ -116,7 +123,7 @@ Link: https://github.com/fruitcake/php-cors
 graham-campbell/result-type
 License: MIT
 License File: vendor/graham-campbell/result-type/LICENSE
-Copyright: Copyright (c) 2020-2024 Graham Campbell <*****@**********.**.**>
+Copyright: Copyright (c) 2020-2026 Graham Campbell <*****@**********.**.**>
 Source: https://github.com/GrahamCampbell/Result-Type.git
 Link: https://github.com/GrahamCampbell/Result-Type.git
 -----------
@@ -176,7 +183,7 @@ License: MIT
 License File: vendor/intervention/image/LICENSE
 Copyright: Copyright (c) 2013-present Oliver Vogel
 Source: https://github.com/Intervention/image.git
-Link: https://image.intervention.io/
+Link: https://image.intervention.io
 -----------
 knplabs/knp-snappy
 License: MIT
@@ -237,21 +244,21 @@ Link: https://config.thephpleague.com
 league/flysystem
 License: MIT
 License File: vendor/league/flysystem/LICENSE
-Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Copyright: Copyright (c) 2013-2026 Frank de Jonge
 Source: https://github.com/thephpleague/flysystem.git
 Link: https://github.com/thephpleague/flysystem.git
 -----------
 league/flysystem-aws-s3-v3
 License: MIT
 License File: vendor/league/flysystem-aws-s3-v3/LICENSE
-Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Copyright: Copyright (c) 2013-2026 Frank de Jonge
 Source: https://github.com/thephpleague/flysystem-aws-s3-v3.git
 Link: https://github.com/thephpleague/flysystem-aws-s3-v3.git
 -----------
 league/flysystem-local
 License: MIT
 License File: vendor/league/flysystem-local/LICENSE
-Copyright: Copyright (c) 2013-2024 Frank de Jonge
+Copyright: Copyright (c) 2013-2026 Frank de Jonge
 Source: https://github.com/thephpleague/flysystem-local.git
 Link: https://github.com/thephpleague/flysystem-local.git
 -----------
@@ -323,7 +330,7 @@ License: MIT
 License File: vendor/nesbot/carbon/LICENSE
 Copyright: Copyright (C) Brian Nesbitt
 Source: https://github.com/CarbonPHP/carbon.git
-Link: https://carbon.nesbot.com
+Link: https://carbonphp.github.io/carbon/
 -----------
 nette/schema
 License: BSD-3-Clause GPL-2.0-only GPL-3.0-only
@@ -465,7 +472,7 @@ Link: https://github.com/php-fig/simple-cache.git
 psy/psysh
 License: MIT
 License File: vendor/psy/psysh/LICENSE
-Copyright: Copyright (c) 2012-2023 Justin Hileman
+Copyright: Copyright (c) 2012-2026 Justin Hileman
 Source: https://github.com/bobthecow/psysh.git
 Link: https://psysh.org
 -----------
@@ -592,6 +599,13 @@ Copyright: Copyright (c) 2018-present Fabien Potencier
 Source: https://github.com/symfony/event-dispatcher-contracts.git
 Link: https://symfony.com
 -----------
+symfony/filesystem
+License: MIT
+License File: vendor/symfony/filesystem/LICENSE
+Copyright: Copyright (c) 2004-present Fabien Potencier
+Source: https://github.com/symfony/filesystem.git
+Link: https://symfony.com
+-----------
 symfony/finder
 License: MIT
 License File: vendor/symfony/finder/LICENSE
@@ -676,6 +690,20 @@ Copyright: Copyright (c) 2022-present Fabien Potencier
 Source: https://github.com/symfony/polyfill-php83.git
 Link: https://symfony.com
 -----------
+symfony/polyfill-php84
+License: MIT
+License File: vendor/symfony/polyfill-php84/LICENSE
+Copyright: Copyright (c) 2024-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-php84.git
+Link: https://symfony.com
+-----------
+symfony/polyfill-php85
+License: MIT
+License File: vendor/symfony/polyfill-php85/LICENSE
+Copyright: Copyright (c) 2025-present Fabien Potencier
+Source: https://github.com/symfony/polyfill-php85.git
+Link: https://symfony.com
+-----------
 symfony/polyfill-uuid
 License: MIT
 License File: vendor/symfony/polyfill-uuid/LICENSE
@@ -760,9 +788,9 @@ Copyright: Copyright (C) 2019 Lars Moelleken
 Source: https://github.com/voku/portable-ascii.git
 Link: https://github.com/voku/portable-ascii
 -----------
-webmozart/assert
+xemlock/htmlpurifier-html5
 License: MIT
-License File: vendor/webmozart/assert/LICENSE
-Copyright: Copyright (c) 2014 Bernhard Schussek
-Source: https://github.com/webmozarts/assert.git
-Link: https://github.com/webmozarts/assert.git
+License File: vendor/xemlock/htmlpurifier-html5/LICENSE
+Copyright: Copyright (c) 2015 Xemlock
+Source: https://github.com/xemlock/htmlpurifier-html5.git
+Link: https://github.com/xemlock/htmlpurifier-html5
diff --git a/jest.config.ts b/jest.config.ts
index 53bfceb053e..f0353376220 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -4,8 +4,6 @@
  */
 
 import type {Config} from 'jest';
-import {pathsToModuleNameMapper} from "ts-jest";
-import { compilerOptions }  from './tsconfig.json';
 
 const config: Config = {
   // All imported modules in your tests should be mocked automatically
@@ -96,9 +94,13 @@ const config: Config = {
   modulePaths: ['./'],
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // Note: This should generally align to tsconfig.json
   moduleNameMapper: {
-    'lexical/shared/invariant': 'resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant',
-    ...pathsToModuleNameMapper(compilerOptions.paths),
+    'lexical/shared/invariant': '<rootDir>/resources/js/wysiwyg/lexical/core/shared/__mocks__/invariant',
+    '^@icons/(.*)$': '<rootDir>/resources/icons/$1',
+    '^lexical$': '<rootDir>/resources/js/wysiwyg/lexical/core/index.ts',
+    '^lexical/(.*)$': '<rootDir>/resources/js/wysiwyg/lexical/core/$1',
+    '^@lexical/(.*)$': '<rootDir>/resources/js/wysiwyg/lexical/$1',
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -111,7 +113,7 @@ const config: Config = {
   // notifyMode: "failure-change",
 
   // A preset that is used as a base for Jest's configuration
-  // preset: undefined,
+  // preset: 'ts-jest',
 
   // Run tests from one or more projects
   // projects: undefined,
@@ -184,7 +186,7 @@ const config: Config = {
 
   // A map from regular expressions to paths to transformers
   transform: {
-    "^.+.tsx?$": ["ts-jest",{}],
+    "^.+.tsx?$": ["@swc/jest",{}],
     "^.+.svg$": ["<rootDir>/dev/build/svg-blank-transform.js",{}],
   },
 
diff --git a/lang/ar/activities.php b/lang/ar/activities.php
index 69da1213846..cb1ba9ebace 100644
--- a/lang/ar/activities.php
+++ b/lang/ar/activities.php
@@ -50,7 +50,7 @@
     'bookshelf_delete_notification'    => 'تم حذف الرف بنجاح',
 
     // Revisions
-    'revision_restore' => 'استعادة مراجعة',
+    'revision_restore' => 'مراجعة مُستعادة',
     'revision_delete' => 'مراجعة محذوفة',
     'revision_delete_notification' => 'تم حذف المراجعة بنجاح',
 
@@ -59,12 +59,12 @@
     'favourite_remove_notification' => 'تم إزالة ":name" من المفضلة لديك',
 
     // Watching
-    'watch_update_level_notification' => 'تم تحديث الإعدادات المشاهدة بنجاح',
+    'watch_update_level_notification' => 'تم تحديث تفضيلات المشاهدة بنجاح',
 
     // Auth
     'auth_login' => 'تم تسجيل الدخول',
-    'auth_register' => 'سجل كمستخدم جديد',
-    'auth_password_reset_request' => 'طلب رابط جديد لإعادة تعيين كلمة السر',
+    'auth_register' => 'مسجل كمستخدم جديد',
+    'auth_password_reset_request' => 'طلب رابط جديد لإعادة تعيين كلمة المرور',
     'auth_password_reset_update' => 'إعادة تعيين كلمة مرور المستخدم',
     'mfa_setup_method' => 'طريقة المصادقة متعددة العوامل المُهيأة',
     'mfa_setup_method_notification' => 'تم إعداد المصادقة متعددة العوامل بنجاح',
@@ -99,6 +99,8 @@
     'user_update_notification' => 'تم تحديث المستخدم بنجاح',
     'user_delete' => 'المستخدم المحذوف',
     'user_delete_notification' => 'تم إزالة المستخدم بنجاح',
+    'user_mfa_reset' => 'إعادة تعيين MFA للمستخدم',
+    'user_mfa_reset_notification' => 'إعادة تعيين طرق المصادقة المتعددة',
 
     // API Tokens
     'api_token_create' => 'تم إنشاء رمز واجهة برمجة التطبيقات -API-',
diff --git a/lang/ar/auth.php b/lang/ar/auth.php
index fb6f3d1cf72..5f2d8a1424c 100644
--- a/lang/ar/auth.php
+++ b/lang/ar/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'البيانات المعطاة لا توافق سجلاتنا.',
     'throttle' => 'تجاوزت الحد الأقصى من المحاولات. الرجاء المحاولة مرة أخرى بعد :seconds ثانية/ثواني.',
+    'mfa_throttle' => 'تجاوزت الحد الأقصى من المحاولات. الرجاء المحاولة مرة أخرى بعد :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'إنشاء حساب',
@@ -20,6 +21,9 @@
     'username' => 'اسم المستخدم',
     'email' => 'البريد الإلكتروني',
     'password' => 'كلمة السر',
+    'password_new' => 'كلمة المرور الجديدة',
+    'password_new_confirm' => 'تأكيد كلمة المرور الجديدة',
+    'password_current' => 'تأكيد كلمة المرور الحالية',
     'password_confirm' => 'تأكيد كلمة السر',
     'password_hint' => 'يجب أن تحتوي كلمة السر على 8 خانات على الأقل',
     'forgot_password' => 'نسيت كلمة السر؟',
diff --git a/lang/ar/common.php b/lang/ar/common.php
index 44d057d7eb1..f5224288c9c 100644
--- a/lang/ar/common.php
+++ b/lang/ar/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'غير نشط',
     'never' => 'مطلقاً',
     'none' => 'لا شَيْء',
+    'move_left' => 'تحريك لليسار',
+    'move_right' => 'تحريك لليمين',
 
     // Header
     'homepage' => 'الصفحة الرئيسية',
diff --git a/lang/ar/entities.php b/lang/ar/entities.php
index 8b2882c6098..136aa2ffa8e 100644
--- a/lang/ar/entities.php
+++ b/lang/ar/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'نقل الفصول والصفحات داخل الكتاب لإعادة تنظيم محتوياته. يمكن إضافة كتب أخرى مما يسمح بنقل الفصول والصفحات بسهولة بين الكتب. اختياريًا، يمكن تعيين قاعدة فرز تلقائي لفرز محتويات هذا الكتاب تلقائيًا عند حدوث تغييرات.',
     'books_sort_auto_sort' => 'خِيار الفرز التلقائي',
     'books_sort_auto_sort_active' => 'الفرز التلقائي الشَغَّال: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'يمكن إنشاء قواعد خيارات الفرز التلقائي في منطقة إعدادات "القوائم و الترتيب" بواسطة مستخدم لديه الأذونات ذات الصلة.',
     'books_sort_named' => 'فرز كتاب :bookName',
     'books_sort_name' => 'ترتيب حسب الإسم',
     'books_sort_created' => 'ترتيب حسب تاريخ الإنشاء',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'تبديل الشريط الجانبي',
+    'page_contents' => 'محتويات الصفحة',
+    'page_contents_none' => 'لم يتم العثور على عناوين في محتوى الصفحة.',
+    'page_contents_info' => 'تُنشأ قائمة المحتويات من أي تنسيقات عناوين مستخدمة في الصفحة.',
     'page_tags' => 'وسوم الصفحة',
     'chapter_tags' => 'وسوم الفصل',
     'book_tags' => 'وسوم الكتاب',
diff --git a/lang/ar/errors.php b/lang/ar/errors.php
index 4c6325cb3a1..b02d4de9acd 100644
--- a/lang/ar/errors.php
+++ b/lang/ar/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'لم أتمكن من قراءة المِلَفّ المضغوط -ZIP-.',
     'import_zip_cant_decode_data' => 'لم نتمكن من العثور على محتوى المِلَفّ المضغوط data.json وفك تشفيره.',
     'import_zip_no_data' => 'لا تتضمن بيانات المِلَفّ المضغوط أي محتوى متوقع للكتاب أو الفصل أو الصفحة.',
+    'import_zip_data_too_large' => 'يتجاوز محتوى ZIP data.json الحد الأقصى لحجم التحميل الذي تم تكوينه.',
     'import_validation_failed' => 'فشل التحقق من صحة استيراد المِلَفّ المضغوط بسبب الأخطاء التالية:',
     'import_zip_failed_notification' => 'فشل استيراد المِلَفّ المضغوط.',
     'import_perms_books' => 'أنت تفتقر إلى الصلاحيات المطلوبة لإنشاء الكتب.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'الشفرة المُقدمة لرمز API المستخدم المحدد غير صحيحة',
     'api_user_no_api_permission' => 'مالك رمز API المستخدم ليس لديه الصلاحية لإجراء مكالمات API',
     'api_user_token_expired' => 'انتهت صلاحية رمز الترخيص المستخدم',
+    'api_cookie_auth_only_get' => 'يسمح فقط بطلبات GET عند استخدام API مع المصادقة المستندة إلى ملفات تعريف الارتباط',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'حدث خطأ عند إرسال بريد إلكتروني تجريبي:',
diff --git a/lang/ar/notifications.php b/lang/ar/notifications.php
index 30a49a631cf..da6aad1567c 100644
--- a/lang/ar/notifications.php
+++ b/lang/ar/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'تم تحديث الصفحة: :pageName',
     'updated_page_intro' => 'تم تحديث الصفحة في :appName:',
     'updated_page_debounce' => 'لمنع تلقي عدد كبير من الإشعارات، لن يتم إرسال إشعارات إليك لفترة من الوقت لإجراء المزيد من التعديلات على هذه الصفحة بواسطة نفس المحرر.',
+    'comment_mention_subject' => 'لقد ذُكرت في تعليق على صفحة: :pageName',
+    'comment_mention_intro' => 'لقد ذُكرت في تعليق على :appName:',
 
     'detail_page_name' => 'اسم الصفحة:',
     'detail_page_path' => 'مسار الصفحة:',
diff --git a/lang/ar/preferences.php b/lang/ar/preferences.php
index 9158b4b375b..f59e2719c8f 100644
--- a/lang/ar/preferences.php
+++ b/lang/ar/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'تم تحديث خيارات الاختصار!',
     'shortcuts_overview_desc' => 'إدارة اختصارات لوحة المفاتيح التي يمكنك استخدامها للتنقل في واجهة مستخدم النظام.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'إعدادات الإشعارات',
     'notifications_desc' => 'التحكم في إشعارات البريد الإلكتروني الذي تتلقاها عند إجراء نشاط معين داخل النظام.',
     'notifications_opt_own_page_changes' => 'إشعاري عند حدوث تغييرات في الصفحات التي أملكها',
     'notifications_opt_own_page_comments' => 'إشعاري بشأن التعليقات على الصفحات التي أملكها',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'إشعاري عند الردود على تعليقاتي',
     'notifications_save' => 'حفظ اﻹعدادات',
     'notifications_update_success' => 'تم تحديث إعدادات الإشعارات!',
diff --git a/lang/ar/settings.php b/lang/ar/settings.php
index 9006ac2277f..8983a6990f4 100644
--- a/lang/ar/settings.php
+++ b/lang/ar/settings.php
@@ -75,7 +75,7 @@
     'reg_confirm_restrict_domain_placeholder' => 'لم يتم اختيار أي قيود',
 
     // Sorting Settings
-    'sorting' => 'طريقة الترتيب',
+    'sorting' => 'القوائم و الفرز',
     'sorting_book_default' => 'ترتيب الكتاب الافتراضي',
     'sorting_book_default_desc' => 'حدد قاعدة الترتيب الافتراضية لتطبيقها على الكتب الجديدة. لن يؤثر هذا على الكتب الحالية، ويمكن تجاوزه لكل كتاب على حدة.',
     'sorting_rules' => 'قواعد الترتيب',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'تاريخ التحديث',
     'sort_rule_op_chapters_first' => 'الفصول الأولى',
     'sort_rule_op_chapters_last' => 'الفصول الأخيرة',
+    'sorting_page_limits' => 'حدود العرض لكل صفحة',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'الصيانة',
@@ -195,14 +197,18 @@
     'role_import_content' => 'استيراد المحتوى',
     'role_editor_change' => 'تغيير محرر الصفحة',
     'role_notifications' => 'تلقي الإشعارات وإدارتها',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'أذونات الأصول',
     'roles_system_warning' => 'اعلم أن الوصول إلى أي من الأذونات الثلاثة المذكورة أعلاه يمكن أن يسمح للمستخدم بتغيير امتيازاته الخاصة أو امتيازات الآخرين في النظام. قم بتعيين الأدوار مع هذه الأذونات فقط للمستخدمين الموثوق بهم.',
     'role_asset_desc' => 'تتحكم هذه الأذونات في الوصول الافتراضي إلى الأصول داخل النظام. ستتجاوز الأذونات الخاصة بالكتب والفصول والصفحات هذه الأذونات.',
     'role_asset_admins' => 'يُمنح المسؤولين حق الوصول تلقائيًا إلى جميع المحتويات ولكن هذه الخيارات قد تعرض خيارات واجهة المستخدم أو تخفيها.',
     'role_asset_image_view_note' => 'يتعلق هذا بالرؤية داخل مدير الصور. يعتمد الوصول الفعلي لملفات الصور المُحمّلة على خِيار تخزين الصور في النظام.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'الكل',
     'role_own' => 'ما يخص',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'يتحكم فيها الأصول التي يتم رفعها إلى',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'حفظ الدور',
     'role_users' => 'مستخدمون داخل هذا الدور',
     'role_users_none' => 'لم يتم تعيين أي مستخدمين لهذا الدور',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'إعداد المصادقة متعددة العوامل كطبقة إضافية من الأمان لحساب المستخدم الخاص بك.',
     'users_mfa_x_methods' => ':count طريقة مُهيأة | :count طرق مُهيأة',
     'users_mfa_configure' => 'إعداد الطرق',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'قم بإنشاء رمز API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ar/validation.php b/lang/ar/validation.php
index c27770fe3a9..652d521f228 100644
--- a/lang/ar/validation.php
+++ b/lang/ar/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'يجب أن يقتصر :attribute على الحروف والأرقام فقط.',
     'array'                => 'يجب أن تكون السمة مصفوفة.',
     'backup_codes'         => 'الرمز المقدم غير صالح أو تم استخدامه بالفعل.',
+    'base64_uri_mime'      => 'يجب أن يكون :attribute عنوان URI قاعدة64 صالح يحتوي على بيانات من نوع :mime mime .',
     'before'               => 'يجب أن يكون التاريخ :attribute قبل :date.',
     'between'              => [
         'numeric' => 'يجب أن يكون :attribute بين :min و :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'يجب أن يحتمل حقل السمة الصحة أو الخطأ.',
     'confirmed'            => ':attribute غير مطابق.',
+    'current_password'     => 'هذا لا يتطابق مع كلمة المرور الحالية.',
     'date'                 => ':attribute ليس تاريخ صالح.',
     'date_format'          => ':attribute لا يطابق الصيغة :format.',
     'different'            => 'يجب أن يكون :attribute مختلف عن :other.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'تعذر تحميل الملف. قد لا يقبل الخادم ملفات بهذا الحجم.',
 
     'zip_file' => ':attribute بحاجة إلى الرجوع إلى مِلَفّ داخل المِلَفّ المضغوط.',
+    'zip_file_size' => 'يجب ألا يتجاوز الملف :attribute :size MB.',
     'zip_file_mime' => ':attribute بحاجة إلى الإشارة إلى مِلَفّ من نوع :validTypes، وجدت :foundType.',
     'zip_model_expected' => 'عنصر البيانات المتوقع ولكن ":type" تم العثور عليه.',
     'zip_unique' => 'يجب أن يكون :attribute فريداً لنوع الكائن داخل المِلَفّ المضغوط.',
diff --git a/lang/bg/activities.php b/lang/bg/activities.php
index f5ed71a4cc6..6195e0ae8fb 100644
--- a/lang/bg/activities.php
+++ b/lang/bg/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Потребителят е обновен успешно',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'Потребителят е премахнат успешно',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
@@ -109,7 +111,7 @@
     'api_token_delete_notification' => 'API token successfully deleted',
 
     // Roles
-    'role_create' => 'created role',
+    'role_create' => 'създадена роля',
     'role_create_notification' => 'Успешна създадена роля',
     'role_update' => 'updated role',
     'role_update_notification' => 'Успешно обновена роля',
diff --git a/lang/bg/auth.php b/lang/bg/auth.php
index 71cd2a71295..04182cf74a4 100644
--- a/lang/bg/auth.php
+++ b/lang/bg/auth.php
@@ -6,8 +6,9 @@
  */
 return [
 
-    'failed' => 'Въведените удостоверителни данни не съвпадат с нашите записи.',
+    'failed' => 'Въведените данни не съвпадат с информацията в системата.',
     'throttle' => 'Твърде много опити за влизане. Опитайте пак след :seconds секунди.',
+    'mfa_throttle' => 'Твърде много опити за мултифакторна верификация. Опитайте пак след :seconds секунди.',
 
     // Login & Register
     'sign_up' => 'Регистриране',
@@ -20,6 +21,9 @@
     'username' => 'Потребителско име',
     'email' => 'Имейл',
     'password' => 'Парола',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Потвърди паролата',
     'password_hint' => 'Трябва да бъде поне 8 символа',
     'forgot_password' => 'Забравена парола?',
@@ -65,7 +69,7 @@
     'email_confirm_thanks_desc' => 'Почакайте малко, обработвайки потвърждението ви. Ако не сте пренасочени след 3 секунди, то натиснете долу връзката "Продължаване", за да продължите.',
 
     'email_not_confirmed' => 'Имейл адресът не е потвърден',
-    'email_not_confirmed_text' => 'Вашият емейл адрес все още не е потвърден.',
+    'email_not_confirmed_text' => 'Вашият имейл адрес все още не е потвърден.',
     'email_not_confirmed_click_link' => 'Моля да последвате линка, който ви беше изпратен непосредствено след регистрацията.',
     'email_not_confirmed_resend' => 'Ако не откривате писмото, може да го изпратите отново като попълните формуляра по-долу.',
     'email_not_confirmed_resend_button' => 'Изпрати отново емейла за потвърждение',
@@ -91,7 +95,7 @@
     'mfa_option_totp_title' => 'Мобилно приложение',
     'mfa_option_totp_desc' => 'За да използваш многофакторно удостоверяване, ще ти трябва мобилно приложение, което поддържа временни еднократни пароли (TOTP), като например Google Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервни кодове',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Генерира набор от еднократни резервни кодове, които ще въвеждате при влизане, за да потвърдите самоличността си. Уверете се, че ги съхранявате на безопасно и сигурно място.',
     'mfa_gen_confirm_and_enable' => 'Потвърди и включи',
     'mfa_gen_backup_codes_title' => 'Настройка на резервни кодове',
     'mfa_gen_backup_codes_desc' => 'Запази този лист с кодове на сигурно място. Когато достъпваш системата, ще можеш да използваш един от тези кодове като вторичен механизъм за удостоверяване.',
diff --git a/lang/bg/common.php b/lang/bg/common.php
index ba74ea5b2cb..6c7cac2b14f 100644
--- a/lang/bg/common.php
+++ b/lang/bg/common.php
@@ -6,7 +6,7 @@
 
     // Buttons
     'cancel' => 'Отказ',
-    'close' => 'Close',
+    'close' => 'Затвори',
     'confirm' => 'Потвърждаване',
     'back' => 'Назад',
     'save' => 'Запис',
@@ -20,7 +20,7 @@
     'description' => 'Описание',
     'role' => 'Роля',
     'cover_image' => 'Образ на корицата',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Изображението трябва да е около 440x250 px. Тъй като ще се мащабира и изрязва автоматично спрямо нуждите на интерфейса, крайните размери при показване може да се различават.',
 
     // Actions
     'actions' => 'Действия',
@@ -30,8 +30,8 @@
     'create' => 'Създаване',
     'update' => 'Обновяване',
     'edit' => 'Редактиране',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Архивирай',
+    'unarchive' => 'Разархивирай',
     'sort' => 'Сортиране',
     'move' => 'Преместване',
     'copy' => 'Копиране',
@@ -44,7 +44,7 @@
     'remove' => 'Премахване',
     'add' => 'Добавяне',
     'configure' => 'Конфигуриране',
-    'manage' => 'Manage',
+    'manage' => 'Управлявай',
     'fullscreen' => 'Цял екран',
     'favourite' => 'Любимо',
     'unfavourite' => 'Не е любимо',
@@ -54,7 +54,7 @@
     'filter_clear' => 'Изчистване на филтрите',
     'download' => 'Изтегляне',
     'open_in_tab' => 'Отваряне в раздел',
-    'open' => 'Open',
+    'open' => 'Отвори',
 
     // Sort Options
     'sort_options' => 'Опции за сортиране',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Неактивен',
     'never' => 'Никога',
     'none' => 'Нищо',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Начална страница',
@@ -111,5 +113,5 @@
     'terms_of_service' => 'Условия на услугата',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Търси :appName',
 ];
diff --git a/lang/bg/components.php b/lang/bg/components.php
index f88c69fc8be..03a9ff755b9 100644
--- a/lang/bg/components.php
+++ b/lang/bg/components.php
@@ -6,7 +6,7 @@
 
     // Image Manager
     'image_select' => 'Избор на изображение',
-    'image_list' => 'Image List',
+    'image_list' => 'Списък с изображения',
     'image_details' => 'Image Details',
     'image_upload' => 'Upload Image',
     'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
diff --git a/lang/bg/editor.php b/lang/bg/editor.php
index a75128953eb..a78d9eff94f 100644
--- a/lang/bg/editor.php
+++ b/lang/bg/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Отказ',
     'save' => 'Запис',
     'close' => 'Затваряне',
-    'apply' => 'Apply',
+    'apply' => 'Приложи',
     'undo' => 'Отмяна',
     'redo' => 'Повтаряне',
     'left' => 'Вляво',
@@ -48,7 +48,7 @@
     'superscript' => 'Горен индекс',
     'subscript' => 'Долен индекс',
     'text_color' => 'Цвят на текста',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Цвят на подчертаване',
     'custom_color' => 'Цвят по избор',
     'remove_color' => 'Премахване на цвят',
     'background_color' => 'Фонов цвят',
diff --git a/lang/bg/entities.php b/lang/bg/entities.php
index 42cdad801a9..c501483a3c9 100644
--- a/lang/bg/entities.php
+++ b/lang/bg/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Сортирай книга :bookName',
     'books_sort_name' => 'Сортиране по име',
     'books_sort_created' => 'Сортирай по дата на създаване',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Тагове на страницата',
     'chapter_tags' => 'Тагове на главата',
     'book_tags' => 'Тагове на книгата',
diff --git a/lang/bg/errors.php b/lang/bg/errors.php
index dd024518083..6e488718047 100644
--- a/lang/bg/errors.php
+++ b/lang/bg/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Потребител с емайл :email вече съществува но с други данни.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Потребителски профил не може да бъде създаден с посочената информация',
     'email_already_confirmed' => 'Емейлът вече беше потвърден. Моля опитрайте да влезете.',
     'email_confirmation_invalid' => 'Този код за достъп не е валиден или вече е бил използван, Моля опитай да се регистрираш отново.',
     'email_confirmation_expired' => 'Кодът за потвърждение изтече, нов емейл за потвърждение беше изпратен.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Кодът за връзка със социалната мрежа не съществува',
     'social_driver_not_configured' => 'Социалните настройки на твоя :socialAccount не са конфигурирани правилно.',
     'invite_token_expired' => 'Твоята покана е изтекла. Вместо това може да пробваш да възстановиш паролата на профила си.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Потребител за това действие не може да бъде намерено.',
 
     // System
     'path_not_writable' => 'Не може да се качи файл в :filePath. Увери се на сървъра, че в пътя може да се записва.',
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Секретния код, който беше предоставен за достъп до API-а е неправилен',
     'api_user_no_api_permission' => 'Собственика на АPI кода няма право да прави API заявки',
     'api_user_token_expired' => 'Кода за достъп, който беше използван, вече не е валиден',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Беше върната грешка, когато се изпрати тестовият емейл:',
diff --git a/lang/bg/notifications.php b/lang/bg/notifications.php
index 1afd23f1dc4..ecee032d6c8 100644
--- a/lang/bg/notifications.php
+++ b/lang/bg/notifications.php
@@ -11,9 +11,11 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Път към страница:',
     'detail_commenter' => 'Commenter:',
     'detail_comment' => 'Comment:',
     'detail_created_by' => 'Created By:',
diff --git a/lang/bg/preferences.php b/lang/bg/preferences.php
index f954340e2d2..f1398b2df20 100644
--- a/lang/bg/preferences.php
+++ b/lang/bg/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Обновени предпочитания за преки пътища!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
@@ -36,7 +58,7 @@
 
     'profile' => 'Profile Details',
     'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
+    'profile_view_public' => 'Виж публичния профил',
     'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
     'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
     'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
diff --git a/lang/bg/settings.php b/lang/bg/settings.php
index 6dd27d74a57..4f231a8b1a3 100644
--- a/lang/bg/settings.php
+++ b/lang/bg/settings.php
@@ -51,7 +51,7 @@
     'color_scheme' => 'Application Color Scheme',
     'color_scheme_desc' => 'Set the colors to use in the application user interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
     'ui_colors_desc' => 'Set the application primary color and default link color. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the application interface.',
-    'app_color' => 'Primary Color',
+    'app_color' => 'Основен цвят',
     'link_color' => 'Default Link Color',
     'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
     'bookshelf_color' => 'Цвят на рафта',
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Няма наложени ограничения',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Поддръжка',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Настройки за достъп до активи',
     'roles_system_warning' => 'Важно: Добавянето на потребител в някое от горните три роли може да му позволи да промени собствените си права или правата на другите в системата. Възлагайте тези роли само на доверени потребители.',
     'role_asset_desc' => 'Тези настройки за достъп контролират достъпа по подразбиране до активите в системата. Настройките за достъп до книги, глави и страници ще отменят тези настройки.',
     'role_asset_admins' => 'Администраторите автоматично получават достъп до цялото съдържание, но тези опции могат да показват или скриват опциите за потребителския интерфейс.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Всички',
     'role_own' => 'Собствени',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Контролирани от актива, към който са качени',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Запази ролята',
     'role_users' => 'Потребители в тази роля',
     'role_users_none' => 'В момента няма потребители, назначени за тази роля',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Настрой многофакторно удостверяване като втори слой сигурност на твоя профил.',
     'users_mfa_x_methods' => ':count метод е настроен|:count методи са настроени',
     'users_mfa_configure' => 'Конфигурирай методи',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Създай API маркер',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/bg/validation.php b/lang/bg/validation.php
index e08eb55de61..02e6d94d333 100644
--- a/lang/bg/validation.php
+++ b/lang/bg/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute може да съдържа само букви и числа.',
     'array'                => ':attribute трябва да е масив (array).',
     'backup_codes'         => 'Предоставеният код не е валиден или вече е бил използван.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute трябва да е дата след :date.',
     'between'              => [
         'numeric' => ':attribute трябва да е между :min и :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Полето :attribute трябва да съдържа булева стойност (true или false).',
     'confirmed'            => 'Потвърждението на :attribute не съвпада.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute не е валидна дата.',
     'date_format'          => ':attribute не е в посоченият формат - :format.',
     'different'            => ':attribute и :other трябва да са различни.',
@@ -105,10 +107,11 @@
     'url'                  => 'Форматът на :attribute не е валиден.',
     'uploaded'             => 'Файлът не можа да бъде качен. Сървърът може да не приема файлове с такъв размер.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute трябва да реферира към файл в ZIP архива.',
+    'zip_file_size' => 'Файла :attribute не трябва да надвишава :size MB.',
+    'zip_file_mime' => ':attribute трябва да реферира към файл от тип :validTypes, а е намерен :foundType.',
+    'zip_model_expected' => 'Очаква се обект с данни, но е открит ":type".',
+    'zip_unique' => ':attribute трябва да бъде уникален за типа на обекта в ZIP архива.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/bn/activities.php b/lang/bn/activities.php
index 7e4ba8229aa..a9e04399d37 100644
--- a/lang/bn/activities.php
+++ b/lang/bn/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'ব্যবহারকারীটি সার্থকভাবে হালনাগাদ করা হয়েছে',
     'user_delete' => 'ব্যবহারকারীটি মুছে ফেলেছেন',
     'user_delete_notification' => 'ব্যবহারকারীটি সার্থকভাবে মুছে ফেলা হয়েছে',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'এপিআই টোকেনটি তৈরী করেছেন',
@@ -131,7 +133,7 @@
     'sort_rule_create' => 'created sort rule',
     'sort_rule_create_notification' => 'Sort rule successfully created',
     'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
+    'sort_rule_update_notification' => 'রোলটি সার্থকভাবে হালনাগাদ করা হয়েছে',
     'sort_rule_delete' => 'deleted sort rule',
     'sort_rule_delete_notification' => 'Sort rule successfully deleted',
 
diff --git a/lang/bn/auth.php b/lang/bn/auth.php
index 06ed376a71a..cafda8e8b76 100644
--- a/lang/bn/auth.php
+++ b/lang/bn/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'প্রদত্ত তথ্যনিরূপিত কোন রেকর্ড পাওয়া যায়নি।',
     'throttle' => 'লগইন প্রচেষ্টার সীমা অতিক্রান্ত। দয়া করে :seconds সেকেন্ড পর আবার চেষ্টা করুন।',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'নিবন্ধিত হোন',
@@ -20,12 +21,15 @@
     'username' => 'ব্যবহারকারী',
     'email' => 'ই-মেইল',
     'password' => 'পাসওয়ার্ড',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'পাসওয়ার্ডের পুনরাবৃত্তি',
     'password_hint' => 'ন্যূনতম ৮ অক্ষরের হতে হবে',
     'forgot_password' => 'পাসওয়ার্ড ভুলে গেছেন?',
     'remember_me' => 'লগইন স্থায়িত্ব ধরে রাখুন',
-    'ldap_email_hint' => 'Please enter an email to use for this account.',
-    'create_account' => 'Create Account',
+    'ldap_email_hint' => 'অনুগ্রহ করে এই অ্যাকাউন্টের জন্য ব্যবহার করার জন্য একটি ইমেইল ঠিকানা লিখুন।',
+    'create_account' => 'অ্যাকাউন্ট তৈরি করুন',
     'already_have_account' => 'Already have an account?',
     'dont_have_account' => 'Don\'t have an account?',
     'social_login' => 'Social Login',
@@ -39,16 +43,16 @@
     'register_success' => 'Thanks for signing up! You are now registered and signed in.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Attempting Login',
+    'auto_init_starting' => 'লগইন করার চেষ্টা করা হচ্ছে',
     'auto_init_starting_desc' => 'We\'re contacting your authentication system to start the login process. If there\'s no progress after 5 seconds you can try clicking the link below.',
     'auto_init_start_link' => 'Proceed with authentication',
 
     // Password Reset
-    'reset_password' => 'Reset Password',
+    'reset_password' => 'পাসওয়ার্ড রিসেট করুন',
     'reset_password_send_instructions' => 'Enter your email below and you will be sent an email with a password reset link.',
     'reset_password_send_button' => 'Send Reset Link',
     'reset_password_sent' => 'A password reset link will be sent to :email if that email address is found in the system.',
-    'reset_password_success' => 'Your password has been successfully reset.',
+    'reset_password_success' => 'আপনার পাসওয়ার্ড সফলভাবে রিসেট করা হয়েছে.',
     'email_reset_subject' => 'Reset your :appName password',
     'email_reset_text' => 'You are receiving this email because we received a password reset request for your account.',
     'email_reset_not_requested' => 'If you did not request a password reset, no further action is required.',
diff --git a/lang/bn/common.php b/lang/bn/common.php
index baf20426f01..873fa86a938 100644
--- a/lang/bn/common.php
+++ b/lang/bn/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'নিষ্ক্রিয়',
     'never' => 'অভূতপূর্ব',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'নীড়পাতা',
diff --git a/lang/bn/entities.php b/lang/bn/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/bn/entities.php
+++ b/lang/bn/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/bn/errors.php b/lang/bn/errors.php
index ee2fbfa2100..92414edfdef 100644
--- a/lang/bn/errors.php
+++ b/lang/bn/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/bn/notifications.php b/lang/bn/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/bn/notifications.php
+++ b/lang/bn/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/bn/preferences.php b/lang/bn/preferences.php
index 2e47604e471..1a509d33aa1 100644
--- a/lang/bn/preferences.php
+++ b/lang/bn/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/bn/settings.php b/lang/bn/settings.php
index 04aca4f2e0f..a5b14e7f8c4 100644
--- a/lang/bn/settings.php
+++ b/lang/bn/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/bn/validation.php b/lang/bn/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/bn/validation.php
+++ b/lang/bn/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/bs/activities.php b/lang/bs/activities.php
index e7308770a29..bf07d4a5615 100644
--- a/lang/bs/activities.php
+++ b/lang/bs/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/bs/auth.php b/lang/bs/auth.php
index a8d0da78eb9..f8e751bc5c1 100644
--- a/lang/bs/auth.php
+++ b/lang/bs/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Ovi pristupni podaci se ne slažu sa našom evidencijom.',
     'throttle' => 'Preveliki broj pokušaja prijave. Molimo vas da pokušate ponovo za :seconds sekundi.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registruj se',
@@ -20,6 +21,9 @@
     'username' => 'Korisničko ime',
     'email' => 'E-mail',
     'password' => 'Lozinka',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Potvrdi lozinku',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Zaboravljena lozinka?',
diff --git a/lang/bs/common.php b/lang/bs/common.php
index c2f1fda0d1a..c1ad15498f9 100644
--- a/lang/bs/common.php
+++ b/lang/bs/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/bs/entities.php b/lang/bs/entities.php
index f671e1b4527..879e2b3ea57 100644
--- a/lang/bs/entities.php
+++ b/lang/bs/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sortiraj knjigu :bookName',
     'books_sort_name' => 'Sortiraj po imenu',
     'books_sort_created' => 'Sortiraj po datumu kreiranja',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Oznake stranice',
     'chapter_tags' => 'Oznake poglavlja',
     'book_tags' => 'Oznake knjige',
diff --git a/lang/bs/errors.php b/lang/bs/errors.php
index f60f92f0782..d76f559c17c 100644
--- a/lang/bs/errors.php
+++ b/lang/bs/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Tajni ključ naveden za dati korišteni API token nije tačan',
     'api_user_no_api_permission' => 'Vlasnik korištenog API tokena nema dozvolu za upućivanje API poziva',
     'api_user_token_expired' => 'Autorizacijski token je istekao',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Došlo je do greške prilikom slanja testnog e-maila:',
diff --git a/lang/bs/notifications.php b/lang/bs/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/bs/notifications.php
+++ b/lang/bs/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/bs/preferences.php b/lang/bs/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/bs/preferences.php
+++ b/lang/bs/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/bs/settings.php b/lang/bs/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/bs/settings.php
+++ b/lang/bs/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/bs/validation.php b/lang/bs/validation.php
index 4b026afd2dc..aca1c34280e 100644
--- a/lang/bs/validation.php
+++ b/lang/bs/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute može sadržavati samo slova i brojeve.',
     'array'                => ':attribute mora biti niz.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute mora biti datum prije :date.',
     'between'              => [
         'numeric' => ':attribute mora biti između :min i :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute polje mora biti tačno ili netačno.',
     'confirmed'            => ':attribute potvrda se ne slaže.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nije ispravan datum.',
     'date_format'          => ':attribute ne odgovara formatu :format.',
     'different'            => ':attribute i :other moraju biti različiti.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Fajl nije učitan. Server ne prihvata fajlove ove veličine.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/ca/activities.php b/lang/ca/activities.php
index 4894c279aad..d797286cb8e 100644
--- a/lang/ca/activities.php
+++ b/lang/ca/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'S’ha actualitzat l’usuari',
     'user_delete' => 'ha suprimit l’usuari',
     'user_delete_notification' => 'S’ha suprimit l’usuari',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'ha creat el testimoni API',
diff --git a/lang/ca/auth.php b/lang/ca/auth.php
index ba6ede42f0c..fb4e172343a 100644
--- a/lang/ca/auth.php
+++ b/lang/ca/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Aquestes credencials no existeixen al nostre registre.',
     'throttle' => 'Massa intents d’inici de sessió. Torneu-ho a provar d’aquí :seconds segons.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registreu-vos',
@@ -20,6 +21,9 @@
     'username' => 'Nom d’usuari',
     'email' => 'Correu electrònic',
     'password' => 'Contrasenya',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirmeu la contrasenya',
     'password_hint' => 'Ha de tenir almenys 8 caràcters',
     'forgot_password' => 'Heu oblidat la contrasenya?',
diff --git a/lang/ca/common.php b/lang/ca/common.php
index 8976edaa127..26a15768786 100644
--- a/lang/ca/common.php
+++ b/lang/ca/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactiu',
     'never' => 'Mai',
     'none' => 'Cap',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Pàgina d’inici',
diff --git a/lang/ca/entities.php b/lang/ca/entities.php
index 108a38c2c50..3a37d30376b 100644
--- a/lang/ca/entities.php
+++ b/lang/ca/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Mou capítols i pàgines dins d\'un llibre per reorganitzar el seu contingut. Es poden afegir altres llibres que permetin moure fàcilment capítols i pàgines entre llibres. De manera opcional, es poden establir regles d\'ordenació automàtica per ordenar automàticament el contingut d\'aquest llibre quan hi hagi canvis.',
     'books_sort_auto_sort' => 'Opció d\'ordenació automàtica',
     'books_sort_auto_sort_active' => 'Opció d\'ordenació activa :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Ordena el llibre &laquo;:bookName&raquo;',
     'books_sort_name' => 'Ordena pel nom',
     'books_sort_created' => 'Ordena per la data de creació',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Commuta la barra lateral',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Etiquetes de la pàgina',
     'chapter_tags' => 'Etiquetes del capítol',
     'book_tags' => 'Etiquetes del llibre',
diff --git a/lang/ca/errors.php b/lang/ca/errors.php
index 6f3784c2cff..69268838451 100644
--- a/lang/ca/errors.php
+++ b/lang/ca/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'No es pot llegir el fitxer ZIP.',
     'import_zip_cant_decode_data' => 'No s\'ha pogut trobar i descodificar el fitxer data.json en el fitxer ZIP.',
     'import_zip_no_data' => 'Les dades del fitxer ZIP no contenen cap llibre, capítol o contingut de pàgina.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Error en validar la importació del ZIP amb els errors:',
     'import_zip_failed_notification' => 'Error en importar l\'arxiu ZIP.',
     'import_perms_books' => 'Li falten els permisos necessaris per crear llibres.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'El secret proporcionat per al testimoni d’API utilitzat no és correcte.',
     'api_user_no_api_permission' => 'El propietari del testimoni API utilitzat no té permís per a fer crides a l’API.',
     'api_user_token_expired' => 'El testimoni d’autorització utilitzat ha caducat.',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'S’ha produït un error en enviar el correu electrònic de prova:',
diff --git a/lang/ca/notifications.php b/lang/ca/notifications.php
index 49b986ad063..e3fb928a1ef 100644
--- a/lang/ca/notifications.php
+++ b/lang/ca/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'S’ha actualitzat la pàgina :pageName',
     'updated_page_intro' => 'S’ha actualitzat una pàgina a :appName.',
     'updated_page_debounce' => 'Per a evitar que s’acumulin les notificacions, durant un temps no se us notificarà cap canvi fet en aquesta pàgina pel mateix usuari.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Nom de la pàgina:',
     'detail_page_path' => 'Ruta de la pàgina:',
diff --git a/lang/ca/preferences.php b/lang/ca/preferences.php
index 25206726ecd..b68403c3bea 100644
--- a/lang/ca/preferences.php
+++ b/lang/ca/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'S’han actualitzat les preferències de drecera.',
     'shortcuts_overview_desc' => 'Gestioneu les dreceres que s’utilitzen per a navegar per la interfície d’usuari.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Preferències de les notificacions',
     'notifications_desc' => 'Gestioneu les notificacions de correu electrònic que rebreu quan es facin certes activitats.',
     'notifications_opt_own_page_changes' => 'Notifica’m els canvis a les meves pàgines.',
     'notifications_opt_own_page_comments' => 'Notifica’m la creació de comentaris a les meves pàgines.',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notifica’m les respostes als meus comentaris.',
     'notifications_save' => 'Desa les preferències',
     'notifications_update_success' => 'S’han actualitzat les preferències de notificació',
diff --git a/lang/ca/settings.php b/lang/ca/settings.php
index 63352147e0b..f2621619463 100644
--- a/lang/ca/settings.php
+++ b/lang/ca/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No hi ha cap restricció',
 
     // Sorting Settings
-    'sorting' => 'Ordenar',
-    'sorting_book_default' => 'Ordre predeterminat del llibre',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Selecciona la regla d\'ordenació predeterminada per aplicar a nous llibres. Això no afectarà els llibres existents, i pot ser anul·lat per llibre.',
     'sorting_rules' => 'Regles d\'ordenació',
     'sorting_rules_desc' => 'Són operacions d\'ordenació predefinides que es poden aplicar al contingut en el sistema.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Data d\'actualització',
     'sort_rule_op_chapters_first' => 'Capítols a l\'inici',
     'sort_rule_op_chapters_last' => 'Capítols al final',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Manteniment',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importar contingut',
     'role_editor_change' => 'Canvi de l’editor de pàgina',
     'role_notifications' => 'Recepció i gestió de notificacions',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Permisos de recursos',
     'roles_system_warning' => 'Tingueu en compte que l’accés a qualsevol dels tres permisos de dalt permeten que l’usuari canviï els seus privilegis i els privilegis d’altres usuaris. Assigneu rols d’usuari amb aquests permisos només a usuaris de confiança.',
     'role_asset_desc' => 'Aquests permisos controlen l’accés per defecte als recursos del sistema. El permisos dels llibres, capítols i pàgines sobreescriuran aquests permisos.',
     'role_asset_admins' => 'Als administradors se’ls dona accés automàticament a tot el contingut però aquestes opcions mostren o amaguen opcions de la interfície d’usuari.',
     'role_asset_image_view_note' => 'Això té relació amb la visibilitat al gestor d’imatges. L’accés a les imatges pujades dependrà de l’opció d’emmagatzematge d’imatges dels sistema.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Tot',
     'role_own' => 'Propi',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlat pel recurs a què estan pujats',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Desa el rol',
     'role_users' => 'Usuaris assignats en aquest rol',
     'role_users_none' => 'No hi ha cap usuari assignat en aquest rol',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Configureu l’autenticació multifactorial per a afegir una capa de seguretat extra al vostre compte d’usuari.',
     'users_mfa_x_methods' => 'Hi ha :count mètode configurat|Hi ha :count mètodes configurats',
     'users_mfa_configure' => 'Configura un mètode',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Crea un testimoni API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ca/validation.php b/lang/ca/validation.php
index bc821749a25..aaec940b9cd 100644
--- a/lang/ca/validation.php
+++ b/lang/ca/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'El camp :attribute només pot contenir lletres, xifres.',
     'array'                => 'El camp :attribute ha de ser una matriu.',
     'backup_codes'         => 'El codi que heu proporcionat no és vàlid o ja s’ha utilitzat.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'El camp :attribute ha de ser una data posterior a :date.',
     'between'              => [
         'numeric' => 'El camp :attribute ha de ser un nombre entre :min i :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'El camp :attribute ha de ser cert o fals.',
     'confirmed'            => 'La confirmació del camp :attribute no coincideix.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'El camp :attribute no és una data vàlida.',
     'date_format'          => 'El camp :attribute no coincideix amb el format :format.',
     'different'            => 'El camp :attribute i :other han de ser diferents.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'No s’ha pogut pujar el fitxer. És possible que el servidor no admeti fitxers d’aquesta mida.',
 
     'zip_file' => 'El :attribute necessita fer referència a un arxiu dins del ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'El :attribute necessita fer referència a un arxiu de tipus :validTyes, trobat :foundType.',
     'zip_model_expected' => 'S\'esperava un objecte de dades, però s\'ha trobat ":type".',
     'zip_unique' => 'El :attribute ha de ser únic pel tipus d\'objecte dins del ZIP.',
diff --git a/lang/cs/activities.php b/lang/cs/activities.php
index f7e9337d3fa..65840f9376a 100644
--- a/lang/cs/activities.php
+++ b/lang/cs/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Uživatel byl úspěšně aktualizován',
     'user_delete' => 'odstranil uživatele',
     'user_delete_notification' => 'Uživatel byl úspěšně odstraněn',
+    'user_mfa_reset' => 'obnovit vícefaktorové ověření pro uživatele',
+    'user_mfa_reset_notification' => 'Obnovení metod vícefaktorového ověřování',
 
     // API Tokens
     'api_token_create' => 'API token byl vytvořen',
diff --git a/lang/cs/auth.php b/lang/cs/auth.php
index ad225a2fee2..ab59d461a85 100644
--- a/lang/cs/auth.php
+++ b/lang/cs/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Neplatné přihlašovací údaje.',
     'throttle' => 'Příliš mnoho pokusů o přihlášení. Zkuste to prosím znovu za :seconds sekund.',
+    'mfa_throttle' => '{0}Příliš mnoho pokusů o vícefázové ověření. Zkuste to prosím znovu za :seconds sekund.|{1}Příliš mnoho pokusů o vícefázové ověření. Zkuste to prosím znovu za :seconds sekundu.|[2,4]Příliš mnoho pokusů o vícefázové ověření. Zkuste to prosím znovu za :seconds sekundy.|[5,*]Příliš mnoho pokusů o vícefázové ověření. Zkuste to prosím znovu za :seconds sekund.',
 
     // Login & Register
     'sign_up' => 'Registrace',
@@ -20,6 +21,9 @@
     'username' => 'Uživatelské jméno',
     'email' => 'E-mail',
     'password' => 'Heslo',
+    'password_new' => 'Nové heslo',
+    'password_new_confirm' => 'Potvrdit nové heslo',
+    'password_current' => 'Potvrdit aktuální heslo',
     'password_confirm' => 'Potvrzení hesla',
     'password_hint' => 'Musí mít alespoň 8 znaků',
     'forgot_password' => 'Zapomenuté heslo?',
diff --git a/lang/cs/common.php b/lang/cs/common.php
index 25c32b0397c..332023c1cc0 100644
--- a/lang/cs/common.php
+++ b/lang/cs/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Neaktivní',
     'never' => 'Nikdy',
     'none' => 'Žádná',
+    'move_left' => 'Posunout doleva',
+    'move_right' => 'Posunout doprava',
 
     // Header
     'homepage' => 'Domovská stránka',
diff --git a/lang/cs/entities.php b/lang/cs/entities.php
index cda6b6c82f5..13b4e214acc 100644
--- a/lang/cs/entities.php
+++ b/lang/cs/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Potvrzením odstraníte nahraný ZIP soubor. Tento krok nelze vrátit zpět.',
     'import_errors' => 'Chyby importu',
     'import_errors_desc' => 'Při pokusu o import došlo k následujícím chybám:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Přejít na jinou stránku',
+    'breadcrumb_siblings_for_chapter' => 'Přejít na jinou kapitolu',
+    'breadcrumb_siblings_for_book' => 'Přejít na jinou knihu',
+    'breadcrumb_siblings_for_bookshelf' => 'Přejít na jinou polici',
 
     // Permissions and restrictions
     'permissions' => 'Oprávnění',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Pro přeuspořádání obsahu přesuňte kapitoly a stránky v knize. Mohou být přidány další knihy, které umožní snadný přesun kapitol a stránek mezi knihami. Volitelně lze nastavit pravidlo automatického řazení, aby se při změnách automaticky seřadil obsah této knihy.',
     'books_sort_auto_sort' => 'Možnost automatického řazení',
     'books_sort_auto_sort_active' => 'Aktivní automatické řazení: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Pravidla řazení mohou být vytvořena v nastavení "Seznamy a řazení" uživatelem s příslušnými oprávněními.',
     'books_sort_named' => 'Seřadit knihu :bookName',
     'books_sort_name' => 'Seřadit podle názvu',
     'books_sort_created' => 'Seřadit podle data vytvoření',
@@ -182,7 +183,7 @@
     'books_sort_show_other' => 'Zobrazit ostatní knihy',
     'books_sort_save' => 'Uložit nové pořadí',
     'books_sort_show_other_desc' => 'Přidejte sem další knihy, abyste je zahrnuli do operace třídění, a umožněte snadnou křížovou reorganizaci.',
-    'books_sort_move_up' => 'Posunout Nahoru',
+    'books_sort_move_up' => 'Posunout nahoru',
     'books_sort_move_down' => 'Posunout dolů',
     'books_sort_move_prev_book' => 'Přesunout se na předchozí knihu',
     'books_sort_move_next_book' => 'Přesunout se na další knihu',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Skrýt/Zobrazit postranní panel',
+    'page_contents' => 'Obsah stránky',
+    'page_contents_none' => 'Na stránce nejsou žádné nadpisy.',
+    'page_contents_info' => 'Obsah se generuje ze všech použitých nadpisů na stránce.',
     'page_tags' => 'Štítky stránky',
     'chapter_tags' => 'Štítky kapitoly',
     'book_tags' => 'Štítky knihy',
diff --git a/lang/cs/errors.php b/lang/cs/errors.php
index b1eeb54e015..5d086456ba1 100644
--- a/lang/cs/errors.php
+++ b/lang/cs/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Nelze načíst ZIP soubor.',
     'import_zip_cant_decode_data' => 'Nelze najít a dekódovat data.json v archivu ZIP.',
     'import_zip_no_data' => 'ZIP archiv neobsahuje knihy, kapitoly nebo stránky.',
+    'import_zip_data_too_large' => 'Obsah souboru data.json v archivu ZIP překračuje maximální povolenou velikost.',
     'import_validation_failed' => 'Importování ZIP selhalo s chybami:',
     'import_zip_failed_notification' => 'Nepodařilo se naimportovat ZIP soubor.',
     'import_perms_books' => 'Chybí vám požadovaná oprávnění k vytvoření knih.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Poskytnutý Token Secret neodpovídá použitému API tokenu',
     'api_user_no_api_permission' => 'Vlastník použitého API tokenu nemá oprávnění provádět API volání',
     'api_user_token_expired' => 'Platnost autorizačního tokenu vypršela',
+    'api_cookie_auth_only_get' => 'Při používání API s ověřováním pomocí souborů cookie jsou povoleny pouze požadavky GET',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Při posílání testovacího e-mailu nastala chyba:',
diff --git a/lang/cs/notifications.php b/lang/cs/notifications.php
index caf75f17951..7e20f654fd6 100644
--- a/lang/cs/notifications.php
+++ b/lang/cs/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Aktualizovaná stránka: :pageName',
     'updated_page_intro' => 'V :appName byla aktualizována stránka:',
     'updated_page_debounce' => 'Po nějakou dobu neobdržíte další oznámení o aktualizaci této stránky stejným editorem, aby se omezil počet stejných zpráv.',
+    'comment_mention_subject' => 'Byli jste zmíněni v komentáři na stránce: :pageName',
+    'comment_mention_intro' => 'Byli jste zmíněni v komentáři na webu :appName:',
 
     'detail_page_name' => 'Název stránky:',
     'detail_page_path' => 'Umístění:',
diff --git a/lang/cs/preferences.php b/lang/cs/preferences.php
index ec7afaf276b..5fa830ee6f2 100644
--- a/lang/cs/preferences.php
+++ b/lang/cs/preferences.php
@@ -15,14 +15,36 @@
     'shortcuts_section_navigation' => 'Navigace',
     'shortcuts_section_actions' => 'Společné akce',
     'shortcuts_save' => 'Uložit zkratky',
-    'shortcuts_overlay_desc' => 'Poznámka: Když jsou povoleny zkratky, je k dispozici pomocný překryv stisknutím "? která zvýrazní dostupné zkratky pro akce viditelné na obrazovce.',
+    'shortcuts_overlay_desc' => 'Poznámka: Jsou-li klávesové zkratky povoleny, lze stisknutím klávesy „?“ vyvolat pomocné okno, které zvýrazní dostupné klávesové zkratky pro akce aktuálně zobrazené na obrazovce.',
     'shortcuts_update_success' => 'Nastavení pro zkratky bylo aktualizováno!',
     'shortcuts_overview_desc' => 'Správa klávesových zkratek, které můžete použít k navigaci systémového uživatelského rozhraní.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Nastavení upozornění',
     'notifications_desc' => 'Nastavte si e-mailová oznámení, která dostanete při provedení určitých akcí v systému.',
     'notifications_opt_own_page_changes' => 'Upozornit na změny stránek u kterých jsem vlastníkem',
     'notifications_opt_own_page_comments' => 'Upozornit na komentáře na stránkách, které vlastním',
+    'notifications_opt_comment_mentions' => 'Upozornit, když mě někdo zmíní v komentáři',
     'notifications_opt_comment_replies' => 'Upozornit na odpovědi na mé komentáře',
     'notifications_save' => 'Uložit nastavení',
     'notifications_update_success' => 'Nastavení oznámení byla aktualizována!',
diff --git a/lang/cs/settings.php b/lang/cs/settings.php
index e72d4b403ad..ab65d4252ad 100644
--- a/lang/cs/settings.php
+++ b/lang/cs/settings.php
@@ -75,7 +75,7 @@
     'reg_confirm_restrict_domain_placeholder' => 'Žádná omezení nebyla nastavena',
 
     // Sorting Settings
-    'sorting' => 'Řazení',
+    'sorting' => 'Seznamy a řazení',
     'sorting_book_default' => 'Výchozí řazení knih',
     'sorting_book_default_desc' => 'Vybere výchozí pravidlo řazení pro nové knihy. Řazení neovlivní existující knihy a může být upraveno u konkrétní knihy.',
     'sorting_rules' => 'Pravidla řazení',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Datum aktualizace',
     'sort_rule_op_chapters_first' => 'Kapitoly jako první',
     'sort_rule_op_chapters_last' => 'Kapitoly jako poslední',
+    'sorting_page_limits' => 'Počet zobrazených položek na stránce',
+    'sorting_page_limits_desc' => 'Nastavte, kolik položek se má zobrazit na stránce v různých seznamech na webu. Obvykle bude nižší počet výkonnější, zatímco vyšší počet eliminuje nutnost proklikávat se několika stránkami. Doporučuje se použít násobek čísla 6.',
 
     // Maintenance settings
     'maint' => 'Údržba',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importovat obsah',
     'role_editor_change' => 'Změnit editor stránek',
     'role_notifications' => 'Přijímat a spravovat oznámení',
+    'role_permission_note_users_and_roles' => 'Tato oprávnění zároveň umožní zobrazit a vyhledat uživatele a role na webu.',
     'role_asset' => 'Obsahová oprávnění',
     'roles_system_warning' => 'Berte na vědomí, že přístup k některému ze tří výše uvedených oprávnění může uživateli umožnit změnit svá vlastní oprávnění nebo oprávnění ostatních uživatelů v systému. Přiřazujte role s těmito oprávněními pouze důvěryhodným uživatelům.',
     'role_asset_desc' => 'Tato oprávnění řídí přístup k obsahu napříč systémem. Specifická oprávnění na knihách, kapitolách a stránkách převáží tato nastavení.',
     'role_asset_admins' => 'Administrátoři automaticky dostávají přístup k veškerému obsahu, ale tyto volby mohou ukázat nebo skrýt volby v uživatelském rozhraní.',
     'role_asset_image_view_note' => 'To se týká viditelnosti ve správci obrázků. Skutečný přístup k nahraným souborům obrázků bude záviset na možnosti uložení systémových obrázků.',
+    'role_asset_users_note' => 'Tato oprávnění zároveň umožní zobrazit a vyhledat uživatele v systému.',
     'role_all' => 'Vše',
     'role_own' => 'Vlastní',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Řídí se obsahem, do kterého jsou nahrávány',
+    'role_controlled_by_page_delete' => 'Řídí se právem k odstranění stránky',
     'role_save' => 'Uložit roli',
     'role_users' => 'Uživatelé mající tuto roli',
     'role_users_none' => 'Žádný uživatel nemá tuto roli',
@@ -255,10 +261,13 @@
     'users_api_tokens_create' => 'Vytvořit Token',
     'users_api_tokens_expires' => 'Vyprší',
     'users_api_tokens_docs' => 'Dokumentace API',
-    'users_mfa' => 'Vícefázové ověření',
+    'users_mfa' => 'Vícefaktorové ověření',
     'users_mfa_desc' => 'Nastavit vícefaktorové ověřování jako další vrstvu zabezpečení vašeho uživatelského účtu.',
     'users_mfa_x_methods' => ':count nastavená metoda|:count nastavených metod',
     'users_mfa_configure' => 'Konfigurovat metody',
+    'users_mfa_reset' => 'Obnova metod vícefaktorového ověření',
+    'users_mfa_reset_desc' => 'Tímto se obnoví a vymažou všechny nakonfigurované metody vícefaktorového ověřování pro tohoto uživatele. Pokud některá z jeho rolí vyžaduje vícefaktorové ověřování, bude při příštím přihlášení vyzván k nastavení nových metod.',
+    'users_mfa_reset_confirm' => 'Opravdu chcete obnovit vícefaktorové ověřování pro tohoto uživatele?',
 
     // API Tokens
     'user_api_token_create' => 'Vytvořit API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/cs/validation.php b/lang/cs/validation.php
index b05d94625af..1858c16ef95 100644
--- a/lang/cs/validation.php
+++ b/lang/cs/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute může obsahovat pouze písmena a číslice.',
     'array'                => ':attribute musí být pole.',
     'backup_codes'         => 'Zadaný kód není platný nebo již byl použit.',
+    'base64_uri_mime'      => ':attribute musí být platný URI v kódování base64 obsahující data typu :mime.',
     'before'               => ':attribute musí být datum před :date.',
     'between'              => [
         'numeric' => ':attribute musí být hodnota mezi :min a :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute musí být true nebo false',
     'confirmed'            => ':attribute nesouhlasí.',
+    'current_password'     => 'Toto neodpovídá vašemu aktuálnímu heslu.',
     'date'                 => ':attribute musí být platné datum.',
     'date_format'          => ':attribute není platný formát data podle :format.',
     'different'            => ':attribute a :other se musí lišit.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Nahrávání :attribute se nezdařilo.',
 
     'zip_file' => ':attribute musí odkazovat na soubor v archivu ZIP.',
+    'zip_file_size' => 'Soubor :attribute nesmí překročit :size MB.',
     'zip_file_mime' => ':attribute musí odkazovat na soubor typu :validTypes, nalezen :foundType.',
     'zip_model_expected' => 'Očekáván datový objekt, ale nalezen „:type“.',
     'zip_unique' => ':attribute musí být jedinečný pro typ objektu v archivu ZIP.',
diff --git a/lang/cy/activities.php b/lang/cy/activities.php
index 2459f2357f5..da2ac372cf1 100644
--- a/lang/cy/activities.php
+++ b/lang/cy/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Diweddarwyd y defnyddiwr yn llwyddiannus',
     'user_delete' => 'dileodd ddefnyddiwr',
     'user_delete_notification' => 'Tynnwyd y defnyddiwr yn llwyddiannus',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'creodd docyn API',
diff --git a/lang/cy/auth.php b/lang/cy/auth.php
index 5c4034fcdd4..8a62f1e8661 100644
--- a/lang/cy/auth.php
+++ b/lang/cy/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Nid yw\'r manylion hyn yn cyfateb i\'n cofnodion.',
     'throttle' => 'Gormod o ymdrechion mewngofnodi. Rhowch gynnig arall arni o gwmpas :seconds eiliadau.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Cofrestru',
@@ -20,6 +21,9 @@
     'username' => 'Enw defnyddiwr',
     'email' => 'Ebost',
     'password' => 'Cyfrinair',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Cadarnhau cyfrinair',
     'password_hint' => 'Rhaid bod o leiaf 8 nod',
     'forgot_password' => 'Wedi anghofio cyfrinair?',
diff --git a/lang/cy/common.php b/lang/cy/common.php
index b42e0d44b19..fe09cb0ae8d 100644
--- a/lang/cy/common.php
+++ b/lang/cy/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Anweithredol',
     'never' => 'Byth',
     'none' => 'Dim un',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Tudalen cartref',
diff --git a/lang/cy/entities.php b/lang/cy/entities.php
index e6df4317b1d..0a042e7152a 100644
--- a/lang/cy/entities.php
+++ b/lang/cy/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Trefnu Llyfr :bookName',
     'books_sort_name' => 'Trefnu yn ôl Enw',
     'books_sort_created' => 'Trefnu yn ôl Dyddiad Creu',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toglo Bar ochr',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Tagiau Tudalennau',
     'chapter_tags' => 'Tagiau Penodau',
     'book_tags' => 'Tagiau Llyfrau',
diff --git a/lang/cy/errors.php b/lang/cy/errors.php
index db3a468b60a..a3ab3279e41 100644
--- a/lang/cy/errors.php
+++ b/lang/cy/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Wedi methu darllen ffeil ZIP.',
     'import_zip_cant_decode_data' => 'Wedi methu ffeindio a dadgodio cynnwys ZIP data.json.',
     'import_zip_no_data' => 'Nid oes cynnwys llyfr, pennod neu dudalen disgwyliedig yn nata ffeil ZIP.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'ZIP mewnforyn wedi\'i methu dilysu gyda gwallau:',
     'import_zip_failed_notification' => 'Wedi methu mewnforio ffeil ZIP.',
     'import_perms_books' => 'Dych chi\'n methu\'r caniatâd gofynnol i greu llyfrau.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Mae\'r gyfrinach a ddarparwyd ar gyfer y tocyn API defnyddiedig a roddwyd yn anghywir',
     'api_user_no_api_permission' => 'Nid oes gan berchennog y tocyn API a ddefnyddiwyd ganiatâd i wneud galwadau API',
     'api_user_token_expired' => 'Mae\'r tocyn awdurdodi a ddefnyddiwyd wedi dod i ben',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Gwall a daflwyd wrth anfon e-bost prawf:',
diff --git a/lang/cy/notifications.php b/lang/cy/notifications.php
index 26f65f1447d..766e666b929 100644
--- a/lang/cy/notifications.php
+++ b/lang/cy/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Tudalen wedi\'i diweddaru :pageName',
     'updated_page_intro' => 'Mae tudalen newydd wedi cael ei diweddaru yn :appName:',
     'updated_page_debounce' => 'Er mwyn atal llu o hysbysiadau, am gyfnod ni fyddwch yn cael hysbysiadau am ragor o olygiadau i\'r dudalen hon gan yr un golygydd.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Enw\'r dudalen:',
     'detail_page_path' => 'Llwybr Tudalen:',
diff --git a/lang/cy/preferences.php b/lang/cy/preferences.php
index 6e00adfe8ee..c95169d2494 100644
--- a/lang/cy/preferences.php
+++ b/lang/cy/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Mae’r dewisiadau llwybr byr wedi\'u diweddaru!',
     'shortcuts_overview_desc' => 'Rheoli llwybrau byr bysellfwrdd a gellir eu defnyddio i lywio trwy ryngwyneb defnyddiwr y system.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Dewisiadau Hysbysu',
     'notifications_desc' => 'Rheoli’r hysbysiadau e-bost a gewch pan fydd gweithgaredd penodol yn cael ei gyflawni o fewn y system.',
     'notifications_opt_own_page_changes' => 'Hysbysu am newidiadau i dudalennau yr wyf yn berchen arnynt',
     'notifications_opt_own_page_comments' => 'Hysbysu am sylwadau ar dudalennau yr wyf yn berchen arnynt',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Hysbysu am atebion i\'m sylwadau',
     'notifications_save' => 'Dewisiadau Cadw',
     'notifications_update_success' => 'Mae’r dewisiadau hysbysu wedi\'u diweddaru!',
diff --git a/lang/cy/settings.php b/lang/cy/settings.php
index cb08e8c9068..a880f0653a5 100644
--- a/lang/cy/settings.php
+++ b/lang/cy/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ni osodwyd cyfyngiad',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Cynnal',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Mewnforio Cynnwys',
     'role_editor_change' => 'Newid golygydd tudalen',
     'role_notifications' => 'Derbyn a rheoli hysbysiadau',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Caniatâd Asedau',
     'roles_system_warning' => 'Byddwch yn ymwybodol y gall mynediad i unrhyw un o\'r tri chaniatâd uchod ganiatáu i ddefnyddiwr newid eu breintiau eu hunain neu freintiau eraill yn y system. Neilltuo rolau gyda\'r caniatâd hyn i ddefnyddwyr dibynadwy yn unig.',
     'role_asset_desc' => 'Mae\'r caniatâd hwn yn rheoli mynediad diofyn i\'r asedau o fewn y system. Bydd caniatâd ar Lyfrau, Penodau a Thudalennau yn diystyru\'r caniatâd hwn.',
     'role_asset_admins' => 'Mae gweinyddwyr yn cael mynediad awtomatig i\'r holl gynnwys ond gall yr opsiynau hyn ddangos neu guddio opsiynau UI.',
     'role_asset_image_view_note' => 'Mae hyn yn ymwneud â gwelededd o fewn y rheolwr delweddau. Bydd mynediad gwirioneddol i ffeiliau delwedd wedi\'u huwchlwytho yn dibynnu ar opsiwn storio delwedd y system.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Popeth',
     'role_own' => 'Meddu',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Wedi\'u rheoli gan yr ased y maent yn cael eu huwchlwytho iddo',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Cadw Rôl',
     'role_users' => 'Defnyddwyr yn y rôl hon',
     'role_users_none' => 'Nid oes unrhyw ddefnyddwyr wedi’u neilltuo i\'r rôl hon ar hyn o bryd',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Gosod dilysu aml-ffactor fel haen ychwanegol o ddiogelwch ar gyfer eich cyfrif defnyddiwr.',
     'users_mfa_x_methods' => ':count dull wedi\'i ffurfweddu|:count dull wedi\'u ffurfweddu',
     'users_mfa_configure' => 'Ffurfweddu Dulliau',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Creu Tocyn API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/cy/validation.php b/lang/cy/validation.php
index 5259f647244..c5fbc3d7765 100644
--- a/lang/cy/validation.php
+++ b/lang/cy/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'Rhaid ir :attribute cynnwys llythrennau a rhifau yn unig.',
     'array'                => 'Rhaid i :attribute fod yn array.',
     'backup_codes'         => 'Nid yw\'r cod a ddarparwyd yn ddilys neu mae eisoes wedi\'i ddefnyddio.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'Rhaid i\'r :attribute bod yn dyddiad cyn :date.',
     'between'              => [
         'numeric' => 'Rhaid i\'r :attribute bod rhwng :min a :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Rhaid i :attribute fod yn wir neu ddim.',
     'confirmed'            => 'Dydi\'r cadarnhad :attribute ddim yn cydfynd.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'Nid yw\'r :attribute yn dyddiad dilys.',
     'date_format'          => 'Nid yw\'r :attribute yn cydfynd ar format :format.',
     'different'            => 'Rhaid i :attribute a :other bod yn wahanol.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Nid oedd modd uwchlwytho’r ffeil. Efallai na fydd y gweinydd yn derbyn ffeiliau o\'r maint hwn.',
 
     'zip_file' => 'Mae\'r :attribute angen cyfeirio at ffeil yn y ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'Mae\'r :attribute angen cyfeirio at ffeil o fath :valid Types, sydd wedi\'i ffeindio :foundType.',
     'zip_model_expected' => 'Dyswgyl am wrthrych data ond wedi ffeindio ":type".',
     'zip_unique' => 'Mae rhaid y :attribute fod yn unigol i\'r fath o wrthrych yn y ZIP.',
diff --git a/lang/da/activities.php b/lang/da/activities.php
index fa11e8e3afb..00cb76b5f78 100644
--- a/lang/da/activities.php
+++ b/lang/da/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Brugeren blev opdateret',
     'user_delete' => 'slettet bruger',
     'user_delete_notification' => 'Brugeren blev fjernet',
+    'user_mfa_reset' => 'nulstil MFA for brugeren',
+    'user_mfa_reset_notification' => 'Nulstilling af metoder til multifaktor-godkendelse',
 
     // API Tokens
     'api_token_create' => 'oprettet API token',
diff --git a/lang/da/auth.php b/lang/da/auth.php
index dcc531125d5..75dbf3ca55b 100644
--- a/lang/da/auth.php
+++ b/lang/da/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'De indtastede brugeroplysninger stemmer ikke overens med vores registreringer.',
     'throttle' => 'For mange mislykkede loginforsøg. Prøv igen om :seconds sekunder.',
+    'mfa_throttle' => 'For mange mislykkede loginforsøg. Prøv igen om :seconds sekunder.',
 
     // Login & Register
     'sign_up' => 'Registrer',
@@ -20,6 +21,9 @@
     'username' => 'Brugernavn',
     'email' => 'E-mail',
     'password' => 'Adgangskode',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Bekræft adgangskode',
     'password_hint' => 'Skal være på mindst 8 karakterer',
     'forgot_password' => 'Glemt Adgangskode?',
diff --git a/lang/da/common.php b/lang/da/common.php
index db75772c857..7c6549d9064 100644
--- a/lang/da/common.php
+++ b/lang/da/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Aldrig',
     'none' => 'Ingen',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Forside',
diff --git a/lang/da/editor.php b/lang/da/editor.php
index 4c8aa0f7212..628e1319e21 100644
--- a/lang/da/editor.php
+++ b/lang/da/editor.php
@@ -36,7 +36,7 @@
     'paragraph' => 'Paragraf',
     'blockquote' => 'Citat',
     'inline_code' => 'Inline kode',
-    'callouts' => 'Callouts',
+    'callouts' => 'Tekstfelter',
     'callout_information' => 'Information',
     'callout_success' => 'Succes',
     'callout_warning' => 'Advarsel',
@@ -48,7 +48,7 @@
     'superscript' => 'Hævet',
     'subscript' => 'Sænket',
     'text_color' => 'Tekstfarve',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Fremhævelsesfarve',
     'custom_color' => 'Tilpasset farve',
     'remove_color' => 'Fjern farve',
     'background_color' => 'Baggrundsfarve',
diff --git a/lang/da/entities.php b/lang/da/entities.php
index 66e3fd2063b..a078ad9d85f 100644
--- a/lang/da/entities.php
+++ b/lang/da/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Dette vil slette den uploadede ZIP-fil og kan ikke fortrydes.',
     'import_errors' => 'Importfejl',
     'import_errors_desc' => 'Følgende fejl opstod under importforsøget:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Naviger blandt siderne',
+    'breadcrumb_siblings_for_chapter' => 'Gå til næste eller forrige kapitel',
+    'breadcrumb_siblings_for_book' => 'Gennemse søskende til bogen',
+    'breadcrumb_siblings_for_bookshelf' => 'Gennemse undermapper til hylden',
 
     // Permissions and restrictions
     'permissions' => 'Rettigheder',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Flyt kapitler og sider i en bog for at omorganisere dens indhold. Der kan tilføjes andre bøger, som gør det nemt at flytte kapitler og sider mellem bøgerne. Man kan indstille en automatisk sorteringsregel, så bogens indhold automatisk sorteres efter ændringer.',
     'books_sort_auto_sort' => 'Mulighed for automatisk sortering',
     'books_sort_auto_sort_active' => 'Automatisk sortering Aktiv: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'En bruger med de nødvendige rettigheder kan oprette regler for automatisk sortering i indstillingsområdet »Lister og sortering«.',
     'books_sort_named' => 'Sorter bog :bookName',
     'books_sort_name' => 'Sortér efter navn',
     'books_sort_created' => 'Sortér efter oprettelsesdato',
@@ -252,7 +253,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilt indhold)',
     'pages_edit_switch_to_wysiwyg' => 'Skift til WYSIWYG redigering',
     'pages_edit_switch_to_new_wysiwyg' => 'Skift til ny WYSIWYG (Hvad man ser, er hvad man får)',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(I Beta Test)',
     'pages_edit_set_changelog' => 'Sæt ændringsoversigt',
     'pages_edit_enter_changelog_desc' => 'Indtast en kort beskrivelse af ændringer du har lavet',
     'pages_edit_enter_changelog' => 'Indtast ændringsoversigt',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Sidebjælke til/fra',
+    'page_contents' => 'Sideindhold',
+    'page_contents_none' => 'Ingen overskrifter blev fundet i sidens indhold.',
+    'page_contents_info' => 'Indholdsmenuen er genereret fra alle kursformater, der bruges på siden.',
     'page_tags' => 'Sidetags',
     'chapter_tags' => 'Kapiteltags',
     'book_tags' => 'Bogtags',
@@ -397,11 +401,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Tilføj kommentar',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Ingen kommentarer at vise',
     'comment_placeholder' => 'Skriv en kommentar her',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_thread_count' => ':count Kommentar Tråde:count Kommentar Tråde',
     'comment_archived_count' => ':count Arkiveret',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_archived_threads' => 'Arkiverede Tråde',
     'comment_save' => 'Gem kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenteret :createDiff',
@@ -410,8 +414,8 @@
     'comment_deleted_success' => 'Kommentar slettet',
     'comment_created_success' => 'Kommentaren er tilføjet',
     'comment_updated_success' => 'Kommentaren er opdateret',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_archive_success' => 'Kommentar arkiveret',
+    'comment_unarchive_success' => 'Kommentaren er ikke længere arkiveret',
     'comment_view' => 'Se kommentar',
     'comment_jump_to_thread' => 'Hop til tråd',
     'comment_delete_confirm' => 'Er du sikker på, at du vil slette denne kommentar?',
diff --git a/lang/da/errors.php b/lang/da/errors.php
index 864dec270dc..62a275547ff 100644
--- a/lang/da/errors.php
+++ b/lang/da/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Kunne ikke læse ZIP-filen.',
     'import_zip_cant_decode_data' => 'Kunne ikke finde og afkode ZIP data.json-indhold.',
     'import_zip_no_data' => 'ZIP-filens data har ikke noget forventet bog-, kapitel- eller sideindhold.',
+    'import_zip_data_too_large' => 'Indholdet af ZIP data.json overstiger den konfigurerede maksimale uploadstørrelse for applikationen.',
     'import_validation_failed' => 'Import ZIP kunne ikke valideres med fejl:',
     'import_zip_failed_notification' => 'Kunne ikke importere ZIP-fil.',
     'import_perms_books' => 'Du mangler de nødvendige tilladelser til at oprette bøger.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Hemmeligheden leveret til det givne anvendte API-token er forkert',
     'api_user_no_api_permission' => 'Ejeren af den brugte API token har ikke adgang til at foretage API-kald',
     'api_user_token_expired' => 'Den brugte godkendelsestoken er udløbet',
+    'api_cookie_auth_only_get' => 'Der tillades kun GET-anmodninger, når API\'et bruges med cookie-baseret godkendelse',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Følgende fejl opstod under afsendelse af testemail:',
diff --git a/lang/da/notifications.php b/lang/da/notifications.php
index 8074c03c4d9..fc4d7d763b7 100644
--- a/lang/da/notifications.php
+++ b/lang/da/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Opdateret side: :pageName',
     'updated_page_intro' => 'En side er blevet opdateret i :appName:',
     'updated_page_debounce' => 'For at forhindre en masse af notifikationer, i et stykke tid vil du ikke blive sendt notifikationer for yderligere redigeringer til denne side af den samme editor.',
+    'comment_mention_subject' => 'Du er blevet nævnt i en kommentar på siden: :pageName',
+    'comment_mention_intro' => 'Du blev nævnt i en kommentar på :appName:',
 
     'detail_page_name' => 'Sidens navn:',
     'detail_page_path' => 'Sidesti:',
diff --git a/lang/da/preferences.php b/lang/da/preferences.php
index 143405a163c..d374dec5a0b 100644
--- a/lang/da/preferences.php
+++ b/lang/da/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Genvejspræferencer er blevet opdateret!',
     'shortcuts_overview_desc' => 'Håndtér tastaturgenveje, du kan bruge til at navigere i systemets brugergrænseflade.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notifikationer',
     'notifications_desc' => 'Administrer de e-mail-notifikationer, du modtager, når visse aktiviteter udføres i systemet.',
     'notifications_opt_own_page_changes' => 'Adviser ved ændringer af sider, jeg ejer',
     'notifications_opt_own_page_comments' => 'Adviser ved kommentarer på sider, jeg ejer',
+    'notifications_opt_comment_mentions' => 'Giv besked, når jeg er nævnt i en kommentar',
     'notifications_opt_comment_replies' => 'Adviser ved svar på mine kommentarer',
     'notifications_save' => 'Gem indstillinger',
     'notifications_update_success' => 'Indstillinger for notifikationer er blevet opdateret!',
diff --git a/lang/da/settings.php b/lang/da/settings.php
index 4f194545b75..a3afa2e58bb 100644
--- a/lang/da/settings.php
+++ b/lang/da/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen restriktion opsat',
 
     // Sorting Settings
-    'sorting' => 'Sortering',
-    'sorting_book_default' => 'Standard bog-sortering',
+    'sorting' => 'Lister & Sortering',
+    'sorting_book_default' => 'Standardregel for sortering af bog',
     'sorting_book_default_desc' => 'Vælg den standardsorteringsregel, der skal gælde for nye bøger. Dette påvirker ikke eksisterende bøger og kan tilsidesættes for hver enkelt bog.',
     'sorting_rules' => 'Regler for sortering',
     'sorting_rules_desc' => 'Det er foruddefinerede sorteringsoperationer, som kan anvendes på indhold i systemet.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Opdateret dato',
     'sort_rule_op_chapters_first' => 'Kapitler først',
     'sort_rule_op_chapters_last' => 'De sidste kapitler',
+    'sorting_page_limits' => 'Visningsgrænser pr. side',
+    'sorting_page_limits_desc' => 'Indstil, hvor mange poster der skal vises pr. side i de forskellige lister i systemet. Normalt giver et lavere antal bedre ydeevne, mens et højere antal undgår, at man skal klikke sig igennem flere sider. Det anbefales at vælge et tal, der er et multiplum af 6.',
 
     // Maintenance settings
     'maint' => 'Vedligeholdelse',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importer indhold',
     'role_editor_change' => 'Skift side editor',
     'role_notifications' => 'Modtag og administrer notifikationer',
+    'role_permission_note_users_and_roles' => 'Disse tilladelser vil teknisk set også give synlighed og søgning efter brugere og roller i systemet.',
     'role_asset' => 'Tilladelser for medier og "assets"',
     'roles_system_warning' => 'Vær opmærksom på, at adgang til alle af de ovennævnte tre tilladelser, kan give en bruger mulighed for at ændre deres egne brugerrettigheder eller brugerrettigheder for andre i systemet. Tildel kun roller med disse tilladelser til betroede brugere.',
     'role_asset_desc' => 'Disse tilladelser kontrollerer standardadgang til medier og "assets" i systemet. Tilladelser til bøger, kapitler og sider tilsidesætter disse tilladelser.',
     'role_asset_admins' => 'Administratorer får automatisk adgang til alt indhold, men disse indstillinger kan vise eller skjule UI-indstillinger.',
     'role_asset_image_view_note' => 'Dette vedrører synlighed i billedhåndteringen. Den faktiske adgang til uploadede billedfiler vil afhænge af systemets billedlagringsindstilling.',
+    'role_asset_users_note' => 'Disse tilladelser vil teknisk set også give synlighed og søgning efter brugere i systemet.',
     'role_all' => 'Alle',
     'role_own' => 'Eget',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Styres af det medie/"asset", de uploades til',
+    'role_controlled_by_page_delete' => 'Styres af tilladelser til sletning af sider',
     'role_save' => 'Gem rolle',
     'role_users' => 'Brugere med denne rolle',
     'role_users_none' => 'Ingen brugere er i øjeblikket tildelt denne rolle',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Opsæt multi-faktor godkendelse som et ekstra lag af sikkerhed for din brugerkonto.',
     'users_mfa_x_methods' => ':count metode konfigureret|:count metoder konfigureret',
     'users_mfa_configure' => 'Konfigurer metoder',
+    'users_mfa_reset' => 'Nulstil metoder til multifaktor-godkendelse',
+    'users_mfa_reset_desc' => 'Dette vil nulstille og slette alle konfigurerede metoder til multifaktor-godkendelse for denne bruger. Hvis multifaktor-godkendelse er påkrævet for en af brugerens roller, vil vedkommende blive bedt om at konfigurere nye metoder ved næste login.',
+    'users_mfa_reset_confirm' => 'Er du sikker på, at du vil nulstille multifaktorautentificering for denne bruger?',
 
     // API Tokens
     'user_api_token_create' => 'Opret API-token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'Thailandsk',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/da/validation.php b/lang/da/validation.php
index 3caf1417a45..b19d520f968 100644
--- a/lang/da/validation.php
+++ b/lang/da/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute må kun indeholde bogstaver og tal.',
     'array'                => ':attribute skal være et array.',
     'backup_codes'         => 'Den angivne kode er ikke gyldig eller er allerede brugt.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute skal være en dato før :date.',
     'between'              => [
         'numeric' => ':attribute skal være mellem :min og :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute-feltet skal være enten sandt eller falsk.',
     'confirmed'            => ':attribute-bekræftelsen matcher ikke.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute er ikke en gyldig dato.',
     'date_format'          => ':attribute matcher ikke formatet :format.',
     'different'            => ':attribute og :other skal være forskellige.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Filen kunne ikke oploades. Serveren accepterer muligvis ikke filer af denne størrelse.',
 
     'zip_file' => 'Attributten skal henvise til en fil i ZIP.',
+    'zip_file_size' => 'Filen :attribute må ikke overstige: størrelse MB.',
     'zip_file_mime' => 'Attributten skal henvise til en fil af typen: validTypes, fundet:foundType.',
     'zip_model_expected' => 'Data objekt forventet men ":type" fundet.',
     'zip_unique' => 'Attributten skal være unik for objekttypen i ZIP.',
diff --git a/lang/de/activities.php b/lang/de/activities.php
index 025cbaeffab..a680a72c514 100644
--- a/lang/de/activities.php
+++ b/lang/de/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Benutzer erfolgreich aktualisiert',
     'user_delete' => 'hat Benutzer gelöscht: ',
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
+    'user_mfa_reset' => 'Setze MFA für Nutzer zurück',
+    'user_mfa_reset_notification' => 'Multifaktor-Authenifizierungsmethoden zurücksetzen',
 
     // API Tokens
     'api_token_create' => 'API-Token erstellt',
diff --git a/lang/de/auth.php b/lang/de/auth.php
index 92789d18216..4df6e7863c8 100644
--- a/lang/de/auth.php
+++ b/lang/de/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Diese Anmeldedaten stimmen nicht mit unseren Aufzeichnungen überein.',
     'throttle' => 'Zu viele Anmeldeversuche. Bitte versuchen Sie es in :seconds Sekunden erneut.',
+    'mfa_throttle' => 'Zu viele Multi-Faktor-Verifizierungsversuche. Bitte versuchen Sie es in :seconds Sekunden erneut.',
 
     // Login & Register
     'sign_up' => 'Registrieren',
@@ -20,6 +21,9 @@
     'username' => 'Benutzername',
     'email' => 'E-Mail',
     'password' => 'Passwort',
+    'password_new' => 'Neues Passwort',
+    'password_new_confirm' => 'Neues Passwort bestätigen',
+    'password_current' => 'Aktuelles Passwort bestätigen',
     'password_confirm' => 'Passwort bestätigen',
     'password_hint' => 'Muss mindestens 8 Zeichen lang sein',
     'forgot_password' => 'Passwort vergessen?',
@@ -39,7 +43,7 @@
     'register_success' => 'Vielen Dank für Ihre Registrierung! Die Daten sind gespeichert und Sie sind angemeldet.',
 
     // Login auto-initiation
-    'auto_init_starting' => 'Anmeldeversuche',
+    'auto_init_starting' => 'Anmeldeversuch',
     'auto_init_starting_desc' => 'Wir verbinden uns mit Ihrem Authentifizierungssystem, um den Anmeldeprozess zu starten. Sollte es nach 5 Sekunden nicht weitergehen, klicken Sie bitte auf den unten stehenden Link.',
     'auto_init_start_link' => 'Mit Authentifizierung fortfahren',
 
diff --git a/lang/de/common.php b/lang/de/common.php
index 4f2ae54d272..0b40035f4fa 100644
--- a/lang/de/common.php
+++ b/lang/de/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Niemals',
     'none' => 'Nichts',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Startseite',
diff --git a/lang/de/editor.php b/lang/de/editor.php
index 1be31551987..f609f58fbe7 100644
--- a/lang/de/editor.php
+++ b/lang/de/editor.php
@@ -173,9 +173,9 @@
     'save_continue' => 'Speichern & Fortfahren',
     'callouts_cycle' => '(Drücken Sie weiter, um durch Typen umzuschalten)',
     'link_selector' => 'Inhalt verlinken',
-    'shortcuts' => 'Verknüpfungen',
-    'shortcut' => 'Verknüpfung',
-    'shortcuts_intro' => 'Die folgenden Verknüpfungen sind im Editor verfügbar:',
+    'shortcuts' => 'Tastenkombinationen',
+    'shortcut' => 'Tastenkombination',
+    'shortcuts_intro' => 'Die folgenden Tastenkombinationen sind im Editor verfügbar:',
     'windows_linux' => '(Windows/Linux)',
     'mac' => '(Mac)',
     'description' => 'Beschreibung',
diff --git a/lang/de/entities.php b/lang/de/entities.php
index 2cfdd1490ed..7fa7c43bcd4 100644
--- a/lang/de/entities.php
+++ b/lang/de/entities.php
@@ -23,175 +23,176 @@
     'meta_updated' => 'Zuletzt aktualisiert: :timeLength',
     'meta_updated_name' => 'Zuletzt aktualisiert: :timeLength von :user',
     'meta_owned_name' => 'Im Besitz von :user',
-    'meta_reference_count' => 'Referenziert von :count Element|Referenziert von :count Elementen',
+    'meta_reference_count' => 'Verwiesen von :count Element|verwiesen von :count Elementen',
     'entity_select' => 'Eintrag auswählen',
-    'entity_select_lack_permission' => 'Sie haben nicht die benötigte Berechtigung, um dieses Element auszuwählen',
+    'entity_select_lack_permission' => 'Sie verfügen nicht über die erforderlichen Berechtigungen, um dieses Element auszuwählen',
     'images' => 'Bilder',
-    'my_recent_drafts' => 'Meine kürzlichen Entwürfe',
-    'my_recently_viewed' => 'Kürzlich von mir angesehen',
+    'my_recent_drafts' => 'Meine letzten Entwürfe',
+    'my_recently_viewed' => 'Meine zuletzt angesehenen',
     'my_most_viewed_favourites' => 'Meine meistgesehenen Favoriten',
     'my_favourites' => 'Meine Favoriten',
-    'no_pages_viewed' => 'Sie haben bisher keine Seiten angesehen',
-    'no_pages_recently_created' => 'Sie haben bisher keine Seiten angelegt',
-    'no_pages_recently_updated' => 'Sie haben bisher keine Seiten aktualisiert',
+    'no_pages_viewed' => 'Sie haben noch keine Seiten aufgerufen',
+    'no_pages_recently_created' => 'Es wurden in letzter Zeit keine Seiten erstellt',
+    'no_pages_recently_updated' => 'Es wurden in letzter Zeit keine Seiten aktualisiert',
     'export' => 'Exportieren',
-    'export_html' => 'HTML-Datei',
+    'export_html' => 'Eingebettete Webdatei',
     'export_pdf' => 'PDF-Datei',
-    'export_text' => 'Textdatei',
+    'export_text' => 'Klartextdatei',
     'export_md' => 'Markdown-Datei',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Portables ZIP',
     'default_template' => 'Standard-Seitenvorlage',
-    'default_template_explain' => 'Bestimmen Sie eine Seitenvorlage, die als Standardinhalt für alle Seiten verwendet wird, die innerhalb dieses Elements erstellt werden. Beachten Sie, dass dies nur dann verwendet wird, wenn der Ersteller der Seite Lesezugriff auf die ausgewählte Vorlagen-Seite hat.',
+    'default_template_explain' => 'Weisen Sie eine Seitenvorlage zu, die als Standardinhalt für alle innerhalb dieses Elements erstellten Seiten verwendet wird. Beachten Sie, dass diese nur verwendet wird, wenn der Ersteller der Seite über Anzeigerechte für die ausgewählte Vorlagenseite verfügt.',
     'default_template_select' => 'Wählen Sie eine Seitenvorlage',
-    'import' => 'Import',
-    'import_validate' => 'Import validieren',
-    'import_desc' => 'Importieren Sie Bücher, Kapitel & Seiten mit einem "Portable Zip-Export" von der gleichen oder einer anderen Instanz. Wählen Sie eine ZIP-Datei, um fortzufahren. Nachdem die Datei hochgeladen und bestätigt wurde, können Sie den Import in der nächsten Ansicht konfigurieren und bestätigen.',
-    'import_zip_select' => 'ZIP-Datei zum Hochladen auswählen',
-    'import_zip_validation_errors' => 'Fehler bei der Validierung der angegebenen ZIP-Datei:',
+    'import' => 'Importieren',
+    'import_validate' => 'Import bestätigen',
+    'import_desc' => 'Importieren Sie Bücher, Kapitel und Seiten mithilfe eines portablen ZIP-Exports aus derselben oder einer anderen Instanz. Wählen Sie eine ZIP-Datei aus, um fortzufahren. Nachdem die Datei hochgeladen und überprüft wurde, können Sie den Import in der nächsten Ansicht konfigurieren und bestätigen.',
+    'import_zip_select' => 'Wähle eine ZIP-Datei zum Hochladen aus',
+    'import_zip_validation_errors' => 'Bei der Überprüfung der bereitgestellten ZIP-Datei wurden Fehler festgestellt:',
     'import_pending' => 'Ausstehende Importe',
     'import_pending_none' => 'Es wurden keine Importe gestartet.',
     'import_continue' => 'Import fortsetzen',
-    'import_continue_desc' => 'Überprüfen Sie den Inhalt, der aus der hochgeladenen ZIP-Datei importiert werden soll. Führen Sie den Import aus, um dessen Inhalt zu diesem System hinzuzufügen. Die hochgeladene ZIP-Importdatei wird bei erfolgreichem Import automatisch entfernt.',
-    'import_details' => 'Einzelheiten zum Import',
-    'import_run' => 'Import starten',
+    'import_continue_desc' => 'Überprüfen Sie den Inhalt, der aus der hochgeladenen ZIP-Datei importiert werden soll. Wenn Sie bereit sind, starten Sie den Import, um den Inhalt in dieses System zu übernehmen. Die hochgeladene ZIP-Importdatei wird nach erfolgreichem Import automatisch gelöscht.',
+    'import_details' => 'Importdetails',
+    'import_run' => 'Import ausführen',
     'import_size' => ':size Import ZIP Größe',
     'import_uploaded_at' => 'Hochgeladen :relativeTime',
     'import_uploaded_by' => 'Hochgeladen von',
-    'import_location' => 'Import Ort',
-    'import_location_desc' => 'Wählen Sie einen Zielort für Ihren importierten Inhalt. Sie benötigen die entsprechenden Berechtigungen, um innerhalb des gewünschten Standortes zu erstellen.',
-    'import_delete_confirm' => 'Sind Sie sicher, dass Sie diesen Import löschen möchten?',
-    'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
+    'import_location' => 'Importort',
+    'import_location_desc' => 'Wählen Sie einen Zielspeicherort für Ihre importierten Inhalte aus. Sie benötigen die entsprechenden Berechtigungen, um an dem von Ihnen gewählten Speicherort Inhalte zu erstellen.',
+    'import_delete_confirm' => 'Möchten Sie diesen Import wirklich löschen?',
+    'import_delete_desc' => 'Dadurch wird die hochgeladene ZIP-Importdatei gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.',
     'import_errors' => 'Importfehler',
-    'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'import_errors_desc' => 'Beim Importversuch sind folgende Fehler aufgetreten:',
+    'breadcrumb_siblings_for_page' => 'Durch die untergeordneten Elemente der Seite navigieren',
+    'breadcrumb_siblings_for_chapter' => 'Durch die Unterelemente des Kapitels navigieren',
+    'breadcrumb_siblings_for_book' => 'Durch die Unterordner des Buches navigieren',
+    'breadcrumb_siblings_for_bookshelf' => 'Durch die untergeordneten Elemente des Regals navigieren',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
-    'permissions_desc' => 'Legen Sie hier Berechtigungen fest, um die Standardberechtigungen von Benutzerrollen zu überschreiben.',
+    'permissions_desc' => 'Legen Sie hier Berechtigungen fest, um die durch Benutzerrollen vorgegebenen Standardberechtigungen zu überschreiben.',
     'permissions_book_cascade' => 'In Büchern festgelegte Berechtigungen werden automatisch in untergeordnete Kapitel und Seiten kaskadiert, es sei denn, sie haben eigene Berechtigungen definiert.',
-    'permissions_chapter_cascade' => 'In Kapiteln festgelegte Berechtigungen werden automatisch in untergeordnete Seiten kaskadiert, es sei denn, sie haben eigene Berechtigungen definiert.',
+    'permissions_chapter_cascade' => 'Die für Kapitel festgelegten Berechtigungen werden automatisch auf untergeordnete Seiten übertragen, sofern für diese keine eigenen Berechtigungen definiert sind.',
     'permissions_save' => 'Berechtigungen speichern',
     'permissions_owner' => 'Besitzer',
     'permissions_role_everyone_else' => 'Alle anderen',
-    'permissions_role_everyone_else_desc' => 'Berechtigungen für alle Rollen setzen, die nicht explizit überschrieben wurden.',
-    'permissions_role_override' => 'Berechtigungen für Rolle überschreiben',
-    'permissions_inherit_defaults' => 'Standardeinstellungen vererben',
+    'permissions_role_everyone_else_desc' => 'Berechtigungen für alle Rollen festlegen, die nicht ausdrücklich überschrieben wurden.',
+    'permissions_role_override' => 'Berechtigungen für eine Rolle überschreiben',
+    'permissions_inherit_defaults' => 'Standardwerte übernehmen',
 
     // Search
     'search_results' => 'Suchergebnisse',
-    'search_total_results_found' => ':count Ergebnis gefunden|:count Ergebnisse gesamt',
-    'search_clear' => 'Filter löschen',
-    'search_no_pages' => 'Keine Seiten gefunden',
+    'search_total_results_found' => ':count Ergebnisse gefunden|:count insgesamt gefundene Ergebnisse',
+    'search_clear' => 'Suche löschen',
+    'search_no_pages' => 'Es wurden keine Seiten gefunden, die dieser Suche entsprechen',
     'search_for_term' => 'Nach :term suchen',
     'search_more' => 'Mehr Ergebnisse',
     'search_advanced' => 'Erweiterte Suche',
     'search_terms' => 'Suchbegriffe',
     'search_content_type' => 'Inhaltstyp',
-    'search_exact_matches' => 'Exakte Treffer',
+    'search_exact_matches' => 'Genau übereinstimmende Treffer',
     'search_tags' => 'Schlagwort-Suchen',
     'search_options' => 'Optionen',
-    'search_viewed_by_me' => 'Schon von mir angesehen',
-    'search_not_viewed_by_me' => 'Noch nicht von mir angesehen',
+    'search_viewed_by_me' => 'Von mir angesehen',
+    'search_not_viewed_by_me' => 'Von mir nicht angesehen',
     'search_permissions_set' => 'Berechtigungen gesetzt',
     'search_created_by_me' => 'Von mir erstellt',
     'search_updated_by_me' => 'Von mir aktualisiert',
     'search_owned_by_me' => 'In meinem Besitz',
     'search_date_options' => 'Datums Optionen',
-    'search_updated_before' => 'Aktualisiert vor',
+    'search_updated_before' => 'Zuletzt aktualisiert am',
     'search_updated_after' => 'Aktualisiert nach',
     'search_created_before' => 'Erstellt vor',
     'search_created_after' => 'Erstellt nach',
-    'search_set_date' => 'Datum auswählen',
+    'search_set_date' => 'Datum festlegen',
     'search_update' => 'Suche aktualisieren',
 
     // Shelves
     'shelf' => 'Regal',
     'shelves' => 'Regale',
     'x_shelves' => ':count Regal|:count Regale',
-    'shelves_empty' => 'Es wurden noch keine Regale angelegt',
-    'shelves_create' => 'Erzeuge ein Regal',
+    'shelves_empty' => 'Es wurden keine Regale angelegt',
+    'shelves_create' => 'Neues Regal erstellen',
     'shelves_popular' => 'Beliebte Regale',
     'shelves_new' => 'Kürzlich erstellte Regale',
     'shelves_new_action' => 'Neues Regal',
     'shelves_popular_empty' => 'Die beliebtesten Regale werden hier angezeigt.',
-    'shelves_new_empty' => 'Die neusten Regale werden hier angezeigt.',
+    'shelves_new_empty' => 'Hier werden die zuletzt erstellten Regale angezeigt.',
     'shelves_save' => 'Regal speichern',
     'shelves_books' => 'Bücher in diesem Regal',
     'shelves_add_books' => 'Buch zu diesem Regal hinzufügen',
-    'shelves_drag_books' => 'Ziehen Sie Bücher nach unten, um sie diesem Regal hinzuzufügen',
+    'shelves_drag_books' => 'Ziehe die unten stehenden Bücher per Drag-and-drop auf dieses Regal, um sie hinzuzufügen',
     'shelves_empty_contents' => 'Diesem Regal sind keine Bücher zugewiesen',
-    'shelves_edit_and_assign' => 'Regal bearbeiten um Bücher hinzuzufügen',
+    'shelves_edit_and_assign' => 'Regal bearbeiten, um Bücher zuzuordnen',
     'shelves_edit_named' => 'Regal :name bearbeiten',
     'shelves_edit' => 'Regal bearbeiten',
     'shelves_delete' => 'Regal löschen',
     'shelves_delete_named' => 'Regal :name löschen',
-    'shelves_delete_explain' => "Dadurch wird das Regal mit dem Namen ':name' gelöscht. Die darin enthaltenen Bücher werden nicht gelöscht.",
-    'shelves_delete_confirmation' => 'Sind Sie sicher, dass Sie dieses Regal löschen möchten?',
-    'shelves_permissions' => 'Regalberechtigungen',
-    'shelves_permissions_updated' => 'Regalberechtigungen aktualisiert',
-    'shelves_permissions_active' => 'Regalberechtigungen aktiv',
-    'shelves_permissions_cascade_warning' => 'Berechtigungen für Regale werden nicht automatisch auf die enthaltenen Bücher übertragen. Das liegt daran, dass ein Buch in mehreren Regalen vorhanden sein kann. Berechtigungen können jedoch auf untergeordnete Bücher kopiert werden, indem Sie die unten stehende Option verwenden.',
-    'shelves_permissions_create' => 'Regalerstellungsberechtigungen werden nur zum Kopieren von Berechtigungen für untergeordnete Bücher mit der folgenden Aktion verwendet. Sie kontrollieren nicht die Fähigkeit, Bücher zu erstellen.',
-    'shelves_copy_permissions_to_books' => 'Kopiere die Berechtigungen zum Buch',
-    'shelves_copy_permissions' => 'Berechtigungen kopieren',
-    'shelves_copy_permissions_explain' => 'Dadurch werden die aktuellen Berechtigungseinstellungen dieses Regals auf alle darin enthaltenen Bücher angewendet. Vergewissern Sie sich vor der Aktivierung, dass alle Änderungen an den Berechtigungen für dieses Regal gespeichert wurden.',
-    'shelves_copy_permission_success' => 'Regalberechtigungen auf :count Bücher kopiert',
+    'shelves_delete_explain' => "Dadurch wird das Regal mit dem Namen „:name“ gelöscht. Die darin enthaltenen Bücher werden nicht gelöscht.",
+    'shelves_delete_confirmation' => 'Möchtest du dieses Regal wirklich löschen?',
+    'shelves_permissions' => 'Berechtigungen für Regale',
+    'shelves_permissions_updated' => 'Berechtigungen für Regale aktualisiert',
+    'shelves_permissions_active' => 'Regal Berechtigungen aktiv',
+    'shelves_permissions_cascade_warning' => 'Berechtigungen für Regale werden nicht automatisch auf die darin enthaltenen Bücher übertragen. Das liegt daran, dass ein Buch in mehreren Regalen stehen kann. Berechtigungen können jedoch mithilfe der unten aufgeführten Option auf untergeordnete Bücher übertragen werden.',
+    'shelves_permissions_create' => 'Berechtigungen zum Erstellen von Regalen werden ausschließlich dazu verwendet, Berechtigungen mithilfe der unten beschriebenen Aktion auf untergeordnete Bücher zu kopieren. Sie haben keinen Einfluss auf die Möglichkeit, Bücher zu erstellen.',
+    'shelves_copy_permissions_to_books' => 'Kopiere die Berechtigungen zu den Büchern',
+    'shelves_copy_permissions' => 'Kopierrechte',
+    'shelves_copy_permissions_explain' => 'Dadurch werden die aktuellen Berechtigungseinstellungen dieses Regals auf alle darin enthaltenen Bücher angewendet. Stellen Sie vor der Aktivierung sicher, dass alle Änderungen an den Berechtigungen dieses Regals gespeichert wurden.',
+    'shelves_copy_permission_success' => 'Regal Berechtigungen auf :count Bücher kopiert',
 
     // Books
     'book' => 'Buch',
     'books' => 'Bücher',
     'x_books' => ':count Buch|:count Bücher',
-    'books_empty' => 'Keine Bücher vorhanden',
+    'books_empty' => 'Es wurden keine Bücher erstellt',
     'books_popular' => 'Beliebte Bücher',
-    'books_recent' => 'Kürzlich angesehene Bücher',
+    'books_recent' => 'Aktuelle Bücher',
     'books_new' => 'Neue Bücher',
     'books_new_action' => 'Neues Buch',
     'books_popular_empty' => 'Die beliebtesten Bücher werden hier angezeigt.',
-    'books_new_empty' => 'Die neusten Bücher werden hier angezeigt.',
+    'books_new_empty' => 'Hier werden die zuletzt erstellten Bücher angezeigt.',
     'books_create' => 'Neues Buch erstellen',
     'books_delete' => 'Buch löschen',
     'books_delete_named' => 'Buch ":bookName" löschen',
-    'books_delete_explain' => 'Das Buch ":bookName" wird gelöscht und alle zugehörigen Kapitel und Seiten entfernt.',
-    'books_delete_confirmation' => 'Sind Sie sicher, dass Sie dieses Buch löschen möchten?',
+    'books_delete_explain' => 'Dadurch wird das Buch mit dem Namen „:bookName“ gelöscht. Alle Seiten und Kapitel werden entfernt. Das Buch ":bookName" wird gelöscht und alle zugehörigen Kapitel und Seiten entfernt.',
+    'books_delete_confirmation' => 'Möchtest du dieses Buch wirklich löschen?',
     'books_edit' => 'Buch bearbeiten',
     'books_edit_named' => 'Buch ":bookName" bearbeiten',
     'books_form_book_name' => 'Name des Buches',
     'books_save' => 'Buch speichern',
-    'books_permissions' => 'Buch-Berechtigungen',
-    'books_permissions_updated' => 'Buch-Berechtigungen aktualisiert',
-    'books_empty_contents' => 'Es sind noch keine Seiten oder Kapitel zu diesem Buch hinzugefügt worden.',
-    'books_empty_create_page' => 'Neue Seite anlegen',
+    'books_permissions' => 'Buch Berechtigungen',
+    'books_permissions_updated' => 'Bücherberechtigungen aktualisiert',
+    'books_empty_contents' => 'Für dieses Buch wurden noch keine Seiten oder Kapitel angelegt.',
+    'books_empty_create_page' => 'Eine neue Seite erstellen',
     'books_empty_sort_current_book' => 'Aktuelles Buch sortieren',
-    'books_empty_add_chapter' => 'Neues Kapitel hinzufügen',
-    'books_permissions_active' => 'Buch-Berechtigungen aktiv',
-    'books_search_this' => 'Dieses Buch durchsuchen',
+    'books_empty_add_chapter' => 'Ein Kapitel hinzufügen',
+    'books_permissions_active' => 'Bücherberechtigungen aktiv',
+    'books_search_this' => 'In diesem Buch suchen',
     'books_navigation' => 'Buchnavigation',
-    'books_sort' => 'Buchinhalte sortieren',
-    'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt zu reorganisieren. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert. Optional kann eine automatische Sortierregel erstellt werden, um den Inhalt dieses Buches nach Änderungen automatisch zu sortieren.',
-    'books_sort_auto_sort' => 'Auto-Sortieroption',
+    'books_sort' => 'Buchinhalt sortieren',
+    'books_sort_desc' => 'Verschieben Sie Kapitel und Seiten innerhalb eines Buches, um dessen Inhalt neu zu ordnen. Es können weitere Bücher hinzugefügt werden, wodurch Kapitel und Seiten problemlos zwischen den Büchern verschoben werden können. Optional kann eine automatische Sortierregel festgelegt werden, um den Inhalt dieses Buches bei Änderungen automatisch zu sortieren.',
+    'books_sort_auto_sort' => 'Automatische Sortierfunktionsoption',
     'books_sort_auto_sort_active' => 'Automatische Sortierung aktiv: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Regeln für die automatische Sortierung können von einem Benutzer mit den entsprechenden Berechtigungen im Einstellungsbereich "Listen & Sortieren" erstellt werden.',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
     'books_sort_updated' => 'Sortieren nach Aktualisierungsdatum',
-    'books_sort_chapters_first' => 'Kapitel zuerst',
-    'books_sort_chapters_last' => 'Kapitel zuletzt',
+    'books_sort_chapters_first' => 'Erstes Kapitel zuerst',
+    'books_sort_chapters_last' => 'Letztes Kapitel zuletzt',
     'books_sort_show_other' => 'Andere Bücher anzeigen',
     'books_sort_save' => 'Neue Reihenfolge speichern',
-    'books_sort_show_other_desc' => 'Füge hier weitere Bücher hinzu, um sie in die Sortierung einzubinden und ermögliche so eine einfache und übergreifende Reorganisation.',
+    'books_sort_show_other_desc' => 'Fügen Sie hier weitere Bücher hinzu, um sie in die Sortierung einzubeziehen, und ermöglichen Sie so eine einfache Neuanordnung über mehrere Bücher hinweg.',
     'books_sort_move_up' => 'Nach oben bewegen',
     'books_sort_move_down' => 'Nach unten bewegen',
-    'books_sort_move_prev_book' => 'Zum vorherigen Buch verschieben',
-    'books_sort_move_next_book' => 'Zum nächsten Buch verschieben',
-    'books_sort_move_prev_chapter' => 'In das vorherige Kapitel verschieben',
-    'books_sort_move_next_chapter' => 'In nächstes Kapitel verschieben',
-    'books_sort_move_book_start' => 'Zum Buchbeginn verschieben',
-    'books_sort_move_book_end' => 'Zum Ende des Buches verschieben',
-    'books_sort_move_before_chapter' => 'Vor Kapitel verschieben',
-    'books_sort_move_after_chapter' => 'Nach Kapitel verschieben',
+    'books_sort_move_prev_book' => 'Zum vorherigen Buch wechseln',
+    'books_sort_move_next_book' => 'Zum nächsten Buch wechseln',
+    'books_sort_move_prev_chapter' => 'Zum vorherigen Kapitel wechseln',
+    'books_sort_move_next_chapter' => 'In das nächste Kapitel wechseln',
+    'books_sort_move_book_start' => 'Zum Anfang des Buches springen',
+    'books_sort_move_book_end' => 'Zum Ende des Buches springen',
+    'books_sort_move_before_chapter' => 'Zum vorherigen Kapitel springen',
+    'books_sort_move_after_chapter' => 'Weiter zum nächsten Kapitel',
     'books_copy' => 'Buch kopieren',
     'books_copy_success' => 'Das Buch wurde erfolgreich kopiert',
 
@@ -201,11 +202,11 @@
     'x_chapters' => ':count Kapitel',
     'chapters_popular' => 'Beliebte Kapitel',
     'chapters_new' => 'Neues Kapitel',
-    'chapters_create' => 'Neues Kapitel anlegen',
-    'chapters_delete' => 'Kapitel entfernen',
+    'chapters_create' => 'Neues Kapitel erstellen',
+    'chapters_delete' => 'Kapitel löschen',
     'chapters_delete_named' => 'Kapitel ":chapterName" entfernen',
-    'chapters_delete_explain' => 'Dies löscht das Kapitel mit dem Namen \':chapterName\'. Alle Seiten, die innerhalb dieses Kapitels existieren, werden ebenfalls gelöscht.',
-    'chapters_delete_confirm' => 'Sind Sie sicher, dass Sie dieses Kapitel löschen möchten?',
+    'chapters_delete_explain' => 'Dadurch wird das Kapitel mit dem Namen „:chapterName“ gelöscht. Alle Seiten, die zu diesem Kapitel gehören, werden ebenfalls gelöscht.',
+    'chapters_delete_confirm' => 'Möchtest du dieses Kapitel wirklich löschen?',
     'chapters_edit' => 'Kapitel bearbeiten',
     'chapters_edit_named' => 'Kapitel ":chapterName" bearbeiten',
     'chapters_save' => 'Kapitel speichern',
@@ -213,10 +214,10 @@
     'chapters_move_named' => 'Kapitel ":chapterName" verschieben',
     'chapters_copy' => 'Kapitel kopieren',
     'chapters_copy_success' => 'Kapitel erfolgreich kopiert',
-    'chapters_permissions' => 'Kapitel-Berechtigungen',
-    'chapters_empty' => 'Aktuell sind keine Kapitel diesem Buch hinzugefügt worden.',
-    'chapters_permissions_active' => 'Kapitel-Berechtigungen aktiv',
-    'chapters_permissions_success' => 'Kapitel-Berechtigungenen aktualisisert',
+    'chapters_permissions' => 'Kapitel Berechtigungen',
+    'chapters_empty' => 'Dieses Kapitel enthält derzeit keine Seiten.',
+    'chapters_permissions_active' => 'Kapitel Berechtigungen aktiv',
+    'chapters_permissions_success' => 'Kapitel Berechtigungen aktualisiert',
     'chapters_search_this' => 'Dieses Kapitel durchsuchen',
     'chapter_sort_book' => 'Buch sortieren',
 
@@ -230,22 +231,22 @@
     'pages_navigation' => 'Seitennavigation',
     'pages_delete' => 'Seite löschen',
     'pages_delete_named' => 'Seite ":pageName" löschen',
-    'pages_delete_draft_named' => 'Seitenentwurf von ":pageName" löschen',
-    'pages_delete_draft' => 'Seitenentwurf löschen',
+    'pages_delete_draft_named' => 'Entwurf von ":pageName" löschen',
+    'pages_delete_draft' => 'Entwurf löschen',
     'pages_delete_success' => 'Seite gelöscht',
-    'pages_delete_draft_success' => 'Seitenentwurf gelöscht',
-    'pages_delete_warning_template' => 'Diese Seite wird aktiv als Standardvorlage für Bücher oder Kapitel verwendet. In diesen Büchern oder Kapiteln wird nach dem Löschen dieser Seite keine Standardvorlage mehr zugewiesen sein.',
-    'pages_delete_confirm' => 'Sind Sie sicher, dass Sie diese Seite löschen möchen?',
-    'pages_delete_draft_confirm' => 'Sind Sie sicher, dass Sie diesen Seitenentwurf löschen möchten?',
+    'pages_delete_draft_success' => 'Entwurf der Seite gelöscht',
+    'pages_delete_warning_template' => 'Diese Seite wird derzeit als Standardvorlage für Bücher oder Kapitel verwendet. Nach dem Löschen dieser Seite wird diesen Büchern oder Kapiteln keine Standardvorlage mehr zugewiesen.',
+    'pages_delete_confirm' => 'Möchtest du diese Seite wirklich löschen?',
+    'pages_delete_draft_confirm' => 'Möchtest du diese Entwurfsseite wirklich löschen?',
     'pages_editing_named' => 'Seite ":pageName" bearbeiten',
     'pages_edit_draft_options' => 'Entwurfsoptionen',
     'pages_edit_save_draft' => 'Entwurf speichern',
     'pages_edit_draft' => 'Seitenentwurf bearbeiten',
-    'pages_editing_draft' => 'Seitenentwurf bearbeiten',
+    'pages_editing_draft' => 'Entwurf bearbeiten',
     'pages_editing_page' => 'Seite bearbeiten',
-    'pages_edit_draft_save_at' => 'Entwurf gesichert um ',
+    'pages_edit_draft_save_at' => 'Entwurf gespeichert unter ',
     'pages_edit_delete_draft' => 'Entwurf löschen',
-    'pages_edit_delete_draft_confirm' => 'Sind Sie sicher, dass Sie Ihren Entwurf löschen möchten? Alle Ihre Änderungen seit dem letzten vollständigen Speichern gehen verloren und der Editor wird mit dem letzten Speicherzustand aktualisiert, der kein Entwurf ist.',
+    'pages_edit_delete_draft_confirm' => 'Möchten Sie die Änderungen an Ihrem Seitenentwurf wirklich löschen? Alle Ihre Änderungen seit der letzten vollständigen Speicherung gehen verloren, und der Editor wird mit dem letzten gespeicherten Stand der Seite, ohne Entwurf, aktualisiert.',
     'pages_edit_discard_draft' => 'Entwurf verwerfen',
     'pages_edit_switch_to_markdown' => 'Zum Markdown-Editor wechseln',
     'pages_edit_switch_to_markdown_clean' => '(Gesäuberter Inhalt)',
@@ -254,18 +255,18 @@
     'pages_edit_switch_to_new_wysiwyg' => 'Zum neuen WYSIWYG wechseln',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(Im Beta-Test)',
     'pages_edit_set_changelog' => 'Änderungsprotokoll hinzufügen',
-    'pages_edit_enter_changelog_desc' => 'Bitte geben Sie eine kurze Zusammenfassung Ihrer Änderungen ein',
+    'pages_edit_enter_changelog_desc' => 'Geben Sie eine kurze Beschreibung der vorgenommenen Änderungen ein',
     'pages_edit_enter_changelog' => 'Änderungsprotokoll eingeben',
     'pages_editor_switch_title' => 'Editor wechseln',
-    'pages_editor_switch_are_you_sure' => 'Sind Sie sicher, dass Sie den Editor für diese Seite ändern möchten?',
-    'pages_editor_switch_consider_following' => 'Betrachten Sie folgendes beim Ändern von Editoren:',
-    'pages_editor_switch_consideration_a' => 'Einmal gespeichert, wird die neue Editoroption von zukünftigen Editoren verwendet, einschließlich derjenigen, die nicht in der Lage sind, den Editortyp selbst zu ändern.',
-    'pages_editor_switch_consideration_b' => 'Dies kann unter bestimmten Umständen zu einem Verlust von Details und Quellcode führen.',
-    'pages_editor_switch_consideration_c' => 'Änderungen des Tags oder Änderungsprotokolls, die seit dem letzten Speichern vorgenommen wurden, werden bei dieser Änderung nicht fortgesetzt.',
+    'pages_editor_switch_are_you_sure' => 'Möchtest du den Editor dieser Seite wirklich ändern?',
+    'pages_editor_switch_consider_following' => 'Beachten Sie beim Wechsel des Editors Folgendes:',
+    'pages_editor_switch_consideration_a' => 'Sobald die Einstellung gespeichert ist, wird die neue Editor-Option von allen zukünftigen Editoren verwendet, auch von solchen, die den Editor-Typ möglicherweise nicht selbst ändern können.',
+    'pages_editor_switch_consideration_b' => 'Dies kann unter bestimmten Umständen zu einem Verlust an Details und Syntax führen.',
+    'pages_editor_switch_consideration_c' => 'Änderungen an Tags oder im Änderungsprotokoll, die seit dem letzten Speichern vorgenommen wurden, bleiben bei dieser Änderung nicht erhalten.',
     'pages_save' => 'Seite speichern',
     'pages_title' => 'Seitentitel',
     'pages_name' => 'Seitenname',
-    'pages_md_editor' => 'Redakteur',
+    'pages_md_editor' => 'Editor',
     'pages_md_preview' => 'Vorschau',
     'pages_md_insert_image' => 'Bild einfügen',
     'pages_md_insert_link' => 'Link zu einem Objekt einfügen',
@@ -273,18 +274,18 @@
     'pages_md_show_preview' => 'Vorschau anzeigen',
     'pages_md_sync_scroll' => 'Vorschau synchronisieren',
     'pages_md_plain_editor' => 'Einfacher Editor',
-    'pages_drawing_unsaved' => 'Ungespeicherte Zeichnung gefunden',
-    'pages_drawing_unsaved_confirm' => 'Es wurden ungespeicherte Zeichnungsdaten von einem früheren, fehlgeschlagenen Versuch, die Zeichnung zu speichern, gefunden. Möchten Sie diese ungespeicherte Zeichnung wiederherstellen und weiter bearbeiten?',
-    'pages_not_in_chapter' => 'Seite ist in keinem Kapitel',
+    'pages_drawing_unsaved' => 'Nicht gespeicherte Zeichnung gefunden',
+    'pages_drawing_unsaved_confirm' => 'Es wurden nicht gespeicherte Zeichnungsdaten aus einem früheren fehlgeschlagenen Speichervorgang gefunden. Möchten Sie diese nicht gespeicherte Zeichnung wiederherstellen und weiter bearbeiten?',
+    'pages_not_in_chapter' => 'Die Seite gehört zu keinem Kapitel',
     'pages_move' => 'Seite verschieben',
     'pages_copy' => 'Seite kopieren',
-    'pages_copy_desination' => 'Ziel',
+    'pages_copy_desination' => 'Kopierziel',
     'pages_copy_success' => 'Seite erfolgreich kopiert',
     'pages_permissions' => 'Seiten Berechtigungen',
     'pages_permissions_success' => 'Seiten Berechtigungen aktualisiert',
-    'pages_revision' => 'Version',
-    'pages_revisions' => 'Seitenversionen',
-    'pages_revisions_desc' => 'Alle vorherhigen Revisionen dieser Seite sind unten aufgelistet. Sie können zurückschauen, vergleichen und alte Seitenversionen wiederherstellen, wenn die Berechtigungen dies erlauben. Der vollständige Verlauf der Seite kann hier möglicherweise nicht vollständig wiedergegeben werden, da je nach Systemkonfiguration alte Revisionen automatisch hätten gelöscht werden können.',
+    'pages_revision' => 'Überarbeitung',
+    'pages_revisions' => 'Seitenüberarbeitungen',
+    'pages_revisions_desc' => 'Nachfolgend sind alle bisherigen Überarbeitungen dieser Seite aufgeführt. Sofern Sie über die entsprechenden Berechtigungen verfügen, können Sie alte Seitenversionen einsehen, vergleichen und wiederherstellen. Möglicherweise ist der vollständige Verlauf der Seite hier nicht vollständig dargestellt, da alte Überarbeitungen je nach Systemkonfiguration automatisch gelöscht werden können.',
     'pages_revisions_named' => 'Seitenversionen von ":pageName"',
     'pages_revision_named' => 'Seitenversion von ":pageName"',
     'pages_revision_restored_from' => 'Wiederhergestellt von #:id; :summary',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Seitenleiste umschalten',
+    'page_contents' => 'Seiteninhalt',
+    'page_contents_none' => 'Es wurden keine Überschriften im Seiteninhalt gefunden.',
+    'page_contents_info' => 'Das Inhaltsmenü wird aus allen auf der Seite verwendeten Überschriften generiert.',
     'page_tags' => 'Seiten-Schlagwörter',
     'chapter_tags' => 'Kapitel-Schlagwörter',
     'book_tags' => 'Buch-Schlagwörter',
diff --git a/lang/de/errors.php b/lang/de/errors.php
index c1f65d94006..ee5071f8578 100644
--- a/lang/de/errors.php
+++ b/lang/de/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
     'import_zip_cant_decode_data' => 'ZIP data.json konnte nicht gefunden und dekodiert werden.',
     'import_zip_no_data' => 'ZIP-Datei Daten haben kein erwartetes Buch, Kapitel oder Seiteninhalt.',
+    'import_zip_data_too_large' => 'Der Inhalt der ZIP data.json überschreitet die maximale Dateigröße der Anwendung.',
     'import_validation_failed' => 'ZIP Import konnte mit Fehlern nicht validiert werden:',
     'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
     'import_perms_books' => 'Ihnen fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Das Kennwort für das angegebene API-Token ist falsch',
     'api_user_no_api_permission' => 'Der Besitzer des verwendeten API-Tokens hat keine Berechtigung für API-Aufrufe',
     'api_user_token_expired' => 'Das verwendete Autorisierungstoken ist abgelaufen',
+    'api_cookie_auth_only_get' => 'Nur GET Anfragen sind erlaubt, wenn die API mit Cookie-basierter Authentifizierung verwendet wird',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Fehler beim Versenden einer Test E-Mail:',
diff --git a/lang/de/notifications.php b/lang/de/notifications.php
index f3b86b5023a..cd8f4c87418 100644
--- a/lang/de/notifications.php
+++ b/lang/de/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Aktualisierte Seite: :pageName',
     'updated_page_intro' => 'Eine Seite wurde in :appName aktualisiert:',
     'updated_page_debounce' => 'Um eine Flut von Benachrichtigungen zu vermeiden, werden Sie für eine gewisse Zeit keine Benachrichtigungen für weitere Bearbeitungen dieser Seite durch denselben Bearbeiter erhalten.',
+    'comment_mention_subject' => 'Sie wurden in einem Kommentar auf der Seite :pageName erwähnt',
+    'comment_mention_intro' => 'Sie wurden in einem Kommentar zu :appName: erwähnt',
 
     'detail_page_name' => 'Name der Seite:',
     'detail_page_path' => 'Seitenpfad:',
diff --git a/lang/de/preferences.php b/lang/de/preferences.php
index 26f0b05dacc..71bf68c670a 100644
--- a/lang/de/preferences.php
+++ b/lang/de/preferences.php
@@ -7,22 +7,44 @@
 return [
     'my_account' => 'Mein Account',
 
-    'shortcuts' => 'Tastenkürzel',
-    'shortcuts_interface' => 'Einstellungen zu UI Abkürzungen',
-    'shortcuts_toggle_desc' => 'Hier können Sie Tastaturkürzel für die Systemoberfläche für Navigation und Aktionen aktivieren oder deaktivieren.',
-    'shortcuts_customize_desc' => 'Unten können Sie alle Tastenkürzel anpassen. Drücken Sie einfach die gewünschte Tastenkombination, nachdem Sie die Eingabe für eine Tastenkombination ausgewählt haben.',
-    'shortcuts_toggle_label' => 'Tastaturkürzel aktiviert',
+    'shortcuts' => 'Tastenkombinationen',
+    'shortcuts_interface' => 'Einstellungen für UI-Tastenkombinationen',
+    'shortcuts_toggle_desc' => 'Hier können Sie die Tastenkombinationen der Systemoberfläche für Navigation und Aktionen aktivieren oder deaktivieren.',
+    'shortcuts_customize_desc' => 'Unten können Sie alle Tastenkombinationen anpassen. Drücken Sie einfach die gewünschte Tastenkombination, nachdem Sie die Eingabe für eine Tastenkombination ausgewählt haben.',
+    'shortcuts_toggle_label' => 'Tastenkombinationen aktiviert',
     'shortcuts_section_navigation' => 'Navigation',
     'shortcuts_section_actions' => 'Häufige Aktionen',
-    'shortcuts_save' => 'Tastenkürzel speichern',
-    'shortcuts_overlay_desc' => 'Hinweis: Wenn Tastenkürzel aktiviert sind, ist ein Hilfsoverlay durch Drücken von "?" verfügbar, welches die verfügbaren Tastenkürzel für Aktionen hervorhebt, die aktuell auf dem Bildschirm sichtbar sind.',
+    'shortcuts_save' => 'Tastenkombinationen speichern',
+    'shortcuts_overlay_desc' => 'Hinweis: Wenn Tastenkombinationen aktiviert sind, ist ein Hilfsoverlay durch Drücken von "?" verfügbar, welches die verfügbaren Tastenkombinationen für Aktionen hervorhebt, die aktuell auf dem Bildschirm sichtbar sind.',
     'shortcuts_update_success' => 'Tastenkürzel Einstellungen wurden aktualisiert!',
     'shortcuts_overview_desc' => 'Verwalten von Tastenkombinationen, die zur Navigation der Benutzeroberfläche verwendet werden können.',
 
+    'interface' => 'Oberflächeneinstellungen',
+    'interface_desc' => 'Hier können Sie das Erscheinungsbild der Benutzeroberfläche anpassen.',
+    'interface_display_mode' => 'Anzeigemodus',
+    'interface_display_mode_desc' => 'Wählen Sie, ob die Anwendung im dunklen oder hellen Modus angezeigt werden soll. Dies kann auch in der Startansicht oder über das Profil-Dropdown in der Kopfleiste geändert werden.',
+    'layouts' => 'Layout-Einstellungen',
+    'layouts_desc' => 'Passen Sie das Layout der in der Benutzeroberfläche angezeigten Bereiche für verschiedene Ansichten an.',
+    'layout_edit' => 'Layout bearbeiten',
+    'layout_edit_desc' => 'Ziehen Sie Bereiche per Drag-and-drop oder verwenden Sie das Aktionsmenü des jeweiligen Bereichs, um festzulegen, welche Bereiche in diesem Layout angezeigt werden und wo sie in der Benutzeroberfläche platziert sind.',
+    'layout_edit_column_hint' => 'Bei kleineren Bildschirmgrößen werden die Bereiche in der rechten Spalte über den Bereichen in der linken Spalte angeordnet.',
+    'layout_edit_save' => 'Layout speichern',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Zurück zu den Einstellungen',
+    'layout_edit_left' => 'Links',
+    'layout_edit_right' => 'Rechts',
+    'layout_edit_center' => 'Mitte',
+    'layout_edit_unused' => 'Nicht verwendet',
+    'layout_edit_empty' => 'Keine Bereiche zum Anzeigen',
+    'layout_edit_reset_to_defaults' => 'Auf Standard zurücksetzen',
+    'layout_update_success' => 'Die Layout-Einstellungen wurden aktualisiert!',
+    'layout_reset_success' => 'Die Layout-Einstellungen wurden zurückgesetzt!',
+
     'notifications' => 'Benachrichtigungseinstellungen',
     'notifications_desc' => 'Legen Sie fest, welche E-Mail-Benachrichtigungen Sie erhalten, wenn bestimmte Aktivitäten im System durchgeführt werden.',
     'notifications_opt_own_page_changes' => 'Benachrichtigung bei Änderungen an eigenen Seiten',
     'notifications_opt_own_page_comments' => 'Benachrichtigung bei Kommentaren an eigenen Seiten',
+    'notifications_opt_comment_mentions' => 'Bei Erwähnung mich benachrichtigen',
     'notifications_opt_comment_replies' => 'Bei Antworten auf meine Kommentare benachrichtigen',
     'notifications_save' => 'Einstellungen speichern',
     'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 250668e8a78..ecff3f3289f 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -17,141 +17,142 @@
     'app_features_security' => 'Funktionen & Sicherheit',
     'app_name' => 'Anwendungsname',
     'app_name_desc' => 'Dieser Name wird im Header und in E-Mails angezeigt.',
-    'app_name_header' => 'Anwendungsname im Header anzeigen?',
+    'app_name_header' => 'Namen in der Kopfzeile anzeigen',
     'app_public_access' => 'Öffentlicher Zugriff',
-    'app_public_access_desc' => 'Wenn Sie diese Option aktivieren, können Besucher, die nicht angemeldet sind, auf Inhalte in Ihrer BookStack-Instanz zugreifen.',
-    'app_public_access_desc_guest' => 'Der Zugang für öffentliche Besucher kann über den Benutzer "Guest" gesteuert werden.',
-    'app_public_access_toggle' => 'Öffentlichen Zugriff erlauben',
-    'app_public_viewing' => 'Öffentliche Ansicht erlauben?',
-    'app_secure_images' => 'Erhöhte Sicherheit für hochgeladene Bilder aktivieren?',
+    'app_public_access_desc' => 'Wenn Sie diese Option aktivieren, können Besucher, die nicht angemeldet sind, auf Inhalte in Ihrer BookStack Instanz zugreifen.',
+    'app_public_access_desc_guest' => 'Der Zugang für externe Besucher kann über den Benutzer „Gast“ geregelt werden.',
+    'app_public_access_toggle' => 'Öffentlichen Zugriff gewähren',
+    'app_public_viewing' => 'Öffentlich zugänglich machen?',
+    'app_secure_images' => 'Sichereres Hochladen von Bildern',
     'app_secure_images_toggle' => 'Höhere Sicherheit für Bild-Uploads aktivieren',
-    'app_secure_images_desc' => 'Aus Leistungsgründen sind alle Bilder öffentlich sichtbar. Diese Option fügt zufällige, schwer zu erratende, Zeichenketten zu Bild-URLs hinzu. Stellen Sie sicher, dass Verzeichnisindizes deaktiviert sind, um einen einfachen Zugriff zu verhindern.',
+    'app_secure_images_desc' => 'Aus Leistungsgründen sind alle Bilder öffentlich zugänglich. Diese Option fügt den Bild-URLs eine zufällige, schwer zu erratende Zeichenfolge vor. Stellen Sie sicher, dass Verzeichnisverzeichnisse nicht aktiviert sind, um einen einfachen Zugriff zu verhindern.',
     'app_default_editor' => 'Standard-Seiten-Editor',
-    'app_default_editor_desc' => 'Wählen Sie aus, welcher Editor standardmäßig beim Bearbeiten neuer Seiten verwendet wird. Dies kann auf einer Seitenebene überschrieben werden, wenn es die Berechtigungen erlauben.',
+    'app_default_editor_desc' => 'Wählen Sie aus, welcher Editor standardmäßig beim Bearbeiten neuer Seiten verwendet werden soll. Diese Einstellung kann auf Seitenebene überschrieben werden, sofern die Berechtigungen dies zulassen.',
     'app_custom_html' => 'Benutzerdefinierter HTML-Head-Inhalt',
-    'app_custom_html_desc' => 'Jeder Inhalt, der hier hinzugefügt wird, wird am Ende der <head>-Sektion jeder Seite eingefügt. Diese kann praktisch sein, um CSS-Styles anzupassen oder Analytics-Code hinzuzufügen.',
-    'app_custom_html_disabled_notice' => 'Benutzerdefinierte HTML-Kopfzeileninhalte sind auf dieser Einstellungsseite deaktiviert, um sicherzustellen, dass alle Änderungen rückgängig gemacht werden können.',
+    'app_custom_html_desc' => 'Alle hier hinzugefügten Inhalte werden am Ende des <head>-Abschnitts jeder Seite eingefügt. Dies ist nützlich, um Stile zu überschreiben oder Analysecodes hinzuzufügen.',
+    'app_custom_html_disabled_notice' => 'Auf dieser Einstellungsseite ist der benutzerdefinierte HTML-Head-Inhalt deaktiviert, um sicherzustellen, dass etwaige grundlegende Änderungen rückgängig gemacht werden können.',
     'app_logo' => 'Anwendungslogo',
-    'app_logo_desc' => 'Dies wird unter anderem in der Kopfzeile der Anwendung verwendet. Dieses Bild sollte 86px hoch sein. Große Bilder werden herunterskaliert.',
+    'app_logo_desc' => 'Dieses Bild wird unter anderem in der Kopfzeile der Anwendung verwendet. Es sollte eine Höhe von 86 Pixel haben. Größere Bilder werden verkleinert.',
     'app_icon' => 'Anwendungssymbol',
-    'app_icon_desc' => 'Dieses Symbol wird für Browser-Registerkarten und Verknüpfungssymbole verwendet. Dies sollte ein 256px quadratisches PNG-Bild sein.',
+    'app_icon_desc' => 'Dieses Symbol wird für Browser-Registerkarten und Verknüpfungssymbole verwendet. Es sollte sich um ein quadratisches PNG-Bild mit einer Größe von 256 px handeln.',
     'app_homepage' => 'Startseite der Anwendung',
-    'app_homepage_desc' => 'Wählen Sie eine Seite als Startseite aus, die statt der Standardansicht angezeigt werden soll. Seitenberechtigungen werden für die ausgewählten Seiten ignoriert.',
+    'app_homepage_desc' => 'Wählen Sie eine Ansicht aus, die anstelle der Standardansicht auf der Startseite angezeigt werden soll. Seitenberechtigungen werden für ausgewählte Seiten ignoriert.',
     'app_homepage_select' => 'Wählen Sie eine Seite aus',
-    'app_footer_links' => 'Fußzeilen-Links',
-    'app_footer_links_desc' => 'Fügen Sie Links hinzu, die innerhalb der Seitenfußzeile angezeigt werden. Diese werden am unteren Ende der meisten Seiten angezeigt, einschließlich derjenigen, die keine Anmeldung benötigen. Sie können die Bezeichnung "trans::<key>" verwenden, um systemdefinierte Übersetzungen zu verwenden. Beispiel: Mit "trans::common.privacy_policy" wird der übersetzte Text "Privacy Policy" bereitgestellt und "trans::common.terms_of_service" liefert den übersetzten Text "Terms of Service".',
+    'app_footer_links' => 'Links in der Fußzeile',
+    'app_footer_links_desc' => 'Fügen Sie Links hinzu, die in der Fußzeile der Website angezeigt werden sollen. Diese werden am Ende der meisten Seiten angezeigt, auch auf solchen, für die keine Anmeldung erforderlich ist. Sie können die Bezeichnung „trans::<key>“ verwenden, um vom System definierte Übersetzungen zu nutzen. Beispiel: Die Verwendung von „trans::common.privacy_policy“ liefert den übersetzten Text „Datenschutzerklärung“ und „trans::common.terms_of_service“ liefert den übersetzten Text „Nutzungsbedingungen“.',
     'app_footer_links_label' => 'Link-Label',
     'app_footer_links_url' => 'Link-URL',
     'app_footer_links_add' => 'Fußzeilen-Link hinzufügen',
     'app_disable_comments' => 'Kommentare deaktivieren',
     'app_disable_comments_toggle' => 'Kommentare deaktivieren',
-    'app_disable_comments_desc' => 'Deaktiviert Kommentare über alle Seiten in der Anwendung. Vorhandene Kommentare werden nicht angezeigt.',
+    'app_disable_comments_desc' => 'Deaktiviert Kommentare auf allen Seiten der Anwendung. Bereits vorhandene Kommentare werden nicht angezeigt.',
 
     // Color settings
     'color_scheme' => 'Farbschema der Anwendung',
     'color_scheme_desc' => 'Lege die Farben, die in der Benutzeroberfläche verwendet werden, fest. Farben können separat für dunkle und helle Modi konfiguriert werden, um am besten zum Farbschema zu passen und die Lesbarkeit zu gewährleisten.',
-    'ui_colors_desc' => 'Lege die primäre Farbe und die Standard-Linkfarbe der Anwendung fest. Die primäre Farbe wird hauptsächlich für Kopfzeilen, Buttons und Interface-Dekorationen verwendet. Die Standard-Linkfarbe wird für textbasierte Links und Aktionen sowohl innerhalb des geschriebenen Inhalts als auch in der Benutzeroberfläche verwendet.',
+    'ui_colors_desc' => 'Legen Sie die Hauptfarbe der Anwendung und die Standardfarbe für Links fest. Die Hauptfarbe wird hauptsächlich für das Kopfzeilenbanner, Schaltflächen und Elemente zur Gestaltung der Benutzeroberfläche verwendet. Die Standardfarbe für Links wird für textbasierte Links und Aktionen verwendet, sowohl innerhalb von Textinhalten als auch in der Benutzeroberfläche der Anwendung.',
     'app_color' => 'Primäre Farbe',
-    'link_color' => 'Standard-Linkfarbe',
+    'link_color' => 'Standardfarbe für Links',
     'content_colors_desc' => 'Legt Farben für alle Elemente in der Seitenorganisationshierarchie fest. Die Auswahl von Farben mit einer ähnlichen Helligkeit wie die Standardfarben wird zur Lesbarkeit empfohlen.',
-    'bookshelf_color' => 'Regalfarbe',
+    'bookshelf_color' => 'Farbe des Regals',
     'book_color' => 'Buchfarbe',
-    'chapter_color' => 'Kapitelfarbe',
+    'chapter_color' => 'Kapitel-Farbe',
     'page_color' => 'Seitenfarbe',
-    'page_draft_color' => 'Seitenentwurfsfarbe',
+    'page_draft_color' => 'Farbe des Seitenentwurfs',
 
     // Registration Settings
-    'reg_settings' => 'Registrierungseinstellungen',
+    'reg_settings' => 'Registrierung',
     'reg_enable' => 'Registrierung erlauben',
     'reg_enable_toggle' => 'Registrierung erlauben',
-    'reg_enable_desc' => 'Wenn die Registrierung erlaubt ist, kann sich der Benutzer als Anwendungsbenutzer anmelden. Bei der Registrierung erhält er eine einzige, voreingestellte Benutzerrolle.',
-    'reg_default_role' => 'Standard-Benutzerrolle nach Registrierung',
-    'reg_enable_external_warning' => 'Die obige Option wird ignoriert, während eine externe LDAP oder SAML Authentifizierung aktiv ist. Benutzerkonten für nicht existierende Mitglieder werden automatisch erzeugt, wenn die Authentifizierung gegen das verwendete externe System erfolgreich ist.',
-    'reg_email_confirmation' => 'Bestätigung per E-Mail',
-    'reg_email_confirmation_toggle' => 'Bestätigung per E-Mail erforderlich',
+    'reg_enable_desc' => 'Wenn die Registrierung aktiviert ist, können sich Benutzer als Anwendungsbenutzer registrieren. Bei der Registrierung erhalten sie eine einzige Standardbenutzerrolle.',
+    'reg_default_role' => 'Standardbenutzerrolle nach der Registrierung',
+    'reg_enable_external_warning' => 'Die oben genannte Option wird ignoriert, solange die externe LDAP oder SAML Authentifizierung aktiv ist. Benutzerkonten für nicht vorhandene Mitglieder werden automatisch angelegt, wenn die Authentifizierung gegenüber dem verwendeten externen System erfolgreich ist.',
+    'reg_email_confirmation' => 'E-Mail-Bestätigung',
+    'reg_email_confirmation_toggle' => 'E-Mail-Bestätigung erforderlich',
     'reg_confirm_email_desc' => 'Falls die Einschränkung für Domains genutzt wird, ist die Bestätigung per E-Mail zwingend erforderlich und der untenstehende Wert wird ignoriert.',
     'reg_confirm_restrict_domain' => 'Registrierung auf bestimmte Domains einschränken',
-    'reg_confirm_restrict_domain_desc' => 'Fügen Sie eine durch Komma getrennte Liste von Domains hinzu, auf die die Registrierung eingeschränkt werden soll. Benutzern wird eine E-Mail gesendet, um ihre E-Mail-Adresse zu bestätigen, bevor diese die Anwendung nutzen können.
-Hinweis: Benutzer können ihre E-Mail-Adresse nach erfolgreicher Registrierung ändern.',
+    'reg_confirm_restrict_domain_desc' => 'Geben Sie eine durch Kommas getrennte Liste der E-Mail-Domains ein, auf die Sie die Registrierung beschränken möchten. Die Nutzer erhalten eine E-Mail zur Bestätigung ihrer Adresse, bevor sie die Anwendung nutzen dürfen. Beachten Sie, dass die Nutzer ihre E-Mail-Adressen nach erfolgreicher Registrierung ändern können.',
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
     // Sorting Settings
-    'sorting' => 'Sortierung',
-    'sorting_book_default' => 'Standard-Buchsortierung',
+    'sorting' => 'Listen & Sortieren',
+    'sorting_book_default' => 'Standardregel für die Sortierung von Büchern',
     'sorting_book_default_desc' => 'Wählen Sie die Standard-Sortierregel aus, die auf neue Bücher angewendet werden soll. Dies wirkt sich nicht auf bestehende Bücher aus und kann pro Buch überschrieben werden.',
     'sorting_rules' => 'Sortierregeln',
     'sorting_rules_desc' => 'Dies sind vordefinierte Sortieraktionen, die auf Inhalte im System angewendet werden können.',
-    'sort_rule_assigned_to_x_books' => ':count Buch zugewiesen|:count Büchern zugewiesen',
+    'sort_rule_assigned_to_x_books' => 'Zugewiesen an: :count Buch|zugewiesen an: :count Bücher',
     'sort_rule_create' => 'Sortierregel erstellen',
     'sort_rule_edit' => 'Sortierregel bearbeiten',
     'sort_rule_delete' => 'Sortierregel löschen',
     'sort_rule_delete_desc' => 'Diese Sortierregel aus dem System entfernen. Bücher mit dieser Sortierung werden auf manuelle Sortierung zurückgesetzt.',
-    'sort_rule_delete_warn_books' => 'Diese Sortierregel wird derzeit in :count Bücher(n) verwendet. Sind Sie sicher, dass Sie dies löschen möchten?',
-    'sort_rule_delete_warn_default' => 'Diese Sortierregel wird derzeit als Standard für Bücher verwendet. Sind Sie sicher, dass Sie dies löschen möchten?',
+    'sort_rule_delete_warn_books' => 'Diese Sortierregel wird derzeit auf :count Bücher angewendet. Möchten Sie diese wirklich löschen?',
+    'sort_rule_delete_warn_default' => 'Diese Sortierregel wird derzeit Standard mäßig für Bücher verwendet. Möchten Sie sie wirklich löschen?',
     'sort_rule_details' => 'Sortierregel-Details',
-    'sort_rule_details_desc' => 'Legen Sie einen Namen für diese Sortierregel fest, der in Listen erscheint, wenn Benutzer eine Sortierung auswählen.',
-    'sort_rule_operations' => 'Sortierungs-Aktionen',
-    'sort_rule_operations_desc' => 'Konfigurieren Sie die durchzuführenden Sortieraktionen durch Verschieben von der Liste der verfügbaren Aktionen. Bei der Verwendung werden die Aktionen von oben nach unten angewendet. Alle hier vorgenommenen Änderungen werden beim Speichern auf alle zugewiesenen Bücher angewendet.',
-    'sort_rule_available_operations' => 'Verfügbare Aktionen',
-    'sort_rule_available_operations_empty' => 'Keine verbleibenden Aktionen',
-    'sort_rule_configured_operations' => 'Konfigurierte Aktionen',
-    'sort_rule_configured_operations_empty' => 'Aktionen aus der Liste "Verfügbare Operationen" ziehen/hinzufügen',
-    'sort_rule_op_asc' => '(Aufst.)',
-    'sort_rule_op_desc' => '(Abst.)',
+    'sort_rule_details_desc' => 'Geben Sie einen Namen für diese Sortierregel ein, der in Listen angezeigt wird, wenn der Benutzer eine Sortieroption auswählt.',
+    'sort_rule_operations' => 'Sortiervorgänge',
+    'sort_rule_operations_desc' => 'Konfigurieren Sie die auszuführenden Sortieraktionen, indem Sie sie aus der Liste der verfügbaren Vorgänge verschieben. Bei der Ausführung werden die Vorgänge der Reihe nach von oben nach unten angewendet. Alle hier vorgenommenen Änderungen werden beim Speichern auf alle zugewiesenen Bücher angewendet.',
+    'sort_rule_available_operations' => 'Verfügbare Funktionen',
+    'sort_rule_available_operations_empty' => 'Es sind keine Vorgänge mehr vorhanden',
+    'sort_rule_configured_operations' => 'Konfigurierte Vorgänge',
+    'sort_rule_configured_operations_empty' => 'Vorgänge aus der Liste „Verfügbare Vorgänge“ per Drag-and-drop hinzufügen',
+    'sort_rule_op_asc' => '(Aufsteigend)',
+    'sort_rule_op_desc' => '(Absteigend)',
     'sort_rule_op_name' => 'Name - Alphabetisch',
     'sort_rule_op_name_numeric' => 'Name - Numerisch',
     'sort_rule_op_created_date' => 'Erstellungsdatum',
     'sort_rule_op_updated_date' => 'Aktualisierungsdatum',
     'sort_rule_op_chapters_first' => 'Kapitel zuerst',
     'sort_rule_op_chapters_last' => 'Kapitel zuletzt',
+    'sorting_page_limits' => 'Anzeigebegrenzungen pro Seite',
+    'sorting_page_limits_desc' => 'Legen Sie fest, wie viele Elemente pro Seite in den verschiedenen Listen des Systems angezeigt werden sollen. In der Regel ist eine geringere Anzahl leistungsfähiger, während eine höhere Anzahl das Blättern durch mehrere Seiten überflüssig macht. Es wird empfohlen, ein Vielfaches von 6 zu verwenden.',
 
     // Maintenance settings
     'maint' => 'Wartung',
     'maint_image_cleanup' => 'Bilder bereinigen',
-    'maint_image_cleanup_desc' => 'Überprüft Seiten- und Versionsinhalte auf ungenutzte und mehrfach vorhandene Bilder. Erstellen Sie vor dem Start ein Backup Ihrer Datenbank und Bilder.',
-    'maint_delete_images_only_in_revisions' => 'Lösche auch Bilder, die nur in alten Seitenüberarbeitungen vorhanden sind',
+    'maint_image_cleanup_desc' => 'Überprüft den Inhalt der Seiten und Versionen, um festzustellen, welche Bilder und Zeichnungen derzeit verwendet werden und welche Bilder überflüssig sind. Stellen Sie sicher, dass Sie vor der Ausführung eine vollständige Sicherung der Datenbank und der Bilder erstellen.',
+    'maint_delete_images_only_in_revisions' => 'Lösche auch Bilder, die nur in alten Seitenversionen vorhanden sind',
     'maint_image_cleanup_run' => 'Reinigung starten',
-    'maint_image_cleanup_warning' => ':count eventuell unbenutze Bilder wurden gefunden. Möchten Sie diese Bilder löschen?',
-    'maint_image_cleanup_success' => ':count eventuell unbenutze Bilder wurden gefunden und gelöscht.',
-    'maint_image_cleanup_nothing_found' => 'Keine unbenutzen Bilder gefunden. Nichts zu löschen!',
-    'maint_send_test_email' => 'Eine Test-E-Mail versenden',
-    'maint_send_test_email_desc' => 'Dies sendet eine Test-E-Mail an Ihre in Ihrem Profil angegebene E-Mail-Adresse.',
+    'maint_image_cleanup_warning' => 'Es wurden :count möglicherweise nicht mehr benötigte Bilder gefunden. Möchten Sie diese Bilder wirklich löschen?',
+    'maint_image_cleanup_success' => ':count möglicherweise nicht verwendete Bilder wurden gefunden und gelöscht!',
+    'maint_image_cleanup_nothing_found' => 'Es wurden keine ungenutzten Bilder gefunden, nichts wurde gelöscht!',
+    'maint_send_test_email' => 'Test-E-Mail senden',
+    'maint_send_test_email_desc' => 'Dadurch wird eine Test-E-Mail an die in Ihrem Profil angegebene E-Mail-Adresse gesendet.',
     'maint_send_test_email_run' => 'Test-E-Mail senden',
-    'maint_send_test_email_success' => 'E-Mail wurde an :address gesendet',
+    'maint_send_test_email_success' => 'E-Mail gesendet an :address',
     'maint_send_test_email_mail_subject' => 'Test-E-Mail',
-    'maint_send_test_email_mail_greeting' => 'E-Mail-Versand scheint zu funktionieren!',
-    'maint_send_test_email_mail_text' => 'Glückwunsch! Da Sie diese E-Mail Benachrichtigung erhalten haben, scheinen Ihre E-Mail-Einstellungen korrekt konfiguriert zu sein.',
-    'maint_recycle_bin_desc' => 'Gelöschte Regale, Bücher, Kapitel & Seiten werden in den Papierkorb verschoben, so dass sie wiederhergestellt oder dauerhaft gelöscht werden können. Ältere Gegenstände im Papierkorb können, in Abhängigkeit von der Systemkonfiguration, nach einer Weile automatisch entfernt werden.',
+    'maint_send_test_email_mail_greeting' => 'Die E-Mail-Zustellung scheint zu funktionieren!',
+    'maint_send_test_email_mail_text' => 'Herzlichen Glückwunsch! Da Sie diese E-Mail-Benachrichtigung erhalten haben, scheinen Ihre E-Mail-Einstellungen korrekt konfiguriert zu sein.',
+    'maint_recycle_bin_desc' => 'Gelöschte Regale, Bücher, Kapitel und Seiten werden in den Papierkorb verschoben, sodass sie wiederhergestellt oder endgültig gelöscht werden können. Ältere Elemente im Papierkorb werden je nach Systemkonfiguration nach einer gewissen Zeit möglicherweise automatisch entfernt.',
     'maint_recycle_bin_open' => 'Papierkorb öffnen',
     'maint_regen_references' => 'Referenzen neu generieren',
-    'maint_regen_references_desc' => 'Diese Aktion wird den Referenzindex innerhalb der Datenbank neu erstellen. Dies wird normalerweise automatisch ausgeführt, aber diese Aktion kann nützlich sein, um alte Inhalte oder Inhalte zu indizieren, die mittels inoffizieller Methoden hinzugefügt wurden.',
-    'maint_regen_references_success' => 'Referenz-Index wurde neu generiert!',
-    'maint_timeout_command_note' => 'Hinweis: Die Ausführung dieser Aktion kann einige Zeit in Anspruch nehmen, was in einigen Webumgebungen zu Timeout-Problemen führen kann. Alternativ kann diese Aktion auch mit einem Terminalbefehl ausgeführt werden.',
+    'maint_regen_references_desc' => 'Diese Aktion erstellt den Index für die Querverweise innerhalb der Datenbank neu. Dies geschieht normalerweise automatisch, doch diese Aktion kann nützlich sein, um ältere Inhalte oder Inhalte, die über inoffizielle Methoden hinzugefügt wurden, zu indizieren.',
+    'maint_regen_references_success' => 'Der Referenzindex wurde neu generiert!',
+    'maint_timeout_command_note' => 'Hinweis: Die Ausführung dieser Aktion kann einige Zeit in Anspruch nehmen, was in manchen Webumgebungen zu Zeitüberschreitungsfehlern führen kann. Alternativ kann diese Aktion über einen Terminal Befehl ausgeführt werden.',
 
     // Recycle Bin
     'recycle_bin' => 'Papierkorb',
-    'recycle_bin_desc' => 'Hier können Sie gelöschte Elemente wiederherstellen oder sie dauerhaft aus dem System entfernen. Diese Liste ist nicht gefiltert, im Gegensatz zu ähnlichen Aktivitätslisten im System, wo Berechtigungsfilter angewendet werden.',
-    'recycle_bin_deleted_item' => 'Gelöschtes Element',
+    'recycle_bin_desc' => 'Hier können Sie gelöschte Elemente wiederherstellen oder sie endgültig aus dem System entfernen. Diese Liste ist ungefiltert, im Gegensatz zu ähnlichen Aktivitätslisten im System, bei denen Berechtigungsfilter angewendet werden.',
+    'recycle_bin_deleted_item' => 'Gelöschter Eintrag',
     'recycle_bin_deleted_parent' => 'Übergeordnet',
     'recycle_bin_deleted_by' => 'Gelöscht von',
     'recycle_bin_deleted_at' => 'Löschzeitpunkt',
-    'recycle_bin_permanently_delete' => 'Dauerhaft löschen',
+    'recycle_bin_permanently_delete' => 'Endgültig löschen',
     'recycle_bin_restore' => 'Wiederherstellen',
     'recycle_bin_contents_empty' => 'Der Papierkorb ist derzeit leer',
     'recycle_bin_empty' => 'Papierkorb leeren',
-    'recycle_bin_empty_confirm' => 'Dies wird alle Gegenstände im Papierkorb dauerhaft entfernen, einschließlich der Inhalte, die darin enthalten sind. Sind Sie sicher, dass Sie den Papierkorb leeren möchten?',
-    'recycle_bin_destroy_confirm' => 'Diese Aktion löscht dieses Element dauerhaft aus dem System, zusammen mit allen unten aufgeführten untergeordneten Elementen, und es ist nicht möglich, diesen Inhalt wiederherzustellen. Sind Sie sicher, dass Sie dieses Element dauerhaft löschen möchten?',
+    'recycle_bin_empty_confirm' => 'Dadurch werden alle Elemente im Papierkorb sowie deren Inhalte endgültig gelöscht. Möchten Sie den Papierkorb wirklich leeren?',
+    'recycle_bin_destroy_confirm' => 'Durch diesen Vorgang wird dieses Element zusammen mit allen unten aufgeführten untergeordneten Elementen endgültig aus dem System gelöscht, und Sie können diesen Inhalt nicht wiederherstellen. Möchten Sie dieses Element wirklich endgültig löschen?',
     'recycle_bin_destroy_list' => 'Zu löschende Elemente',
     'recycle_bin_restore_list' => 'Zu wiederherzustellende Elemente',
-    'recycle_bin_restore_confirm' => 'Mit dieser Aktion wird das gelöschte Element einschließlich aller untergeordneten Elemente an seinen ursprünglichen Ort wiederherstellen. Wenn der ursprüngliche Ort gelöscht wurde und sich nun im Papierkorb befindet, muss auch das übergeordnete Element wiederhergestellt werden.',
-    'recycle_bin_restore_deleted_parent' => 'Das übergeordnete Elements wurde ebenfalls gelöscht. Dieses Element wird weiterhin als gelöscht zählen, bis auch das übergeordnete Element wiederhergestellt wurde.',
+    'recycle_bin_restore_confirm' => 'Durch diese Aktion wird das gelöschte Element einschließlich aller untergeordneten Elemente an seinem ursprünglichen Speicherort wiederhergestellt. Sollte der ursprüngliche Speicherort inzwischen gelöscht worden sein und sich nun im Papierkorb befinden, muss auch das übergeordnete Element wiederhergestellt werden.',
+    'recycle_bin_restore_deleted_parent' => 'Das übergeordnete Element dieses Eintrags wurde ebenfalls gelöscht. Diese Einträge bleiben gelöscht, bis auch das übergeordnete Element wiederhergestellt wird.',
     'recycle_bin_restore_parent' => 'Übergeordneter Eintrag wiederherstellen',
-    'recycle_bin_destroy_notification' => ':count Elemente wurden aus dem Papierkorb gelöscht.',
-    'recycle_bin_restore_notification' => ':count Elemente wurden aus dem Papierkorb wiederhergestellt.',
+    'recycle_bin_destroy_notification' => ':count Elemente aus dem Papierkorb gelöscht.',
+    'recycle_bin_restore_notification' => 'Es wurden :count der Elemente aus dem Papierkorb wiederhergestellt.',
 
     // Audit Log
-    'audit' => 'Audit-Protokoll',
-    'audit_desc' => 'Dieses Audit-Protokoll zeigt eine Liste der Aktivitäten an, welche vom System protokolliert werden. Im Gegensatz zu den anderen Aktivitätslisten im System, bei denen Berechtigungen angewendet werden, ist diese Liste ungefiltert.',
+    'audit' => 'Prüfprotokoll',
+    'audit_desc' => 'Dieses Protokoll zeigt eine Liste der im System erfassten Aktivitäten an. Im Gegensatz zu ähnlichen Aktivitätslisten im System, bei denen Berechtigungsfilter angewendet werden, ist diese Liste ungefiltert.',
     'audit_event_filter' => 'Ereignisfilter',
     'audit_event_filter_no_filter' => 'Kein Filter',
     'audit_deleted_item' => 'Gelöschtes Objekt',
@@ -167,131 +168,138 @@
     // Role Settings
     'roles' => 'Rollen',
     'role_user_roles' => 'Benutzer-Rollen',
-    'roles_index_desc' => 'Rollen werden verwendet, um Benutzer zu gruppieren System-Berechtigung für ihre Mitglieder zuzuweisen. Wenn ein Benutzer Mitglied mehrerer Rollen ist, stapeln die gewährten Berechtigungen und der Benutzer wird alle Fähigkeiten erben.',
+    'roles_index_desc' => 'Rollen dienen dazu, Benutzer zu gruppieren und ihren Mitgliedern Systemberechtigungen zu erteilen. Wenn ein Benutzer Mitglied mehrerer Rollen ist, addieren sich die gewährten Berechtigungen, und der Benutzer erhält alle entsprechenden Befugnisse.',
     'roles_x_users_assigned' => ':count Benutzer zugewiesen|:count Benutzer zugewiesen',
     'roles_x_permissions_provided' => ':count Berechtigung|:count Berechtigungen',
     'roles_assigned_users' => 'Zugewiesene Benutzer',
-    'roles_permissions_provided' => 'Genutzte Berechtigungen',
-    'role_create' => 'Neue Rolle anlegen',
+    'roles_permissions_provided' => 'Verfügbare Berechtigungen',
+    'role_create' => 'Neue Rolle erstellen',
     'role_delete' => 'Rolle löschen',
-    'role_delete_confirm' => 'Sie möchten die Rolle ":roleName" löschen.',
-    'role_delete_users_assigned' => 'Diese Rolle ist :userCount Benutzern zugeordnet. Sie können unten eine neue Rolle auswählen, die Sie diesen Benutzern zuordnen möchten.',
+    'role_delete_confirm' => 'Dadurch wird die Rolle mit dem Namen „:roleName“ gelöscht.',
+    'role_delete_users_assigned' => 'Dieser Rolle sind :userCount Benutzer zugewiesen. Wenn Sie die Benutzer aus dieser Rolle migrieren möchten, wählen Sie unten eine neue Rolle aus.',
     'role_delete_no_migration' => "Den Benutzern keine andere Rolle zuordnen",
-    'role_delete_sure' => 'Sind Sie sicher, dass Sie diese Rolle löschen möchten?',
+    'role_delete_sure' => 'Möchten Sie diese Rolle wirklich löschen?',
     'role_edit' => 'Rolle bearbeiten',
     'role_details' => 'Rollendetails',
     'role_name' => 'Rollenname',
     'role_desc' => 'Kurzbeschreibung der Rolle',
-    'role_mfa_enforced' => 'Benötigt Mehrfach-Faktor-Authentifizierung',
+    'role_mfa_enforced' => 'Erfordert eine Multi-Faktor-Authentifizierung',
     'role_external_auth_id' => 'Externe Authentifizierungs-IDs',
     'role_system' => 'System-Berechtigungen',
     'role_manage_users' => 'Benutzer verwalten',
-    'role_manage_roles' => 'Rollen und Rollen-Berechtigungen verwalten',
-    'role_manage_entity_permissions' => 'Alle Buch-, Kapitel- und Seiten-Berechtigungen verwalten',
-    'role_manage_own_entity_permissions' => 'Nur Berechtigungen eigener Bücher, Kapitel und Seiten verwalten',
+    'role_manage_roles' => 'Rollen und Rollenberechtigungen verwalten',
+    'role_manage_entity_permissions' => 'Alle Berechtigungen für Bücher, Kapitel und Seiten verwalten',
+    'role_manage_own_entity_permissions' => 'Berechtigungen für das eigene Buch, Kapitel und Seiten verwalten',
     'role_manage_page_templates' => 'Seitenvorlagen verwalten',
     'role_access_api' => 'Systemzugriffs-API',
     'role_manage_settings' => 'Globaleinstellungen verwalten',
     'role_export_content' => 'Inhalt exportieren',
     'role_import_content' => 'Inhalt importieren',
     'role_editor_change' => 'Seiten-Editor ändern',
-    'role_notifications' => 'Empfangen und Verwalten von Benachrichtigungen',
+    'role_notifications' => 'Benachrichtigungen empfangen und verwalten',
+    'role_permission_note_users_and_roles' => 'Diese Berechtigungen ermöglichen technisch gesehen auch die Anzeige und Suche nach Benutzern und Rollen im System.',
     'role_asset' => 'Berechtigungen',
-    'roles_system_warning' => 'Beachten Sie, dass der Zugriff auf eine der oben genannten drei Berechtigungen einem Benutzer erlauben kann, seine eigenen Berechtigungen oder die Rechte anderer im System zu ändern. Weisen Sie nur Rollen, mit diesen Berechtigungen, vertrauenswürdigen Benutzern zu.',
-    'role_asset_desc' => 'Diese Berechtigungen gelten für den Standard-Zugriff innerhalb des Systems. Berechtigungen für Bücher, Kapitel und Seiten überschreiben diese Berechtigungenen.',
-    'role_asset_admins' => 'Administratoren erhalten automatisch Zugriff auf alle Inhalte, aber diese Optionen können Oberflächenoptionen ein- oder ausblenden.',
-    'role_asset_image_view_note' => 'Das bezieht sich auf die Sichtbarkeit innerhalb des Bildmanagers. Der tatsächliche Zugriff auf hochgeladene Bilddateien hängt von der Speicheroption des Systems für Bilder ab.',
+    'roles_system_warning' => 'Beachten Sie, dass der Zugriff auf eine der drei oben genannten Berechtigungen es einem Benutzer ermöglichen kann, seine eigenen Berechtigungen oder die Berechtigungen anderer Benutzer im System zu ändern. Weisen Sie Rollen mit diesen Berechtigungen nur vertrauenswürdigen Benutzern zu.',
+    'role_asset_desc' => 'Diese Berechtigungen regeln den Standard mäßigen Zugriff auf die Assets im System. Berechtigungen für Bücher, Kapitel und Seiten haben Vorrang vor diesen Berechtigungen.',
+    'role_asset_admins' => 'Administratoren erhalten automatisch Zugriff auf alle Inhalte, doch mit diesen Optionen können Elemente der Benutzeroberfläche ein- oder ausgeblendet werden.',
+    'role_asset_image_view_note' => 'Dies betrifft die Sichtbarkeit innerhalb des Bildmanagers. Der tatsächliche Zugriff auf hochgeladene Bilddateien hängt von der gewählten Speicheroption des Systems ab.',
+    'role_asset_users_note' => 'Diese Berechtigungen ermöglichen technisch gesehen auch die Anzeige und Suche nach Benutzern im System.',
     'role_all' => 'Alle',
     'role_own' => 'Eigene',
-    'role_controlled_by_asset' => 'Berechtigungen werden vom Uploadziel bestimmt',
+    'role_permission_aria' => ':action :resource: :value',
+    'role_controlled_by_asset' => 'Abhängig von dem Asset, in das sie hochgeladen werden',
+    'role_controlled_by_page_delete' => 'Kontrolliert durch die Berechtigung zum Löschen einer Seite',
     'role_save' => 'Rolle speichern',
     'role_users' => 'Dieser Rolle zugeordnete Benutzer',
-    'role_users_none' => 'Bisher sind dieser Rolle keine Benutzer zugeordnet',
+    'role_users_none' => 'Derzeit sind diesem Rollentyp keine Benutzer zugewiesen',
 
     // Users
     'users' => 'Benutzer',
-    'users_index_desc' => 'Erstellen und Verwalten Sie individuelle Benutzerkonten innerhalb des Systems. Benutzerkonten werden zur Anmeldung und Besitz von Inhalten und Aktivitäten verwendet. Zugriffsberechtigungen sind in erster Linie rollenbasiert, aber Besitz von Benutzerinhalten kann unter anderem auch Berechtigungen beeinflussen.',
+    'users_index_desc' => 'Erstellen und verwalten Sie individuelle Benutzerkonten innerhalb des Systems. Benutzerkonten dienen der Anmeldung sowie der Zuordnung von Inhalten und Aktivitäten. Zugriffsberechtigungen sind in erster Linie rollen basiert, doch unter anderem kann auch die Eigentümerschaft an Inhalten durch den Benutzer die Berechtigungen und den Zugriff beeinflussen.',
     'user_profile' => 'Benutzerprofil',
     'users_add_new' => 'Benutzer hinzufügen',
     'users_search' => 'Benutzer suchen',
     'users_latest_activity' => 'Neueste Aktivitäten',
     'users_details' => 'Benutzerdetails',
     'users_details_desc' => 'Legen Sie für diesen Benutzer einen Anzeigenamen und eine E-Mail-Adresse fest. Die E-Mail-Adresse wird bei der Anmeldung verwendet.',
-    'users_details_desc_no_email' => 'Legen Sie für diesen Benutzer einen Anzeigenamen fest, damit andere ihn erkennen können.',
+    'users_details_desc_no_email' => 'Legen Sie einen Anzeigenamen für diesen Benutzer fest, damit andere ihn erkennen können.',
     'users_role' => 'Benutzerrollen',
-    'users_role_desc' => 'Wählen Sie aus, welchen Rollen dieser Benutzer zugeordnet werden soll. Wenn ein Benutzer mehreren Rollen zugeordnet ist, werden die Berechtigungen dieser Rollen gestapelt und er erhält alle Fähigkeiten der zugewiesenen Rollen.',
+    'users_role_desc' => 'Wählen Sie aus, welchen Rollen dieser Benutzer zugewiesen werden soll. Wenn einem Benutzer mehrere Rollen zugewiesen sind, stapeln sich die Berechtigungen dieser Rollen, und er erhält alle Funktionen der zugewiesenen Rollen.',
     'users_password' => 'Benutzerpasswort',
-    'users_password_desc' => 'Legen Sie ein Passwort fest, mit dem Sie sich anmelden möchten. Diese muss mindestens 8 Zeichen lang sein.',
-    'users_send_invite_text' => 'Sie können diesem Benutzer eine Einladungs-E-Mail senden, die es ihm erlaubt, sein eigenes Passwort zu setzen, andernfalls können Sie sein Passwort selbst setzen.',
-    'users_send_invite_option' => 'Benutzer-Einladungs-E-Mail senden',
+    'users_password_desc' => 'Legen Sie ein Passwort fest, mit dem Sie sich bei der Anwendung anmelden. Es muss mindestens 8 Zeichen lang sein.',
+    'users_send_invite_text' => 'Sie können diesem Benutzer eine Einladungs-E-Mail senden, mit der er sein eigenes Passwort festlegen kann, oder Sie können das Passwort selbst festlegen.',
+    'users_send_invite_option' => 'Es erfolgt die Zusendung einer E-Mail mit einer Einladung an den Nutzer',
     'users_external_auth_id' => 'Externe Authentifizierungs-ID',
-    'users_external_auth_id_desc' => 'Wenn ein externes Authentifizierungssystem verwendet wird (z. B. SAML2, OIDC oder LDAP) ist dies die ID, die diesen BookStack-Benutzer mit dem Authentifizierungs-Systemkonto verknüpft. Sie können dieses Feld ignorieren, wenn Sie die Standard-E-Mail-basierte Authentifizierung verwenden.',
+    'users_external_auth_id_desc' => 'Wenn ein externes Authentifizierungssystem verwendet wird (z. B. SAML2, OIDC oder LDAP), ist dies die ID, die diesen BookStack Benutzer mit dem Konto im Authentifizierungssystem verknüpft. Bei Verwendung der Standard mäßigen E-Mail-basierten Authentifizierung können Sie dieses Feld ignorieren.',
     'users_password_warning' => 'Füllen Sie die untenstehenden Felder nur aus, wenn Sie das Passwort für diesen Benutzer ändern möchten.',
-    'users_system_public' => 'Dieser Benutzer repräsentiert alle unangemeldeten Benutzer, die diese Seite betrachten. Er kann nicht zum Anmelden benutzt werden, sondern wird automatisch zugeordnet.',
+    'users_system_public' => 'Dieser Benutzer steht für alle Gastbenutzer, die Ihre Instanz besuchen. Er kann nicht zum Einloggen verwendet werden, wird jedoch automatisch zugewiesen.',
     'users_delete' => 'Benutzer löschen',
     'users_delete_named' => 'Benutzer ":userName" löschen',
-    'users_delete_warning' => 'Der Benutzer ":userName" wird aus dem System gelöscht.',
-    'users_delete_confirm' => 'Sind Sie sicher, dass Sie diesen Benutzer löschen möchten?',
-    'users_migrate_ownership' => 'Besitz migrieren',
-    'users_migrate_ownership_desc' => 'Wählen Sie hier einen Benutzer, wenn Sie möchten, dass ein anderer Benutzer der Besitzer aller Einträge wird, die diesem Benutzer derzeit gehören.',
+    'users_delete_warning' => 'Dadurch wird der Benutzer mit dem Namen „:userName“ vollständig aus dem System gelöscht.',
+    'users_delete_confirm' => 'Möchten Sie diesen Benutzer wirklich löschen?',
+    'users_migrate_ownership' => 'Eigentumsverhältnisse übertragen',
+    'users_migrate_ownership_desc' => 'Wählen Sie hier einen Benutzer aus, wenn Sie möchten, dass ein anderer Benutzer Eigentümer aller Elemente wird, die derzeit diesem Benutzer gehören.',
     'users_none_selected' => 'Kein Benutzer ausgewählt',
     'users_edit' => 'Benutzer bearbeiten',
     'users_edit_profile' => 'Profil bearbeiten',
-    'users_avatar' => 'Benutzer-Bild',
-    'users_avatar_desc' => 'Das Bild sollte eine Auflösung von 256x256px haben.',
+    'users_avatar' => 'Benutzer-Avatar',
+    'users_avatar_desc' => 'Wähle ein Bild aus, das diesen Benutzer repräsentieren soll. Es sollte etwa 256px im Quadrat groß sein.',
     'users_preferred_language' => 'Bevorzugte Sprache',
-    'users_preferred_language_desc' => 'Diese Option ändert die Sprache, die für die Benutzeroberfläche der Anwendung verwendet wird. Dies hat keinen Einfluss auf von Benutzern erstellte Inhalte.',
-    'users_social_accounts' => 'Social-Media Konten',
-    'users_social_accounts_desc' => 'Zeigt den Status der verbundenen sozialen Konten für diesen Benutzer an. Social Accounts können zusätzlich zum primären Authentifizierungssystem für den Systemzugriff verwendet werden.',
-    'users_social_accounts_info' => 'Hier können Sie andere Social-Media-Konten für eine schnellere und einfachere Anmeldung verknüpfen. Wenn Sie ein Social-Media Konto lösen, bleibt der Zugriff erhalten. Entfernen Sie in diesem Falle die Berechtigung in Ihren Profil-Einstellungen des verknüpften Social-Media-Kontos.',
-    'users_social_connect' => 'Social-Media-Konto verknüpfen',
-    'users_social_disconnect' => 'Social-Media-Konto löschen',
+    'users_preferred_language_desc' => 'Mit dieser Option können Sie die Sprache der Benutzeroberfläche der Anwendung ändern. Dies hat keine Auswirkungen auf von Benutzern erstellte Inhalte.',
+    'users_social_accounts' => 'Social-Media-Konten',
+    'users_social_accounts_desc' => 'Den Status der mit diesem Benutzer verknüpften Social-Media-Konten anzeigen. Social-Media-Konten können zusätzlich zum primären Authentifizierungssystem für den Systemzugang verwendet werden.',
+    'users_social_accounts_info' => 'Hier kannst du deine anderen Konten verknüpfen, um dich schneller und einfacher anzumelden. Wenn du ein Konto hier entkoppelst, wird der zuvor erteilte Zugriff dadurch nicht widerrufen. Den Zugriff kannst du in den Profileinstellungen des verknüpften sozialen Kontos widerrufen.',
+    'users_social_connect' => 'Konto verbinden',
+    'users_social_disconnect' => 'Konto trennen',
     'users_social_status_connected' => 'Verbunden',
-    'users_social_status_disconnected' => 'Getrennt',
-    'users_social_connected' => ':socialAccount-Konto wurde erfolgreich mit dem Profil verknüpft.',
-    'users_social_disconnected' => ':socialAccount-Konto wurde erfolgreich vom Profil gelöst.',
+    'users_social_status_disconnected' => 'Nicht verbunden',
+    'users_social_connected' => ':socialAccount wurde erfolgreich mit Ihrem Profil verknüpft.',
+    'users_social_disconnected' => ':socialAccount wurde erfolgreich von Ihrem Profil getrennt.',
     'users_api_tokens' => 'API-Token',
-    'users_api_tokens_desc' => 'Erstellen und verwalten Sie die Zugangs-Tokens zur Authentifizierung mit der BookStack REST API. Berechtigungen für die API werden über den Benutzer verwaltet, dem das Token gehört.',
+    'users_api_tokens_desc' => 'Erstellen und verwalten Sie die Zugriffstoken, die zur Authentifizierung bei der BookStack REST API verwendet werden. Die Berechtigungen für die API werden über den Benutzer verwaltet, dem das Token zugeordnet ist.',
     'users_api_tokens_none' => 'Für diesen Benutzer wurden keine API-Token erstellt',
     'users_api_tokens_create' => 'Token erstellen',
-    'users_api_tokens_expires' => 'Endet',
+    'users_api_tokens_expires' => 'Gültig bis',
     'users_api_tokens_docs' => 'API Dokumentation',
     'users_mfa' => 'Multi-Faktor-Authentifizierung',
-    'users_mfa_desc' => 'Richten Sie Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für Ihr Benutzerkonto ein.',
+    'users_mfa_desc' => 'Richten Sie die Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für Ihr Benutzerkonto ein.',
     'users_mfa_x_methods' => ':count Methode konfiguriert|:count Methoden konfiguriert',
     'users_mfa_configure' => 'Methoden konfigurieren',
+    'users_mfa_reset' => 'Setze Multifaktor-Authentifizierung zurück',
+    'users_mfa_reset_desc' => 'Dies wird alle konfigurierten Multifaktor-Authentifizierungsmethoden für diesen Nutzer zurücksetzen. Falls Multifaktor-Authentifizierung für eine seiner Rollen erforderlich ist, wird der Nutzer aufgefordert, neue Methoden beim nächsten Login zu konfigurieren.',
+    'users_mfa_reset_confirm' => 'Sind Sie sicher, dass Sie diese Multi-Faktor-Authentifizierungsmethode für diesen Nutzer zurücksetzen möchten?',
 
     // API Tokens
     'user_api_token_create' => 'Neuen API-Token erstellen',
     'user_api_token_name' => 'Name',
-    'user_api_token_name_desc' => 'Geben Sie Ihrem Token einen aussagekräftigen Namen als spätere Erinnerung an seinen Verwendungszweck.',
+    'user_api_token_name_desc' => 'Gib deinem Token einen aussagekräftigen Namen, damit du später noch weißt, wofür er gedacht ist.',
     'user_api_token_expiry' => 'Ablaufdatum',
-    'user_api_token_expiry_desc' => 'Legen Sie ein Datum fest, an dem dieser Token abläuft. Nach diesem Datum funktionieren Anfragen, die mit diesem Token gestellt werden, nicht mehr. Wenn Sie dieses Feld leer lassen, wird ein Ablaufdatum von 100 Jahren in der Zukunft festgelegt.',
-    'user_api_token_create_secret_message' => 'Unmittelbar nach der Erstellung dieses Tokens wird eine "Token ID" & ein "Token Kennwort" generiert und angezeigt. Das Kennwort wird nur ein einziges Mal angezeigt. Stellen Sie also sicher, dass Sie den Inhalt an einen sicheren Ort kopieren, bevor Sie fortfahren.',
+    'user_api_token_expiry_desc' => 'Legen Sie ein Ablaufdatum für dieses Token fest. Nach diesem Datum funktionieren Anfragen, die mit diesem Token gestellt werden, nicht mehr. Wenn Sie dieses Feld leer lassen, wird das Ablaufdatum auf 100 Jahre in der Zukunft gesetzt.',
+    'user_api_token_create_secret_message' => 'Unmittelbar nach der Erstellung dieses Tokens werden eine „Token-ID“ und ein „Token-Geheimnis“ generiert und angezeigt. Das Geheimnis wird nur einmal angezeigt. Kopieren Sie den Wert daher unbedingt an einen sicheren Ort, bevor Sie fortfahren.',
     'user_api_token' => 'API-Token',
     'user_api_token_id' => 'Token ID',
-    'user_api_token_id_desc' => 'Dies ist ein nicht editierbarer, vom System generierter Identifikator für diesen Token, welcher bei API-Anfragen angegeben werden muss.',
-    'user_api_token_secret' => 'Token Kennwort',
-    'user_api_token_secret_desc' => 'Dies ist ein systemgeneriertes Kennwort für diesen Token, das bei API-Anfragen zur Verfügung gestellt werden muss. Es wird nur dieses eine Mal angezeigt, deshalb kopieren Sie diesen Wert an einen sicheren und geschützten Ort.',
-    'user_api_token_created' => 'Token erstellt :timeAgo',
+    'user_api_token_id_desc' => 'Dies ist eine nicht bearbeitbare, vom System generierte Kennung für dieses Token, die in API-Anfragen angegeben werden muss.',
+    'user_api_token_secret' => 'Token Geheimnis',
+    'user_api_token_secret_desc' => 'Dies ist ein vom System generiertes Geheimnis für dieses Token, das in API-Anfragen angegeben werden muss. Es wird nur dieses eine Mal angezeigt; speichern Sie diesen Wert daher an einem sicheren Ort.',
+    'user_api_token_created' => 'Token erstellt vor :timeAgo',
     'user_api_token_updated' => 'Token aktualisiert :timeAgo',
     'user_api_token_delete' => 'Lösche Token',
-    'user_api_token_delete_warning' => 'Dies löscht den API-Token mit dem Namen \':tokenName\' vollständig aus dem System.',
-    'user_api_token_delete_confirm' => 'Sind Sie sicher, dass Sie diesen API-Token löschen möchten?',
+    'user_api_token_delete_warning' => 'Dadurch wird dieser API-Token mit dem Namen „:tokenName“ vollständig aus dem System gelöscht.',
+    'user_api_token_delete_confirm' => 'Möchten Sie diesen API-Token wirklich löschen?',
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks sind eine Möglichkeit, Daten an externe URLs zu senden, wenn bestimmte Aktionen und Ereignisse im System auftreten, was eine ereignisbasierte Integration mit externen Plattformen wie Messaging- oder Benachrichtigungssystemen ermöglicht.',
-    'webhooks_x_trigger_events' => ':count Auslöserereignis|:count Auslöserereignisse',
+    'webhooks_index_desc' => 'Webhooks sind eine Möglichkeit, Daten an externe URLs zu senden, wenn bestimmte Aktionen und Ereignisse innerhalb des Systems auftreten. Dies ermöglicht eine Ereignis-basierte Integration mit externen Plattformen wie Messaging oder Benachrichtigungssystemen.',
+    'webhooks_x_trigger_events' => ':count ausgelöstes Ereignis|:count ausgelöste Ereignisse',
     'webhooks_create' => 'Neuen Webhook erstellen',
     'webhooks_none_created' => 'Es wurden noch keine Webhooks erstellt.',
     'webhooks_edit' => 'Webhook bearbeiten',
     'webhooks_save' => 'Webhook speichern',
     'webhooks_details' => 'Webhook-Details',
-    'webhooks_details_desc' => 'Geben Sie einen benutzerfreundlichen Namen und einen POST-Endpunkt als Ort an, an den die Webhook-Daten gesendet werden sollen.',
+    'webhooks_details_desc' => 'Geben Sie einen benutzerfreundlichen Namen und einen POST-Endpunkt als Ziel für die zu sendenden Webhook-Daten an.',
     'webhooks_events' => 'Webhook Ereignisse',
-    'webhooks_events_desc' => 'Wählen Sie alle Ereignisse, die diesen Webhook auslösen sollen.',
-    'webhooks_events_warning' => 'Beachten Sie, dass diese Ereignisse für alle ausgewählten Ereignisse ausgelöst werden, auch wenn benutzerdefinierte Berechtigungen angewendet werden. Stellen Sie sicher, dass die Verwendung dieses Webhook keine vertraulichen Inhalte enthüllt.',
+    'webhooks_events_desc' => 'Wählen Sie alle Ereignisse aus, die den Aufruf dieses Webhooks auslösen sollen.',
+    'webhooks_events_warning' => 'Beachten Sie, dass diese Ereignisse für alle ausgewählten Ereignisse ausgelöst werden, auch wenn benutzerdefinierte Berechtigungen gelten. Stellen Sie sicher, dass durch die Verwendung dieses Webhooks keine vertraulichen Inhalte offengelegt werden.',
     'webhooks_events_all' => 'Alle System-Ereignisse',
     'webhooks_name' => 'Webhook-Name',
     'webhooks_timeout' => 'Webhook Request Timeout (Sekunden)',
@@ -299,10 +307,10 @@
     'webhooks_active' => 'Webhook aktiv',
     'webhook_events_table_header' => 'Ereignisse',
     'webhooks_delete' => 'Webhook löschen',
-    'webhooks_delete_warning' => 'Dies wird diesen Webhook mit dem Namen \':webhookName\' vollständig aus dem System löschen.',
-    'webhooks_delete_confirm' => 'Sind Sie sicher, dass Sie diesen Webhook löschen möchten?',
-    'webhooks_format_example' => 'Webhook Format Beispiel',
-    'webhooks_format_example_desc' => 'Webhook Daten werden als POST-Anfrage an den konfigurierten Endpunkt als JSON im folgenden Format gesendet. Die Eigenschaften "related_item" und "url" sind optional und hängen vom Typ des ausgelösten Ereignisses ab.',
+    'webhooks_delete_warning' => 'Dadurch wird dieser Webhook mit dem Namen „:webhookName“ vollständig aus dem System gelöscht.',
+    'webhooks_delete_confirm' => 'Möchtest du diesen Webhook wirklich löschen?',
+    'webhooks_format_example' => 'Beispiel für ein Webhook-Format',
+    'webhooks_format_example_desc' => 'Webhook-Daten werden als POST-Anfrage im JSON-Format an den konfigurierten Endpunkt gesendet und entsprechen dabei dem unten angegebenen Format. Die Eigenschaften „related_item“ und „url“ sind optional und hängen von der Art des ausgelösten Ereignisses ab.',
     'webhooks_status' => 'Webhook-Status',
     'webhooks_last_called' => 'Zuletzt aufgerufen:',
     'webhooks_last_errored' => 'Letzter Fehler:',
@@ -310,11 +318,11 @@
 
     // Licensing
     'licenses' => 'Lizenzen',
-    'licenses_desc' => 'Diese Seite beschreibt Lizenzinformationen für BookStack zusätzlich zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele aufgelistete Projekte dürfen nur in einem Entwicklungskontext verwendet werden.',
-    'licenses_bookstack' => 'BookStack-Lizenz',
-    'licenses_php' => 'PHP-Bibliothekslizenzen',
-    'licenses_js' => 'JavaScript-Bibliothekslizenzen',
-    'licenses_other' => 'Andere Lizenzen',
+    'licenses_desc' => 'Auf dieser Seite finden Sie Lizenzinformationen zu BookStack sowie zu den Projekten und Bibliotheken, die in BookStack verwendet werden. Viele der aufgeführten Projekte dürfen möglicherweise nur im Entwicklungskontext genutzt werden.',
+    'licenses_bookstack' => 'BookStack Lizenz',
+    'licenses_php' => 'Lizenzen für PHP-Bibliotheken',
+    'licenses_js' => 'Lizenzen für JavaScript-Bibliotheken',
+    'licenses_other' => 'Sonstige Lizenzen',
     'license_details' => 'Lizenzdetails',
 
     //! If editing translations files directly please ignore this in all
@@ -359,7 +367,9 @@
         'ru' => 'Russisch',
         'sk' => 'Slowenisch',
         'sl' => 'Slowenisch',
+        'sr' => 'Српски',
         'sv' => 'Schwedisch',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkisch',
         'uk' => 'Ukrainisch',
         'uz' => 'O‘zbekcha',
diff --git a/lang/de/validation.php b/lang/de/validation.php
index 2ffad05298e..2ddf560e8b1 100644
--- a/lang/de/validation.php
+++ b/lang/de/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute kann nur Buchstaben und Zahlen enthalten.',
     'array'                => ':attribute muss ein Array sein.',
     'backup_codes'         => 'Der angegebene Code ist ungültig oder wurde bereits verwendet.',
+    'base64_uri_mime'      => ':attribute muss eine gültige Base64-URI mit Daten des MIME-Typs :mime sein.',
     'before'               => ':attribute muss ein Datum vor :date sein.',
     'between'              => [
         'numeric' => ':attribute muss zwischen :min und :max liegen.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute Feld muss wahr oder falsch sein.',
     'confirmed'            => ':attribute stimmt nicht überein.',
+    'current_password'     => 'Dies stimmt nicht mit Ihrem aktuellen Passwort überein.',
     'date'                 => ':attribute ist kein gültiges Datum.',
     'date_format'          => ':attribute entspricht nicht dem Format :format.',
     'different'            => ':attribute und :other müssen unterschiedlich sein.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
     'zip_file' => ':attribute muss eine Datei innerhalb des ZIP referenzieren.',
+    'zip_file_size' => 'Die Datei :attribute darf :size MB nicht überschreiten.',
     'zip_file_mime' => ':attribute muss eine Datei des Typs :validType referenzieren, gefunden :foundType.',
     'zip_model_expected' => 'Datenobjekt erwartet, aber ":type" gefunden.',
     'zip_unique' => ':attribute muss für den Objekttyp innerhalb des ZIP eindeutig sein.',
diff --git a/lang/de_informal/activities.php b/lang/de_informal/activities.php
index 990bfa0bc56..85a572c5cd9 100644
--- a/lang/de_informal/activities.php
+++ b/lang/de_informal/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Benutzer erfolgreich aktualisiert',
     'user_delete' => 'hat Benutzer gelöscht: ',
     'user_delete_notification' => 'Benutzer erfolgreich entfernt',
+    'user_mfa_reset' => 'Setze MFA für Nutzer zurück',
+    'user_mfa_reset_notification' => 'Multifaktor-Authenifizierungsmethoden zurücksetzen',
 
     // API Tokens
     'api_token_create' => 'API Token wurde erstellt',
diff --git a/lang/de_informal/auth.php b/lang/de_informal/auth.php
index 17dcdbcb26f..13b59e0349c 100644
--- a/lang/de_informal/auth.php
+++ b/lang/de_informal/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Die eingegebenen Anmeldedaten sind ungültig.',
     'throttle' => 'Zu viele Anmeldeversuche. Bitte versuche es in :seconds Sekunden erneut.',
+    'mfa_throttle' => 'Zu viele Multi-Faktor-Verifizierungsversuche. Bitte versuche es in :seconds Sekunden erneut.',
 
     // Login & Register
     'sign_up' => 'Registrieren',
@@ -20,6 +21,9 @@
     'username' => 'Benutzername',
     'email' => 'E-Mail',
     'password' => 'Passwort',
+    'password_new' => 'Neues Passwort',
+    'password_new_confirm' => 'Neues Passwort bestätigen',
+    'password_current' => 'Aktuelles Passwort bestätigen',
     'password_confirm' => 'Passwort bestätigen',
     'password_hint' => 'Muss mindestens 8 Zeichen lang sein',
     'forgot_password' => 'Passwort vergessen?',
diff --git a/lang/de_informal/common.php b/lang/de_informal/common.php
index d07fa056fd5..bc621486e49 100644
--- a/lang/de_informal/common.php
+++ b/lang/de_informal/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Niemals',
     'none' => 'Keine',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Startseite',
diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php
index 346cd891ead..78c1e3319c6 100644
--- a/lang/de_informal/entities.php
+++ b/lang/de_informal/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Dies löscht die hochgeladene ZIP-Datei und kann nicht rückgängig gemacht werden.',
     'import_errors' => 'Importfehler',
     'import_errors_desc' => 'Die folgenden Fehler sind während des Importversuchs aufgetreten:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Durch die untergeordneten Elemente der Seite navigieren',
+    'breadcrumb_siblings_for_chapter' => 'Durch die Unterelemente des Kapitels navigieren',
+    'breadcrumb_siblings_for_book' => 'Durch die Unterordner des Buches navigieren',
+    'breadcrumb_siblings_for_bookshelf' => 'Durch die untergeordneten Elemente des Regals navigieren',
 
     // Permissions and restrictions
     'permissions' => 'Berechtigungen',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Kapitel und Seiten innerhalb eines Buches verschieben, um dessen Inhalt zu reorganisieren. Andere Bücher können hinzugefügt werden, was das Verschieben von Kapiteln und Seiten zwischen Büchern erleichtert. Optional kann eine automatische Sortierregel erstellt werden, um den Inhalt dieses Buches nach Änderungen automatisch zu sortieren.',
     'books_sort_auto_sort' => 'Auto-Sortieroption',
     'books_sort_auto_sort_active' => 'Automatische Sortierung aktiv: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Regeln für die automatische Sortierung können von einem Benutzer mit den entsprechenden Berechtigungen im Einstellungsbereich "Listen & Sortieren" erstellt werden.',
     'books_sort_named' => 'Buch ":bookName" sortieren',
     'books_sort_name' => 'Sortieren nach Namen',
     'books_sort_created' => 'Sortieren nach Erstellungsdatum',
@@ -272,7 +273,7 @@
     'pages_md_insert_drawing' => 'Zeichnung einfügen',
     'pages_md_show_preview' => 'Vorschau anzeigen',
     'pages_md_sync_scroll' => 'Vorschau synchronisieren',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Einfacher Editor',
     'pages_drawing_unsaved' => 'Ungespeicherte Zeichnung gefunden',
     'pages_drawing_unsaved_confirm' => 'Es wurden ungespeicherte Zeichnungsdaten von einem früheren, fehlgeschlagenen Versuch, die Zeichnung zu speichern, gefunden. Möchtest du diese ungespeicherte Zeichnung wiederherstellen und weiter bearbeiten?',
     'pages_not_in_chapter' => 'Seite ist in keinem Kapitel',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Seitenleiste umschalten',
+    'page_contents' => 'Seiteninhalt',
+    'page_contents_none' => 'Es wurden keine Überschriften im Seiteninhalt gefunden.',
+    'page_contents_info' => 'Das Inhaltsmenü wird aus allen auf der Seite verwendeten Überschriften generiert.',
     'page_tags' => 'Seiten-Schlagwörter',
     'chapter_tags' => 'Kapitel-Schlagwörter',
     'book_tags' => 'Buch-Schlagwörter',
@@ -410,10 +414,10 @@
     'comment_deleted_success' => 'Kommentar gelöscht',
     'comment_created_success' => 'Kommentar hinzugefügt',
     'comment_updated_success' => 'Kommentar aktualisiert',
-    'comment_archive_success' => 'Kommentar archiviert',
+    'comment_archive_success' => 'Kommentar wurde archiviert',
     'comment_unarchive_success' => 'Kommentar nicht mehr archiviert',
     'comment_view' => 'Kommentar ansehen',
-    'comment_jump_to_thread' => 'Zum Thema springen',
+    'comment_jump_to_thread' => 'Zu diesem Thema springen',
     'comment_delete_confirm' => 'Möchtst du diesen Kommentar wirklich löschen?',
     'comment_in_reply_to' => 'Antwort auf :commentId',
     'comment_reference' => 'Referenz',
diff --git a/lang/de_informal/errors.php b/lang/de_informal/errors.php
index 856f02b48c7..f43b4e5acf6 100644
--- a/lang/de_informal/errors.php
+++ b/lang/de_informal/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIP-Datei konnte nicht gelesen werden.',
     'import_zip_cant_decode_data' => 'Konnte Inhalt der data.json im ZIP nicht finden und dekodieren.',
     'import_zip_no_data' => 'ZIP-Datei hat kein erwartetes Buch, Kapitel oder Seiteninhalt.',
+    'import_zip_data_too_large' => 'Der Inhalt der ZIP data.json überschreitet die maximale Dateigröße der Anwendung.',
     'import_validation_failed' => 'ZIP Import konnte aufgrund folgender Fehler nicht validiert werden:',
     'import_zip_failed_notification' => 'Importieren der ZIP-Datei fehlgeschlagen.',
     'import_perms_books' => 'Dir fehlt die erforderliche Berechtigung, um Bücher zu erstellen.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Das für den API-Token angegebene geheime Token ist falsch',
     'api_user_no_api_permission' => 'Der Besitzer des verwendeten API-Token hat keine Berechtigung für API-Aufrufe',
     'api_user_token_expired' => 'Das verwendete Autorisierungs-Token ist abgelaufen',
+    'api_cookie_auth_only_get' => 'Nur GET Anfragen sind erlaubt, wenn die API mit Cookie-basierter Authentifizierung verwendet wird',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Fehler beim Senden einer Test E-Mail:',
diff --git a/lang/de_informal/notifications.php b/lang/de_informal/notifications.php
index 0bf7739f4da..dcbe16c9308 100644
--- a/lang/de_informal/notifications.php
+++ b/lang/de_informal/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Aktualisierte Seite: :pageName',
     'updated_page_intro' => 'Eine Seite wurde in :appName aktualisiert:',
     'updated_page_debounce' => 'Um eine Flut von Benachrichtigungen zu vermeiden, wirst du für eine gewisse Zeit keine Benachrichtigungen für weitere Bearbeitungen dieser Seite durch denselben Bearbeiter erhalten.',
+    'comment_mention_subject' => 'Du wurdest in einem Kommentar auf der Seite :pageName erwähnt',
+    'comment_mention_intro' => 'Du wurdest in einem Kommentar zu :appName erwähnt:',
 
     'detail_page_name' => 'Seitenname:',
     'detail_page_path' => 'Seitenpfad:',
diff --git a/lang/de_informal/preferences.php b/lang/de_informal/preferences.php
index 07b83a8da3a..af606afa098 100644
--- a/lang/de_informal/preferences.php
+++ b/lang/de_informal/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Tastenkürzel Einstellungen wurden aktualisiert!',
     'shortcuts_overview_desc' => 'Verwalten von Tastenkombinationen, die zur Navigation der Benutzeroberfläche verwendet werden können.',
 
+    'interface' => 'Oberflächeneinstellungen',
+    'interface_desc' => 'Hier können Sie das Erscheinungsbild der Benutzeroberfläche anpassen.',
+    'interface_display_mode' => 'Anzeigemodus',
+    'interface_display_mode_desc' => 'Wählen Sie, ob die Anwendung im dunklen oder hellen Modus angezeigt werden soll. Dies kann auch in der Startansicht oder über das Profil-Dropdown in der Kopfleiste geändert werden.',
+    'layouts' => 'Layout-Einstellungen',
+    'layouts_desc' => 'Passen Sie das Layout der in der Benutzeroberfläche angezeigten Bereiche für verschiedene Ansichten an.',
+    'layout_edit' => 'Layout bearbeiten',
+    'layout_edit_desc' => 'Ziehen Sie Bereiche per Drag-and-drop oder verwenden Sie das Aktionsmenü des jeweiligen Bereichs, um festzulegen, welche Bereiche in diesem Layout angezeigt werden und wo sie in der Benutzeroberfläche platziert sind.',
+    'layout_edit_column_hint' => 'Bei kleineren Bildschirmgrößen werden die Bereiche in der rechten Spalte über den Bereichen in der linken Spalte angeordnet.',
+    'layout_edit_save' => 'Layout speichern',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Zurück zu den Einstellungen',
+    'layout_edit_left' => 'Links',
+    'layout_edit_right' => 'Rechts',
+    'layout_edit_center' => 'Mitte',
+    'layout_edit_unused' => 'Nicht verwendet',
+    'layout_edit_empty' => 'Keine Bereiche zum Anzeigen',
+    'layout_edit_reset_to_defaults' => 'Auf Standard zurücksetzen',
+    'layout_update_success' => 'Die Layout-Einstellungen wurden aktualisiert!',
+    'layout_reset_success' => 'Die Layout-Einstellungen wurden zurückgesetzt!',
+
     'notifications' => 'Benachrichtigungseinstellungen',
     'notifications_desc' => 'Lege fest, welche E-Mail-Benachrichtigungen du erhältst, wenn bestimmte Aktivitäten im System durchgeführt werden.',
     'notifications_opt_own_page_changes' => 'Benachrichtigung bei Änderungen an eigenen Seiten',
     'notifications_opt_own_page_comments' => 'Benachrichtigung bei Kommentaren an eigenen Seiten',
+    'notifications_opt_comment_mentions' => 'Bei Erwähnung mich benachrichtigen',
     'notifications_opt_comment_replies' => 'Bei Antworten auf meine Kommentare benachrichtigen',
     'notifications_save' => 'Einstellungen speichern',
     'notifications_update_success' => 'Benachrichtigungseinstellungen wurden aktualisiert!',
diff --git a/lang/de_informal/settings.php b/lang/de_informal/settings.php
index 50003c58ee7..de13652e7da 100644
--- a/lang/de_informal/settings.php
+++ b/lang/de_informal/settings.php
@@ -76,8 +76,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Keine Einschränkung gesetzt',
 
     // Sorting Settings
-    'sorting' => 'Sortierung',
-    'sorting_book_default' => 'Standard-Buchsortierung',
+    'sorting' => 'Listen und Sortierung',
+    'sorting_book_default' => 'Standardregel für die Sortierung von Büchern',
     'sorting_book_default_desc' => 'Wähle die Standard-Sortierregel aus, die auf neue Bücher angewendet werden soll. Dies wirkt sich nicht auf bestehende Bücher aus und kann pro Buch überschrieben werden.',
     'sorting_rules' => 'Sortierregeln',
     'sorting_rules_desc' => 'Dies sind vordefinierte Sortieraktionen, die auf Inhalte im System angewendet werden können.',
@@ -104,6 +104,8 @@
     'sort_rule_op_updated_date' => 'Aktualisierungsdatum',
     'sort_rule_op_chapters_first' => 'Kapitel zuerst',
     'sort_rule_op_chapters_last' => 'Kapitel zuletzt',
+    'sorting_page_limits' => 'Anzeigebegrenzungen pro Seite',
+    'sorting_page_limits_desc' => 'Legen Sie fest, wie viele Elemente pro Seite in den verschiedenen Listen des Systems angezeigt werden sollen. In der Regel ist eine geringere Anzahl leistungsfähiger, während eine höhere Anzahl das Blättern durch mehrere Seiten überflüssig macht. Es wird empfohlen, ein Vielfaches von 6 zu verwenden.',
 
     // Maintenance settings
     'maint' => 'Wartung',
@@ -196,14 +198,18 @@
     'role_import_content' => 'Inhalt importieren',
     'role_editor_change' => 'Seiteneditor ändern',
     'role_notifications' => 'Empfangen und Verwalten von Benachrichtigungen',
+    'role_permission_note_users_and_roles' => 'Diese Berechtigungen ermöglichen technisch gesehen auch die Anzeige und Suche nach Benutzern und Rollen im System.',
     'role_asset' => 'Berechtigungen',
     'roles_system_warning' => 'Beachte, dass der Zugriff auf eine der oben genannten drei Berechtigungen einem Benutzer erlauben kann, seine eigenen Berechtigungen oder die Rechte anderer im System zu ändern. Weise nur Rollen mit diesen Berechtigungen vertrauenswürdigen Benutzern zu.',
     'role_asset_desc' => 'Diese Berechtigungen gelten für den Standard-Zugriff innerhalb des Systems. Berechtigungen für Bücher, Kapitel und Seiten überschreiben diese Berechtigungen.',
     'role_asset_admins' => 'Administratoren erhalten automatisch Zugriff auf alle Inhalte, aber diese Optionen können Oberflächenoptionen ein- oder ausblenden.',
     'role_asset_image_view_note' => 'Das bezieht sich auf die Sichtbarkeit innerhalb des Bildmanagers. Der tatsächliche Zugriff auf hochgeladene Bilddateien hängt von der Speicheroption des Systems für Bilder ab.',
+    'role_asset_users_note' => 'Diese Berechtigungen ermöglichen technisch gesehen auch die Anzeige und Suche nach Benutzern im System.',
     'role_all' => 'Alle',
     'role_own' => 'Eigene',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Berechtigungen werden vom Uploadziel bestimmt',
+    'role_controlled_by_page_delete' => 'Kontrolliert durch die Berechtigung zum Löschen einer Seite',
     'role_save' => 'Rolle speichern',
     'role_users' => 'Dieser Rolle zugeordnete Benutzer',
     'role_users_none' => 'Bisher sind dieser Rolle keine Benutzer zugeordnet',
@@ -260,6 +266,9 @@
     'users_mfa_desc' => 'Richte Multi-Faktor-Authentifizierung als zusätzliche Sicherheitsstufe für dein Benutzerkonto ein.',
     'users_mfa_x_methods' => ':count Methode konfiguriert|:count Methoden konfiguriert',
     'users_mfa_configure' => 'Methoden konfigurieren',
+    'users_mfa_reset' => 'Setze Multifaktor-Authentifizierung zurück',
+    'users_mfa_reset_desc' => 'Dies wird alle konfigurierten Multifaktor-Authentifizierungsmethoden für diesen Nutzer zurücksetzen. Falls Multifaktor-Authentifizierung für eine seiner Rollen erforderlich ist, wird der Nutzer aufgefordert, neue Methoden beim nächsten Login zu konfigurieren.',
+    'users_mfa_reset_confirm' => 'Bist du sicher, dass du diese Multi-Faktor-Authentifizierungsmethode für diesen Nutzer zurücksetzen möchtest?',
 
     // API Tokens
     'user_api_token_create' => 'Neuen API-Token erstellen',
@@ -359,7 +368,9 @@
         'ru' => 'Russisch',
         'sk' => 'Slowenisch',
         'sl' => 'Slowenisch',
+        'sr' => 'Српски',
         'sv' => 'Schwedisch',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkisch',
         'uk' => 'Ukrainisch',
         'uz' => 'O‘zbekcha',
diff --git a/lang/de_informal/validation.php b/lang/de_informal/validation.php
index f7be5a016c3..26feb1e02f5 100644
--- a/lang/de_informal/validation.php
+++ b/lang/de_informal/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute kann nur Buchstaben und Zahlen enthalten.',
     'array'                => ':attribute muss ein Array sein.',
     'backup_codes'         => 'Der angegebene Code ist ungültig oder wurde bereits verwendet.',
+    'base64_uri_mime'      => ':attribute muss eine gültige Base64-URI mit Daten des MIME-Typs :mime sein.',
     'before'               => ':attribute muss ein Datum vor :date sein.',
     'between'              => [
         'numeric' => ':attribute muss zwischen :min und :max liegen.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute Feld muss wahr oder falsch sein.',
     'confirmed'            => ':attribute stimmt nicht überein.',
+    'current_password'     => 'Dies stimmt nicht mit Ihrem aktuellen Passwort überein.',
     'date'                 => ':attribute ist kein gültiges Datum.',
     'date_format'          => ':attribute entspricht nicht dem Format :format.',
     'different'            => ':attribute und :other müssen unterschiedlich sein.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Die Datei konnte nicht hochgeladen werden. Der Server akzeptiert möglicherweise keine Dateien dieser Größe.',
 
     'zip_file' => ':attribute muss auf eine Datei innerhalb des ZIP verweisen.',
+    'zip_file_size' => 'Die Datei :attribute darf :size MB nicht überschreiten.',
     'zip_file_mime' => ':attribute muss eine Datei des Typs :validType referenzieren, gefunden :foundType.',
     'zip_model_expected' => 'Datenobjekt erwartet, aber ":type" gefunden.',
     'zip_unique' => ':attribute muss für den Objekttyp innerhalb des ZIP eindeutig sein.',
diff --git a/lang/el/activities.php b/lang/el/activities.php
index 226ef254074..bd82628f47f 100644
--- a/lang/el/activities.php
+++ b/lang/el/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Ο Χρήστης ενημερώθηκε με επιτυχία',
     'user_delete' => 'διαγραμμένος χρήστης',
     'user_delete_notification' => 'Ο Χρήστης αφαιρέθηκε επιτυχώς',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/el/auth.php b/lang/el/auth.php
index 0b94ef859dd..a85d66ecc1e 100644
--- a/lang/el/auth.php
+++ b/lang/el/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Αυτά τα διαπιστευτήρια δεν ταιριάζουν με τα αρχεία μας.',
     'throttle' => 'Πάρα πολλές προσπάθειες σύνδεσης. Δοκιμάστε ξανά σε :δευτερόλεπτα.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Εγγραφείτε',
@@ -20,6 +21,9 @@
     'username' => 'Όνομα χρήστη',
     'email' => 'Email',
     'password' => 'Ο κωδικός σας',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Επιβεβαιώστε τον κωδικό σας',
     'password_hint' => 'Πρέπει να αποτελείται από τουλάχιστον 8 χαρακτήρες',
     'forgot_password' => 'Ξεχάσατε τον κωδικό σας;',
diff --git a/lang/el/common.php b/lang/el/common.php
index 39c5aad18fd..114592e0c06 100644
--- a/lang/el/common.php
+++ b/lang/el/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Αδρανής',
     'never' => 'Ποτέ',
     'none' => 'Κανένας',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Αρχική σελίδα',
diff --git a/lang/el/entities.php b/lang/el/entities.php
index 3779cd18a61..06b2633615f 100644
--- a/lang/el/entities.php
+++ b/lang/el/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Ταξινόμηση Βιβλίου :bookname',
     'books_sort_name' => 'Ταξινόμηση κατά όνομα',
     'books_sort_created' => 'Ταξινόμηση κατά ημερομηνία δημιουργίας',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Ετικέτες Σελίδας',
     'chapter_tags' => 'Ετικέτες Κεφαλαίου',
     'book_tags' => 'Ετικέτες Βιβλίου',
diff --git a/lang/el/errors.php b/lang/el/errors.php
index cdfa2155f13..f03ed2953d7 100644
--- a/lang/el/errors.php
+++ b/lang/el/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Το μυστικό που παρέχεται για το δεδομένο χρησιμοποιημένο διακριτικό API είναι εσφαλμένο',
     'api_user_no_api_permission' => 'Ο ιδιοκτήτης του χρησιμοποιημένου διακριτικού API δεν έχει άδεια για να κάνει κλήσεις API',
     'api_user_token_expired' => 'Το διακριτικό εξουσιοδότησης που χρησιμοποιείται έχει λήξει',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Σφάλμα κατά την αποστολή δοκιμαστικού email:',
diff --git a/lang/el/notifications.php b/lang/el/notifications.php
index 3924cab3b5c..e9a9fe15de1 100644
--- a/lang/el/notifications.php
+++ b/lang/el/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Ενημερωμένη σελίδα: :pageName',
     'updated_page_intro' => 'Μια σελίδα έχει ενημερωθεί στο :appName:',
     'updated_page_debounce' => 'Για να αποτρέψετε μαζικές ειδοποιήσεις, για κάποιο διάστημα δε θα σας αποστέλλονται ειδοποιήσεις για περαιτέρω αλλαγές σε αυτήν τη σελίδα από τον ίδιο συντάκτη.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Όνομα σελίδας:',
     'detail_page_path' => 'Διαδρομή σελίδας:',
diff --git a/lang/el/preferences.php b/lang/el/preferences.php
index 4f7e97d5257..0caf3bb248f 100644
--- a/lang/el/preferences.php
+++ b/lang/el/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Οι προτιμήσεις σας αποθηκεύτηκαν!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/el/settings.php b/lang/el/settings.php
index 172038fd014..46990474fad 100644
--- a/lang/el/settings.php
+++ b/lang/el/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Δε έχουν ρυθμιστεί περιορισμοί ακόμα',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Συντήρηση',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Εισαγωγή περιεχομένου',
     'role_editor_change' => 'Αλλαγή προγράμματος επεξεργασίας σελίδας',
     'role_notifications' => 'Λήψη & διαχείριση ειδοποιήσεων',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Δικαιώματα Συστήματος',
     'roles_system_warning' => 'Λάβετε υπόψη ότι η πρόσβαση σε οποιοδήποτε από τις τρεις παραπάνω άδειες (δικαιώματα) μπορεί να επιτρέψει σε έναν χρήστη να αλλάξει τα δικά του προνόμια ή τα προνόμια άλλων στο σύστημα. Εκχωρήστε ρόλους με αυτά τα δικαιώματα μόνο σε αξιόπιστους χρήστες.',
     'role_asset_desc' => 'Αυτά τα δικαιώματα ελέγχουν την προεπιλεγμένη πρόσβαση στα στοιχεία (άδειες) εντός του συστήματος. Τα δικαιώματα σε Βιβλία, Κεφάλαια και Σελίδες θα παρακάμψουν αυτές τις άδειες.',
     'role_asset_admins' => 'Οι διαχειριστές έχουν αυτόματα πρόσβαση σε όλο το περιεχόμενο, αλλά αυτές οι επιλογές ενδέχεται να εμφανίζουν ή να αποκρύπτουν τις επιλογές διεπαφής χρήστη.',
     'role_asset_image_view_note' => 'Αυτό σχετίζεται με την ορατότητα εντός του διαχειριστή εικόνων. Η πραγματική πρόσβαση των μεταφορτωμένων αρχείων εικόνας θα εξαρτηθεί από την επιλογή αποθήκευσης εικόνας συστήματος.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Ολα',
     'role_own' => 'Τα δικά του',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Ελέγχονται από το στοιχείο στο οποίο ανεβαίνουν (Ράφια, Βιβλία)',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Αποθήκευση Ρόλου',
     'role_users' => 'Χρήστες σε αυτόν τον Ρόλο',
     'role_users_none' => 'Σε κανένα χρήστη δεν έχει ανατεθεί αυτήν τη στιγμή αυτός ο ρόλος.',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Ρυθμίστε τον έλεγχο ταυτότητας πολλαπλών παραγόντων ως ένα επιπλέον επίπεδο ασφάλειας για τον λογαριασμό χρήστη σας.',
     'users_mfa_x_methods' => 'Έχει ρυθμιστεί :count μέθοδος|Έχουν ρυθμιστεί :count μέθοδοι',
     'users_mfa_configure' => 'Ρύθμιση Μεθόδων',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Δημιουργία διακριτικού (API Token)',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/el/validation.php b/lang/el/validation.php
index 12d4919cab2..7ca50437c0b 100644
--- a/lang/el/validation.php
+++ b/lang/el/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'Tο :attribute μπορεί να περιλαμβάνει μόνο γράμματα και αριθμούς.',
     'array'                => 'Το :attribute πρέπει να είναι πίνακας.',
     'backup_codes'         => 'Ο παρεχόμενος κωδικός δεν είναι έγκυρος ή έχει ήδη χρησιμοποιηθεί.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'Tο :attribute πρέπει να είναι μια ημερομηνία πριν από :date.',
     'between'              => [
         'numeric' => 'Το :attribute πρέπει να είναι μεταξύ :min και :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Το πεδίο :attribute πρέπει να είναι σωστό ή λάθος.',
     'confirmed'            => 'Η επιβεβαίωση του :attribute δεν ταιριάζει.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'Το :attribute δεν έχει έγκυρη ημερομηνία.',
     'date_format'          => 'Το :attribute δεν ταιριάζει με τη μορφή :format.',
     'different'            => 'Τα πεδία :attribute και :other πρέπει να είναι διαφορετικά.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Δεν ήταν δυνατή η αποστολή του αρχείου. Ο διακομιστής ενδέχεται να μην δέχεται αρχεία αυτού του μεγέθους.',
 
     'zip_file' => 'Το :attribute πρέπει να παραπέμπει σε ένα αρχείο εντός του ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'Το :attribute πρέπει να αναφέρεται σε αρχείο τύπου :validTypes, βρέθηκε :foundType.',
     'zip_model_expected' => 'Αναμενόταν αντικείμενο δεδομένων, αλλά ":type" βρέθηκε.',
     'zip_unique' => 'Το :attribute πρέπει να είναι μοναδικό για τον τύπο αντικειμένου εντός του ZIP.',
diff --git a/lang/en/activities.php b/lang/en/activities.php
index 4362fc02958..e9344a3d477 100644
--- a/lang/en/activities.php
+++ b/lang/en/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/en/auth.php b/lang/en/auth.php
index 57f0cb5c632..13247c73194 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'These credentials do not match our records.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Sign up',
@@ -20,6 +21,9 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirm Password',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Forgot Password?',
diff --git a/lang/en/common.php b/lang/en/common.php
index 06a9e855ce3..46b2a187c25 100644
--- a/lang/en/common.php
+++ b/lang/en/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/en/components.php b/lang/en/components.php
index c33b1d0b791..184aefef770 100644
--- a/lang/en/components.php
+++ b/lang/en/components.php
@@ -11,6 +11,7 @@
     'image_upload' => 'Upload Image',
     'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.',
     'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.',
+    'image_no_upload_permission' => 'You do not have permission to upload new images.',
     'image_all' => 'All',
     'image_all_title' => 'View all images',
     'image_book_title' => 'View images uploaded to this book',
diff --git a/lang/en/entities.php b/lang/en/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/en/entities.php
+++ b/lang/en/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/en/errors.php b/lang/en/errors.php
index 9d738379648..20537d59f0c 100644
--- a/lang/en/errors.php
+++ b/lang/en/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/en/notifications.php b/lang/en/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/en/notifications.php
+++ b/lang/en/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/en/preferences.php b/lang/en/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/en/preferences.php
+++ b/lang/en/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/en/settings.php b/lang/en/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/en/validation.php b/lang/en/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/es/activities.php b/lang/es/activities.php
index 89a11c63a2e..e256a88c9a3 100644
--- a/lang/es/activities.php
+++ b/lang/es/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Usuario actualizado correctamente',
     'user_delete' => 'usuario eliminado',
     'user_delete_notification' => 'Usuario eliminado correctamente',
+    'user_mfa_reset' => 'reiniciar autenticación en dos pasos para el usuario',
+    'user_mfa_reset_notification' => 'Métodos de autenticación en dos pasos restablecidos',
 
     // API Tokens
     'api_token_create' => 'token de API creado',
diff --git a/lang/es/auth.php b/lang/es/auth.php
index 45d3eb32916..a3ed712c2f9 100644
--- a/lang/es/auth.php
+++ b/lang/es/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
     'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
+    'mfa_throttle' => 'Demasiados intentos de verificación de autenticación en dos pasos. Por favor, inténtalo de nuevo en :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registrarse',
@@ -20,6 +21,9 @@
     'username' => 'Usuario',
     'email' => 'Correo electrónico',
     'password' => 'Contraseña',
+    'password_new' => 'Nueva Contraseña',
+    'password_new_confirm' => 'Confirme Nueva Contraseña',
+    'password_current' => 'Confirmar contraseña actual',
     'password_confirm' => 'Confirmar contraseña',
     'password_hint' => 'Debe contener al menos 8 caracteres',
     'forgot_password' => '¿Contraseña olvidada?',
diff --git a/lang/es/common.php b/lang/es/common.php
index 399d1d862aa..8a88ff57bcf 100644
--- a/lang/es/common.php
+++ b/lang/es/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Nunca',
     'none' => 'Ninguno',
+    'move_left' => 'Mover a la Izquierda',
+    'move_right' => 'Mover a la derecha',
 
     // Header
     'homepage' => 'Página de Inicio',
diff --git a/lang/es/entities.php b/lang/es/entities.php
index e652d4dc006..e5ee473a034 100644
--- a/lang/es/entities.php
+++ b/lang/es/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para ordenar automáticamente el contenido de este libro cuando haya cambios.',
     'books_sort_auto_sort' => 'Opción de ordenación automática',
     'books_sort_auto_sort_active' => 'Opción de ordenación activa: sortName',
+    'books_sort_auto_sort_creation_hint' => 'Las reglas para los ajustes de ordenación automática pueden ser creadas en el área de configuración "Listas y ordenación" por un usuario con los permisos pertinentes.',
     'books_sort_named' => 'Organizar libro :bookName',
     'books_sort_name' => 'Organizar por Nombre',
     'books_sort_created' => 'Organizar por Fecha de creación',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Mostrar/ocultar barra lateral',
+    'page_contents' => 'Contenido de Página',
+    'page_contents_none' => 'No se encontraron encabezados en el contenido de la página.',
+    'page_contents_info' => 'El menú de los contenidos de la página se genera a partir de cualquier formato de encabezado utilizado en la página.',
     'page_tags' => 'Etiquetas de Página',
     'chapter_tags' => 'Etiquetas de Capítulo',
     'book_tags' => 'Etiquetas de Libro',
diff --git a/lang/es/errors.php b/lang/es/errors.php
index 98aa2acd593..25f82a5d872 100644
--- a/lang/es/errors.php
+++ b/lang/es/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'No se pudo leer el archivo ZIP.',
     'import_zip_cant_decode_data' => 'No se pudo encontrar y decodificar el archivo data.json. en el archivo ZIP.',
     'import_zip_no_data' => 'Los datos del archivo ZIP no contienen ningún libro, capítulo o contenido de página.',
+    'import_zip_data_too_large' => 'El contenido del ZIP data.json excede el tamaño máximo de carga configurado.',
     'import_validation_failed' => 'Error al validar la importación del ZIP con errores:',
     'import_zip_failed_notification' => 'Error al importar archivo ZIP.',
     'import_perms_books' => 'Le faltan los permisos necesarios para crear libros.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'El secreto proporcionado para el token API usado es incorrecto',
     'api_user_no_api_permission' => 'El propietario del token API usado no tiene permiso para hacer llamadas API',
     'api_user_token_expired' => 'El token de autorización usado ha caducado',
+    'api_cookie_auth_only_get' => 'Sólo se permiten peticiones GET cuando se utiliza el API con autenticación basada en cookies',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error al enviar un email de prueba:',
diff --git a/lang/es/notifications.php b/lang/es/notifications.php
index 5ebc42129d9..38c7708884f 100644
--- a/lang/es/notifications.php
+++ b/lang/es/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Página actualizada: :pageName',
     'updated_page_intro' => 'Una página ha sido actualizada en :appName:',
     'updated_page_debounce' => 'Para prevenir notificaciones en masa, durante un tiempo no se enviarán notificaciones para futuras ediciones de esta página por el mismo editor.',
+    'comment_mention_subject' => 'Ha sido mencionado en un comentario en la página: :pageName',
+    'comment_mention_intro' => 'Fue mencionado en un comentario en :appName:',
 
     'detail_page_name' => 'Nombre de página:',
     'detail_page_path' => 'Ruta de la página:',
diff --git a/lang/es/preferences.php b/lang/es/preferences.php
index 13af93d2978..2655d00c1a0 100644
--- a/lang/es/preferences.php
+++ b/lang/es/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => '¡Las preferencias de accesos directos han sido actualizadas!',
     'shortcuts_overview_desc' => 'Gestione los atajos de teclado que puede utilizar para navegar por la interfaz de usuario del sistema.',
 
+    'interface' => 'Preferencias de la Interfaz',
+    'interface_desc' => 'Aquí puede encontrar opciones para personalizar la apariencia de la interfaz de usuario.',
+    'interface_display_mode' => 'Modo de Visualización',
+    'interface_display_mode_desc' => 'Elija si la aplicación debe mostrarse en modo oscuro o claro. Esto también se puede cambiar desde la vista de la pantalla de inicio, o a través del menú desplegable de perfil en la cabecera.',
+    'layouts' => 'Preferencias de Diseño de la Interfaz',
+    'layouts_desc' => 'Personalizar la disposición de las secciones mostradas en la interfaz de usuario para un rango de vistas.',
+    'layout_edit' => 'Editar Diseño',
+    'layout_edit_desc' => 'Arrastra y suelta las secciones, o usa el menú de acción que se encuentra en cada una para reconfigurar qué secciones se muestran dentro de esta disposición en la interfaz y donde se muestran.',
+    'layout_edit_column_hint' => 'Cuando se ve en pantalla más pequeñas, las secciones de columnas de la derecha se acumularán en la parte superior de las secciones a la izquierda.',
+    'layout_edit_save' => 'Guardar Diseño',
+    'layout_edit_layouts' => 'Diseños',
+    'layout_edit_back_to_preferences' => 'Volver a Preferencias',
+    'layout_edit_left' => 'Izquierda',
+    'layout_edit_right' => 'Derecha',
+    'layout_edit_center' => 'Centro',
+    'layout_edit_unused' => 'Sin usar',
+    'layout_edit_empty' => 'No hay secciones para mostrar',
+    'layout_edit_reset_to_defaults' => 'Restablecer Valores Predeterminados',
+    'layout_update_success' => '¡Las preferencias de diseño han sido actualizadas!',
+    'layout_reset_success' => '¡Las preferencias de diseño se han restablecido!',
+
     'notifications' => 'Preferencias de notificaciones',
     'notifications_desc' => 'Controle las notificaciones por correo electrónico que recibe cuando se realiza cierta actividad dentro del sistema.',
     'notifications_opt_own_page_changes' => 'Notificar sobre los cambios en las páginas en las que soy propietario',
     'notifications_opt_own_page_comments' => 'Notificar sobre comentarios en las páginas en las que soy propietario',
+    'notifications_opt_comment_mentions' => 'Notificarme cuando he sido mencionado en un comentario',
     'notifications_opt_comment_replies' => 'Notificar sobre respuestas a mis comentarios',
     'notifications_save' => 'Guardar preferencias',
     'notifications_update_success' => '¡Se han actualizado las preferencias de notificaciones!',
diff --git a/lang/es/settings.php b/lang/es/settings.php
index 55eb498d630..22de6f419da 100644
--- a/lang/es/settings.php
+++ b/lang/es/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ninguna restricción establecida',
 
     // Sorting Settings
-    'sorting' => 'Ordenación',
-    'sorting_book_default' => 'Orden por defecto del libro',
+    'sorting' => 'Listas y ordenación',
+    'sorting_book_default' => 'Orden de libros por defecto',
     'sorting_book_default_desc' => 'Seleccione la regla de ordenación predeterminada para aplicar a nuevos libros. Esto no afectará a los libros existentes, y puede ser anulado por libro.',
     'sorting_rules' => 'Reglas de ordenación',
     'sorting_rules_desc' => 'Son operaciones de ordenación predefinidas que se pueden aplicar al contenido en el sistema.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Fecha de actualización',
     'sort_rule_op_chapters_first' => 'Capítulos al inicio',
     'sort_rule_op_chapters_last' => 'Capítulos al final',
+    'sorting_page_limits' => 'Límites de visualización por página',
+    'sorting_page_limits_desc' => 'Establecer cuántos elementos a mostrar por página en varias listas dentro del sistema. Normalmente una cantidad más baja rendirá mejor, mientras que una cantidad más alta evita la necesidad de hacer clic a través de varias páginas. Se recomienda utilizar un múltiplo de 6.',
 
     // Maintenance settings
     'maint' => 'Mantenimiento',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importar contenido',
     'role_editor_change' => 'Cambiar editor de página',
     'role_notifications' => 'Recibir y gestionar notificaciones',
+    'role_permission_note_users_and_roles' => 'Estos permisos proporcionarán también visibilidad y búsqueda de usuarios y roles en el sistema.',
     'role_asset' => 'Permisos de contenido',
     'roles_system_warning' => 'Tenga en cuenta que el acceso a cualquiera de los tres permisos anteriores puede permitir a un usuario alterar sus propios privilegios o los privilegios de otros en el sistema. Sólo asignar roles con estos permisos a usuarios de confianza.',
     'role_asset_desc' => 'Estos permisos controlan el acceso por defecto a los contenidos del sistema. Los permisos de Libros, Capítulos y Páginas sobreescribiran estos permisos.',
     'role_asset_admins' => 'A los administradores se les asigna automáticamente permisos para acceder a todo el contenido pero estas opciones podrían mostrar u ocultar opciones de la interfaz.',
     'role_asset_image_view_note' => 'Esto se refiere a la visibilidad dentro del gestor de imágenes. El acceso a los archivos de imagen subidos dependerá de la opción de almacenamiento de imágenes del sistema.',
+    'role_asset_users_note' => 'Estos permisos proporcionarán también visibilidad y búsqueda de usuarios en el sistema.',
     'role_all' => 'Todo',
     'role_own' => 'Propio',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlado por el contenido al que ha sido subido',
+    'role_controlled_by_page_delete' => 'Controlado por página de eliminación de permisos',
     'role_save' => 'Guardar rol',
     'role_users' => 'Usuarios en este rol',
     'role_users_none' => 'No hay usuarios asignados a este rol',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'La autenticación en dos pasos añade una capa de seguridad adicional a tu cuenta.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar métodos',
+    'users_mfa_reset' => 'Restablecer métodos de autenticación en dos pasos',
+    'users_mfa_reset_desc' => 'Esto restablecerá y borrará todos los métodos de autenticación en dos pasos configurados para este usuario. Si la autenticación en dos pasos es requerida por cualquiera de sus roles, se les pedirá que configuren nuevos métodos en su próximo inicio de sesión.',
+    'users_mfa_reset_confirm' => '¿Estás seguro de que deseas eliminar la autenticación en dos pasos para este usuario?',
 
     // API Tokens
     'user_api_token_create' => 'Crear token API',
@@ -358,7 +367,9 @@
         'ru' => 'Ruso',
         'sk' => 'Eslovaco',
         'sl' => 'Esloveno',
+        'sr' => 'Српски',
         'sv' => 'Sueco',
+        'th' => 'ภาษาไทย',
         'tr' => 'Turco',
         'uk' => 'Ucraniano',
         'uz' => 'O‘zbekcha',
diff --git a/lang/es/validation.php b/lang/es/validation.php
index d5f4f8495c8..0eedc1776eb 100644
--- a/lang/es/validation.php
+++ b/lang/es/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'El :attribute solo puede contener letras y números.',
     'array'                => 'El :attribute debe de ser un array.',
     'backup_codes'         => 'El código suministrado no es válido o ya ha sido utilizado.',
+    'base64_uri_mime'      => 'El atributo :attribute debe ser una URI base64 válida que contenga datos de tipo mime :mime.',
     'before'               => 'El :attribute debe ser una fecha anterior a  :date.',
     'between'              => [
         'numeric' => 'El :attribute debe estar entre :min y :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'El campo :attribute debe ser true o false.',
     'confirmed'            => 'La confirmación de :attribute no concuerda.',
+    'current_password'     => 'Esto no coincide con su contraseña actual.',
     'date'                 => 'El :attribute no es una fecha válida.',
     'date_format'          => 'El :attribute no coincide con el formato :format.',
     'different'            => ':attribute y :other deben ser diferentes.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'El archivo no ha podido subirse. Es posible que el servidor no acepte archivos de este tamaño.',
 
     'zip_file' => 'El :attribute necesita hacer referencia a un archivo dentro del ZIP.',
+    'zip_file_size' => 'El archivo :attribute no debe exceder :size MB.',
     'zip_file_mime' => 'El :attribute necesita hacer referencia a un archivo de tipo :validTypes, encontrado :foundType.',
     'zip_model_expected' => 'Se esperaba un objeto de datos, pero se encontró ":type".',
     'zip_unique' => 'El :attribute debe ser único para el tipo de objeto dentro del ZIP.',
diff --git a/lang/es_AR/activities.php b/lang/es_AR/activities.php
index e01fe4e643e..ececde5badd 100644
--- a/lang/es_AR/activities.php
+++ b/lang/es_AR/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Usuario actualizado con éxito',
     'user_delete' => 'usuario eliminado',
     'user_delete_notification' => 'El usuario fue eliminado correctamente',
+    'user_mfa_reset' => 'reiniciar autenticación en dos pasos para el usuario',
+    'user_mfa_reset_notification' => 'Métodos de autenticación en dos pasos restablecidos',
 
     // API Tokens
     'api_token_create' => 'token de API creado',
diff --git a/lang/es_AR/auth.php b/lang/es_AR/auth.php
index 7687f709e92..886ac957b34 100644
--- a/lang/es_AR/auth.php
+++ b/lang/es_AR/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Estas credenciales no concuerdan con nuestros registros.',
     'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor intente nuevamente en :seconds segundos.',
+    'mfa_throttle' => 'Demasiados intentos de verificación de autenticación en dos pasos. Por favor, inténtalo de nuevo en :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registrarse',
@@ -20,6 +21,9 @@
     'username' => 'Nombre de usuario',
     'email' => 'Correo electrónico',
     'password' => 'Contraseña',
+    'password_new' => 'Nueva Contraseña',
+    'password_new_confirm' => 'Confirme Nueva Contraseña',
+    'password_current' => 'Confirmar contraseña actual',
     'password_confirm' => 'Confirmar contraseña',
     'password_hint' => 'Debe contener al menos 8 caracteres',
     'forgot_password' => '¿Olvidó la contraseña?',
diff --git a/lang/es_AR/common.php b/lang/es_AR/common.php
index e30adbf69be..cc66afeb4c4 100644
--- a/lang/es_AR/common.php
+++ b/lang/es_AR/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactivo',
     'never' => 'Nunca',
     'none' => 'Ninguno',
+    'move_left' => 'Mover a la Izquierda',
+    'move_right' => 'Mover a la derecha',
 
     // Header
     'homepage' => 'Página de Inicio',
diff --git a/lang/es_AR/entities.php b/lang/es_AR/entities.php
index 6c54a000413..72aeb2d9e8d 100644
--- a/lang/es_AR/entities.php
+++ b/lang/es_AR/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Esto eliminará el archivo ZIP de importación subido y no se puede deshacer.',
     'import_errors' => 'Errores de Importación',
     'import_errors_desc' => 'Se produjeron los siguientes errores durante el intento de importación:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Navegar por páginas del mismo nivel',
+    'breadcrumb_siblings_for_chapter' => 'Navegar por capítulos del mismo nivel',
+    'breadcrumb_siblings_for_book' => 'Navegar por libros del mismo nivel',
+    'breadcrumb_siblings_for_bookshelf' => 'Navegar por estantes del mismo nivel',
 
     // Permissions and restrictions
     'permissions' => 'Permisos',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Mueve capítulos y páginas dentro de un libro para reorganizar su contenido. Se pueden añadir otros libros que permiten mover fácilmente capítulos y páginas entre libros. Opcionalmente, se puede establecer una regla de ordenación automática para el contenido de este libro cuando haya cambios.',
     'books_sort_auto_sort' => 'Opción de ordenación automática',
     'books_sort_auto_sort_active' => 'Opción de ordenación activa: sortName',
+    'books_sort_auto_sort_creation_hint' => 'Las reglas para los ajustes de ordenación automática pueden ser creadas en el área de configuración "Listas y ordenación" por un usuario con los permisos pertinentes.',
     'books_sort_named' => 'Organizar libro :bookName',
     'books_sort_name' => 'Organizar por nombre',
     'books_sort_created' => 'Organizar por fecha de creación',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Mostrar/ocultar barra lateral',
+    'page_contents' => 'Contenido de Página',
+    'page_contents_none' => 'No se encontraron encabezados en el contenido de la página.',
+    'page_contents_info' => 'El menú de los contenidos de la página se genera a partir de cualquier formato de encabezado utilizado en la página.',
     'page_tags' => 'Etiquetas de página',
     'chapter_tags' => 'Etiquetas de capítulo',
     'book_tags' => 'Etiquetas de libro',
diff --git a/lang/es_AR/errors.php b/lang/es_AR/errors.php
index 16a5b5467e3..6f6b25bcf98 100644
--- a/lang/es_AR/errors.php
+++ b/lang/es_AR/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'No se pudo leer el archivo ZIP.',
     'import_zip_cant_decode_data' => 'No se pudo encontrar ni decodificar el contenido del archivo ZIP data.json.',
     'import_zip_no_data' => 'Los datos del archivo ZIP no tienen un libro, un capítulo o contenido de página en su contenido.',
+    'import_zip_data_too_large' => 'El contenido del ZIP data.json excede el tamaño máximo de carga configurado.',
     'import_validation_failed' => 'Error al validar la importación del ZIP con los errores:',
     'import_zip_failed_notification' => 'Error al importar archivo ZIP.',
     'import_perms_books' => 'Le faltan los permisos necesarios para crear libros.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'El secreto proporcionado para el token API usado es incorrecto',
     'api_user_no_api_permission' => 'El propietario del token API usado no tiene permiso para hacer llamadas API',
     'api_user_token_expired' => 'El token de autorización usado ha caducado',
+    'api_cookie_auth_only_get' => 'Sólo se permiten peticiones GET cuando se utiliza el API con autenticación basada en cookies',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error al enviar un email de prueba:',
diff --git a/lang/es_AR/notifications.php b/lang/es_AR/notifications.php
index fc89b2c25ab..af9f5332b36 100644
--- a/lang/es_AR/notifications.php
+++ b/lang/es_AR/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Página actualizada: :pageName',
     'updated_page_intro' => 'Se actualizó una página en :appName:',
     'updated_page_debounce' => 'Para evitar una avalancha de notificaciones, durante un tiempo no se enviarán notificaciones sobre más ediciones de esta página por el mismo editor.',
+    'comment_mention_subject' => 'Ha sido mencionado en un comentario en la página: :pageName',
+    'comment_mention_intro' => 'Fue mencionado en un comentario en :appName:',
 
     'detail_page_name' => 'Nombre de la página:',
     'detail_page_path' => 'Ruta de la página:',
diff --git a/lang/es_AR/preferences.php b/lang/es_AR/preferences.php
index 11c872021c0..ea4f165e3a3 100644
--- a/lang/es_AR/preferences.php
+++ b/lang/es_AR/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => '¡Se actualizaron las preferencias de atajos de teclado!',
     'shortcuts_overview_desc' => 'Gestione los atajos de teclado que puede utilizar para navegar por la interfaz de usuario del sistema.',
 
+    'interface' => 'Preferencias de la Interfaz',
+    'interface_desc' => 'Aquí puede encontrar opciones para personalizar la apariencia de la interfaz de usuario.',
+    'interface_display_mode' => 'Modo de Visualización',
+    'interface_display_mode_desc' => 'Elija si la aplicación debe mostrarse en modo oscuro o claro. Esto también se puede cambiar desde la vista de la pantalla de inicio, o a través del menú desplegable de perfil en la cabecera.',
+    'layouts' => 'Preferencias de Diseño de la Interfaz',
+    'layouts_desc' => 'Personalizar la disposición de las secciones mostradas en la interfaz de usuario para un rango de vistas.',
+    'layout_edit' => 'Editar Diseño',
+    'layout_edit_desc' => 'Arrastra y suelta las secciones, o usa el menú de acción que se encuentra en cada una para reconfigurar qué secciones se muestran dentro de esta disposición en la interfaz y donde se muestran.',
+    'layout_edit_column_hint' => 'Cuando se ve en pantalla más pequeñas, las secciones de columnas de la derecha se acumularán en la parte superior de las secciones a la izquierda.',
+    'layout_edit_save' => 'Guardar Diseño',
+    'layout_edit_layouts' => 'Diseños',
+    'layout_edit_back_to_preferences' => 'Volver a Preferencias',
+    'layout_edit_left' => 'Izquierda',
+    'layout_edit_right' => 'Derecha',
+    'layout_edit_center' => 'Centro',
+    'layout_edit_unused' => 'Sin usar',
+    'layout_edit_empty' => 'No hay secciones para mostrar',
+    'layout_edit_reset_to_defaults' => 'Restablecer Valores Predeterminados',
+    'layout_update_success' => '¡Las preferencias de diseño han sido actualizadas!',
+    'layout_reset_success' => '¡Las preferencias de diseño se han restablecido!',
+
     'notifications' => 'Preferencias de notificaciones',
     'notifications_desc' => 'Controle las notificaciones por correo electrónico que recibe cuando se realiza cierta actividad dentro del sistema.',
     'notifications_opt_own_page_changes' => 'Notificar sobre los cambios en las páginas de las que soy propietario',
     'notifications_opt_own_page_comments' => 'Notificar sobre comentarios en las páginas de las que soy propietario',
+    'notifications_opt_comment_mentions' => 'Notificarme cuando he sido mencionado en un comentario',
     'notifications_opt_comment_replies' => 'Notificar sobre respuestas a mis comentarios',
     'notifications_save' => 'Guardar preferencias',
     'notifications_update_success' => '¡Se actualizaron las preferencias de notificaciones!',
diff --git a/lang/es_AR/settings.php b/lang/es_AR/settings.php
index 5cbcff86eae..9d384e1d2b0 100644
--- a/lang/es_AR/settings.php
+++ b/lang/es_AR/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ninguna restricción establecida',
 
     // Sorting Settings
-    'sorting' => 'Ordenando',
-    'sorting_book_default' => 'Orden predeterminado del libro',
+    'sorting' => 'Listas y ordenación',
+    'sorting_book_default' => 'Orden de libros por defecto',
     'sorting_book_default_desc' => 'Seleccione la regla de ordenación predeterminada para aplicar a nuevos libros. Esto no afectará a los libros existentes, y puede ser anulado por libro.',
     'sorting_rules' => 'Reglas de Ordenación',
     'sorting_rules_desc' => 'Son operaciones de ordenación predefinidas que se pueden aplicar al contenido en el sistema.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Fecha de actualización',
     'sort_rule_op_chapters_first' => 'Capítulos al inicio',
     'sort_rule_op_chapters_last' => 'Capítulos al final',
+    'sorting_page_limits' => 'Límites de visualización por página',
+    'sorting_page_limits_desc' => 'Establecer cuántos elementos a mostrar por página en varias listas dentro del sistema. Normalmente una cantidad más baja rendirá mejor, mientras que una cantidad más alta evita la necesidad de hacer clic a través de varias páginas. Se recomienda utilizar un múltiplo de 6.',
 
     // Maintenance settings
     'maint' => 'Mantenimiento',
@@ -196,14 +198,18 @@
     'role_import_content' => 'Importar contenido',
     'role_editor_change' => 'Cambiar editor de página',
     'role_notifications' => 'Recibir y gestionar notificaciones',
+    'role_permission_note_users_and_roles' => 'Estos permisos proporcionarán también visibilidad y búsqueda de usuarios y roles en el sistema.',
     'role_asset' => 'Permisos de activos',
     'roles_system_warning' => 'Tenga en cuenta que el acceso a cualquiera de los tres permisos anteriores puede permitir a un usuario modificar sus propios privilegios o los privilegios de otros usuarios en el sistema. Asignar roles con estos permisos sólo a usuarios de comfianza.',
     'role_asset_desc' => 'Estos permisos controlan el acceso por defecto a los activos del sistema. Permisos definidos en Libros, Capítulos y Páginas ignorarán estos permisos.',
     'role_asset_admins' => 'Los administradores reciben automáticamente acceso a todo el contenido pero estas opciones pueden mostrar u ocultar opciones de UI.',
     'role_asset_image_view_note' => 'Esto se refiere a la visibilidad dentro del gestor de imágenes. El acceso real a los archivos de imágenes subidos, dependerá de la opción de almacenamiento de imágenes del sistema.',
+    'role_asset_users_note' => 'Estos permisos proporcionarán también visibilidad y búsqueda de usuarios en el sistema.',
     'role_all' => 'Todo',
     'role_own' => 'Propio',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlado por el activo al que ha sido subido',
+    'role_controlled_by_page_delete' => 'Controlado por página de eliminación de permisos',
     'role_save' => 'Guardar rol',
     'role_users' => 'Usuarios en este rol',
     'role_users_none' => 'No hay usuarios asignados a este rol',
@@ -260,6 +266,9 @@
     'users_mfa_desc' => 'Configure la autenticación de múltiples factores como una capa extra de seguridad para su cuenta de usuario.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar Métodos',
+    'users_mfa_reset' => 'Restablecer métodos de autenticación en dos pasos',
+    'users_mfa_reset_desc' => 'Esto restablecerá y borrará todos los métodos de autenticación en dos pasos configurados para este usuario. Si la autenticación en dos pasos es requerida por cualquiera de sus roles, se les pedirá que configuren nuevos métodos en su próximo inicio de sesión.',
+    'users_mfa_reset_confirm' => '¿Estás seguro de que deseas eliminar la autenticación en dos pasos para este usuario?',
 
     // API Tokens
     'user_api_token_create' => 'Crear token API',
@@ -359,7 +368,9 @@
         'ru' => 'Ruso',
         'sk' => 'Eslovaco',
         'sl' => 'Esloveno',
+        'sr' => 'Српски',
         'sv' => 'Sueco',
+        'th' => 'ภาษาไทย',
         'tr' => 'Turco',
         'uk' => 'Ucraniano',
         'uz' => 'O‘zbekcha',
diff --git a/lang/es_AR/validation.php b/lang/es_AR/validation.php
index db16845e030..f403f5ac3e2 100644
--- a/lang/es_AR/validation.php
+++ b/lang/es_AR/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'El :attribute solo puede contener letras y número.',
     'array'                => 'El :attribute debe de ser un array.',
     'backup_codes'         => 'El código suministrado no es válido o ya fue utilizado.',
+    'base64_uri_mime'      => 'El atributo :attribute debe ser una URI base64 válida que contenga datos de tipo mime :mime.',
     'before'               => 'El :attribute debe ser una fecha anterior a  :date.',
     'between'              => [
         'numeric' => 'El :attribute debe estar entre :min y :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'El campo :attribute debe ser true o false.',
     'confirmed'            => 'La confirmación de :attribute no concuerda.',
+    'current_password'     => 'Esto no coincide con su contraseña actual.',
     'date'                 => 'El :attribute no es una fecha válida.',
     'date_format'          => 'El :attribute no coincide con el formato :format.',
     'different'            => ':attribute y :other deben ser diferentes.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'El archivo no se pudo subir. Puede ser que el servidor no acepte archivos de este tamaño.',
 
     'zip_file' => 'El :attribute necesita hacer referencia a un archivo dentro del ZIP.',
+    'zip_file_size' => 'El archivo :attribute no debe exceder :size MB.',
     'zip_file_mime' => 'El :attribute necesita hacer referencia a un archivo de tipo :validTypes, encontrado :foundType.',
     'zip_model_expected' => 'Se esperaba un objeto de datos, pero se encontró ":type".',
     'zip_unique' => 'El :attribute debe ser único para el tipo de objeto dentro del ZIP.',
diff --git a/lang/et/activities.php b/lang/et/activities.php
index 3a86dcd8623..87d474880b3 100644
--- a/lang/et/activities.php
+++ b/lang/et/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Kasutaja on muudetud',
     'user_delete' => 'kustutas kasutaja',
     'user_delete_notification' => 'Kasutaja on kustutatud',
+    'user_mfa_reset' => 'lähtestas kasutaja MFA',
+    'user_mfa_reset_notification' => 'Mitmeastmelise autentimise meetodite lähestamine',
 
     // API Tokens
     'api_token_create' => 'lisas API tunnuse',
diff --git a/lang/et/auth.php b/lang/et/auth.php
index 014a9f858eb..5253d1638ee 100644
--- a/lang/et/auth.php
+++ b/lang/et/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Kasutajanimi ja parool ei klapi.',
     'throttle' => 'Liiga palju sisselogimiskatseid. Proovi uuesti :seconds sekundi pärast.',
+    'mfa_throttle' => 'Liiga palju mitmeastmelise kinnituse katseid. Proovi uuesti :seconds sekundi pärast.',
 
     // Login & Register
     'sign_up' => 'Registreeru',
@@ -20,6 +21,9 @@
     'username' => 'Kasutajanimi',
     'email' => 'E-post',
     'password' => 'Parool',
+    'password_new' => 'Uus parool',
+    'password_new_confirm' => 'Kinnita uus parool',
+    'password_current' => 'Kinnita praegune parool',
     'password_confirm' => 'Kinnita parool',
     'password_hint' => 'Peab olema vähemalt 8 tähemärki pikk',
     'forgot_password' => 'Unustasid parooli?',
diff --git a/lang/et/common.php b/lang/et/common.php
index 580cdf133c4..b9e8b1fec9f 100644
--- a/lang/et/common.php
+++ b/lang/et/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Mitteaktiivne',
     'never' => 'Mitte kunagi',
     'none' => 'Puudub',
+    'move_left' => 'Liiguta vasakule',
+    'move_right' => 'Liiguta paremale',
 
     // Header
     'homepage' => 'Avaleht',
diff --git a/lang/et/entities.php b/lang/et/entities.php
index 323985b2d4a..ec2fc183361 100644
--- a/lang/et/entities.php
+++ b/lang/et/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Liiguta raamatu sees peatükke ja lehti, et selle sisu ümber organiseerida. Saad lisada teisi raamatuid, mis võimaldab peatükke ja lehti lihtsasti raamatute vahel liigutada. Lisaks saad määrata automaatse sorteerimise reegli, et selle raamatu sisu muudatuste puhul automaatselt järjestada.',
     'books_sort_auto_sort' => 'Automaatne sorteerimine',
     'books_sort_auto_sort_active' => 'Automaatne sorteerimine aktiivne: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Automaatse sorteerimise reegleid saab lisada vajalike õigustega kasutaja "Loendid ja järjestamine" seadetes.',
     'books_sort_named' => 'Sorteeri raamat :bookName',
     'books_sort_name' => 'Sorteeri nime järgi',
     'books_sort_created' => 'Sorteeri loomisaja järgi',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Kuva/peida külgriba',
+    'page_contents' => 'Lehe sisu',
+    'page_contents_none' => 'Lehe sisus ei leitud ühtegi pealkirja.',
+    'page_contents_info' => 'Sisukord genereeritakse automaatselt lehel kasutatud pealkirjavormingutest.',
     'page_tags' => 'Lehe sildid',
     'chapter_tags' => 'Peatüki sildid',
     'book_tags' => 'Raamatu sildid',
diff --git a/lang/et/errors.php b/lang/et/errors.php
index 49e755fccf1..78a9d8c47fb 100644
--- a/lang/et/errors.php
+++ b/lang/et/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIP-faili lugemine ebaõnnestus.',
     'import_zip_cant_decode_data' => 'ZIP-failist ei leitud data.json sisu.',
     'import_zip_no_data' => 'ZIP-failist ei leitud raamatute, peatükkide või lehtede sisu.',
+    'import_zip_data_too_large' => 'ZIP-faili data.json sisu ületab rakenduses seadistatud maksimaalse failisuuruse.',
     'import_validation_failed' => 'Imporditud ZIP-faili valideerimine ebaõnnestus vigadega:',
     'import_zip_failed_notification' => 'ZIP-faili importimine ebaõnnestus.',
     'import_perms_books' => 'Sul puuduvad õigused raamatute lisamiseks.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'API tunnusele lisatud salajane võti ei ole korrektne',
     'api_user_no_api_permission' => 'Selle API tunnuse omanikul ei ole õigust API päringuid teha',
     'api_user_token_expired' => 'Volitustunnus on aegunud',
+    'api_cookie_auth_only_get' => 'Küpsistega autentimisel on API kasutamisel lubatud ainult GET päringud',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Test e-kirja saatmisel tekkis viga:',
diff --git a/lang/et/notifications.php b/lang/et/notifications.php
index 0b5fc814c04..2843d5799b4 100644
--- a/lang/et/notifications.php
+++ b/lang/et/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Muudetud leht: :pageName',
     'updated_page_intro' => 'Rakenduses :appName muudeti lehte:',
     'updated_page_debounce' => 'Et vältida liigseid teavitusi, ei saadeta sulle mõnda aega teavitusi selle lehe muutmiste kohta sama kasutaja poolt.',
+    'comment_mention_subject' => 'Sind mainiti kommentaaris lehel: :pageName',
+    'comment_mention_intro' => 'Sind mainiti kommentaaris rakenduses :appName:',
 
     'detail_page_name' => 'Lehe nimetus:',
     'detail_page_path' => 'Lehe asukoht:',
diff --git a/lang/et/preferences.php b/lang/et/preferences.php
index f4ba5e6aed7..74f54607cc9 100644
--- a/lang/et/preferences.php
+++ b/lang/et/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Kiirklahvide eelistused on salvestatud!',
     'shortcuts_overview_desc' => 'Halda klaviatuuri kiirklahve süsteemi kasutajaliideses navigeerimiseks.',
 
+    'interface' => 'Kasutajaliidese eelistused',
+    'interface_desc' => 'Siit leiad valikud rakenduse kasutajaliidese välimuse kohandamiseks.',
+    'interface_display_mode' => 'Kuva režiim',
+    'interface_display_mode_desc' => 'Vali, kas rakendus peaks kasutama tumedat või heledat režiimi. Seda saab vahetada ka avavaatest või päises olevast profiili rippmenüüst.',
+    'layouts' => 'Kasutajaliidese paigutuse eelistused',
+    'layouts_desc' => 'Kohanda kasutajaliidese erinevates vaadetes kuvatavate sektsioonide paigutust.',
+    'layout_edit' => 'Muuda paigutust',
+    'layout_edit_desc' => 'Lohista sektsioone või kasuta iga sektsiooni küljes olevat menüüd, et määrata, milliseid sektsioone ja kus selles kasutajaliidese paigutuses kuvada.',
+    'layout_edit_column_hint' => 'Väiksematel ekraanidel kuvatakse parempoolseid sektsioone vasakpoolsete sektsioonide kohal.',
+    'layout_edit_save' => 'Salvesta paigutus',
+    'layout_edit_layouts' => 'Paigutused',
+    'layout_edit_back_to_preferences' => 'Tagasi eelistustesse',
+    'layout_edit_left' => 'Vasakul',
+    'layout_edit_right' => 'Paremal',
+    'layout_edit_center' => 'Keskel',
+    'layout_edit_unused' => 'Kasutamata',
+    'layout_edit_empty' => 'Pole sektsioone, mida kuvada',
+    'layout_edit_reset_to_defaults' => 'Taasta vaikesätted',
+    'layout_update_success' => 'Paigutuse eelistused on uuendatud!',
+    'layout_reset_success' => 'Paigutuse eelistused on lähtestatud!',
+
     'notifications' => 'Teavituste eelistused',
     'notifications_desc' => 'Halda e-posti teavitusi, mis saadetakse teatud tegevuste puhul.',
     'notifications_opt_own_page_changes' => 'Teavita muudatustest minu lehtedel',
     'notifications_opt_own_page_comments' => 'Teavita kommentaaridest minu lehtedel',
+    'notifications_opt_comment_mentions' => 'Teavita mind, kui mind kommentaaris mainitakse',
     'notifications_opt_comment_replies' => 'Teavita vastustest minu kommentaaridele',
     'notifications_save' => 'Salvesta eelistused',
     'notifications_update_success' => 'Teavituste eelistused on salvestatud!',
diff --git a/lang/et/settings.php b/lang/et/settings.php
index 003238cfebe..7114eebb237 100644
--- a/lang/et/settings.php
+++ b/lang/et/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Piirangut ei ole',
 
     // Sorting Settings
-    'sorting' => 'Sorteerimine',
-    'sorting_book_default' => 'Vaikimisi raamatu sorteerimine',
+    'sorting' => 'Loendid ja järjestamine',
+    'sorting_book_default' => 'Vaikimisi raamatute sorteerimise reegel',
     'sorting_book_default_desc' => 'Vali vaikimisi uutele raamatutele rakenduv sorteerimisreegel. See ei mõjuta olemasolevaid raamatuid ning seda saab raamatupõhiselt muuta.',
     'sorting_rules' => 'Sorteerimisreeglid',
     'sorting_rules_desc' => 'Need on eeldefineeritud sorteerimistoimingud, mida saab süsteemis olevale sisule rakendada.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Muutmise aeg',
     'sort_rule_op_chapters_first' => 'Peatükid eespool',
     'sort_rule_op_chapters_last' => 'Peatükid tagapool',
+    'sorting_page_limits' => 'Leheküljepõhised kuvalimiidid',
+    'sorting_page_limits_desc' => 'Vali, mitu objekti erinevates nimekirjades ühel lehel kuvada. Madalam väärtus tähendab reeglina paremat jõudlust, samas kui kõrgem väärtus väldib vajadust mitmeid lehti läbi klikkida. Soovituslik on kasutada 6-ga jaguvat väärtust.',
 
     // Maintenance settings
     'maint' => 'Hooldus',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Imporditud sisu',
     'role_editor_change' => 'Lehe redaktori muutmine',
     'role_notifications' => 'Võta vastu ja halda teavitusi',
+    'role_permission_note_users_and_roles' => 'Need õigused lubavad ka süsteemis olevaid kasutajaid ja rolle vaadata ja otsida.',
     'role_asset' => 'Sisu õigused',
     'roles_system_warning' => 'Pane tähele, et ülalolevad kolm õigust võimaldavad kasutajal enda või teiste kasutajate õiguseid muuta. Määra nende õigustega roll ainult usaldusväärsetele kasutajatele.',
     'role_asset_desc' => 'Need load kontrollivad vaikimisi ligipääsu süsteemis olevale sisule. Raamatute, peatükkide ja lehtede õigused rakenduvad esmajärjekorras.',
     'role_asset_admins' => 'Administraatoritel on automaatselt ligipääs kogu sisule, aga need valikud võivad peida või näidata kasutajaliidese elemente.',
     'role_asset_image_view_note' => 'See käib nähtavuse kohta pildifailide halduris. Tegelik ligipääs üleslaaditud pildifailidele sõltub süsteemsest piltide salvestamise valikust.',
+    'role_asset_users_note' => 'Need õigused lubavad ka süsteemis olevaid kasutajaid vaadata ja otsida.',
     'role_all' => 'Kõik',
     'role_own' => 'Enda omad',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Õigused määratud seotud objekti kaudu',
+    'role_controlled_by_page_delete' => 'Määratud lehe kustutamise õiguste kaudu',
     'role_save' => 'Salvesta roll',
     'role_users' => 'Selle rolliga kasutajad',
     'role_users_none' => 'Seda rolli ei ole hetkel ühelgi kasutajal',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Seadista mitmeastmeline autentimine, et oma kasutajakonto turvalisust tõsta.',
     'users_mfa_x_methods' => ':count meetod seadistatud|:count meetodit seadistatud',
     'users_mfa_configure' => 'Seadista meetodid',
+    'users_mfa_reset' => 'Lähtesta mitmeastmelise autentimise meetodid',
+    'users_mfa_reset_desc' => 'See lähestab kõik selle kasutaja seadistatud mitmeastmelise autentimise meetodid. Kui mõni tema rollidest nõuab mitmeastmelist autentimist, peab ta järgmisel sisselogimisel uued meetodid seadistama.',
+    'users_mfa_reset_confirm' => 'Kas oled kindel, et soovid selle kasutaja mitmeastmelise autentimise meetodid lähtestada?',
 
     // API Tokens
     'user_api_token_create' => 'Lisa API tunnus',
@@ -358,7 +367,9 @@
         'ru' => 'Русский (vene keel)',
         'sk' => 'Slovensky',
         'sl' => 'Sloveenia',
+        'sr' => 'Српски',
         'sv' => 'Rootsi',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türgi',
         'uk' => 'Ukraina',
         'uz' => 'O‘zbekcha',
diff --git a/lang/et/validation.php b/lang/et/validation.php
index 1354d1ed489..f19023efc07 100644
--- a/lang/et/validation.php
+++ b/lang/et/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute võib sisaldada ainult tähti ja numbreid.',
     'array'                => ':attribute peab olema massiiv.',
     'backup_codes'         => 'Kood ei ole korrektne või on seda juba kasutatud.',
+    'base64_uri_mime'      => ':attribute peab olema korrektne base64 URI, mis sisaldab :mime tüüpi andmeid.',
     'before'               => ':attribute peab olema kuupäev enne :date.',
     'between'              => [
         'numeric' => ':attribute peab jääma vahemikku :min ja :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute peab olema tõene või väär.',
     'confirmed'            => ':attribute kinnitus ei kattu.',
+    'current_password'     => 'See ei klapi su praeguse parooliga.',
     'date'                 => ':attribute ei ole kehtiv kuupäev.',
     'date_format'          => ':attribute ei ühti formaadiga :format.',
     'different'            => ':attribute ja :other peavad olema erinevad.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Faili üleslaadimine ebaõnnestus. Server ei pruugi sellise suurusega faile vastu võtta.',
 
     'zip_file' => ':attribute peab viitama failile ZIP-arhiivi sees.',
+    'zip_file_size' => 'Fail :attribute ei tohi olla suurem kui :size MB.',
     'zip_file_mime' => ':attribute peab viitama :validTypes tüüpi failile, leiti :foundType.',
     'zip_model_expected' => 'Oodatud andmete asemel leiti ":type".',
     'zip_unique' => ':attribute peab olema ZIP-arhiivi piires objekti tüübile unikaalne.',
diff --git a/lang/eu/activities.php b/lang/eu/activities.php
index 847014efe74..dadee1315d3 100644
--- a/lang/eu/activities.php
+++ b/lang/eu/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Erabiltzailea egoki eguneratua',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'Erabiltzailea egoki ezabatua',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/eu/auth.php b/lang/eu/auth.php
index 35cbafd721b..5b9dd6e00b1 100644
--- a/lang/eu/auth.php
+++ b/lang/eu/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Kredentzial hauek ez dira egokiak.',
     'throttle' => 'Login saiakera kopurua pasa duzu. Mesedez, saiatu berriz :seconds segundu barru.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Izena eman',
@@ -20,6 +21,9 @@
     'username' => 'Erabiltzaile izena',
     'email' => 'Eposta',
     'password' => 'Pasahitza',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Berretsi pasahitza',
     'password_hint' => 'Gutxienez 8 karaktere izan behar ditu',
     'forgot_password' => 'Pasahitza ahaztu duzu?',
diff --git a/lang/eu/common.php b/lang/eu/common.php
index f3696825e57..5b69ec78ac1 100644
--- a/lang/eu/common.php
+++ b/lang/eu/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktibo',
     'never' => 'Inoiz ez',
     'none' => 'Bat ere ez',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/eu/entities.php b/lang/eu/entities.php
index cc51012d50f..43277cc5500 100644
--- a/lang/eu/entities.php
+++ b/lang/eu/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Ordenatu :bookName liburua',
     'books_sort_name' => 'Ordenatu izenaren arabera',
     'books_sort_created' => 'Ordenatu argitaratze-dataren arabera',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Orrialde etiketak',
     'chapter_tags' => 'Kapitulu etiketak',
     'book_tags' => 'Liburu etiketak',
diff --git a/lang/eu/errors.php b/lang/eu/errors.php
index 2a747e5f8bb..5b011368ae6 100644
--- a/lang/eu/errors.php
+++ b/lang/eu/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/eu/notifications.php b/lang/eu/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/eu/notifications.php
+++ b/lang/eu/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/eu/preferences.php b/lang/eu/preferences.php
index da7638593b5..7f0f13455bc 100644
--- a/lang/eu/preferences.php
+++ b/lang/eu/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Zure lehentasunak gorde dira!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/eu/settings.php b/lang/eu/settings.php
index e93f3c96469..998f11ac2e7 100644
--- a/lang/eu/settings.php
+++ b/lang/eu/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Mugarik gabe',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Mantentze-lanak',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Fitxategi baimenak',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Guztiak',
     'role_own' => 'Norberarenak',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Gorde rol-a',
     'role_users' => 'Rol honetako erabiltzaileak',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Sortu Tokena',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/eu/validation.php b/lang/eu/validation.php
index f79dc852f3e..9524acd2f7d 100644
--- a/lang/eu/validation.php
+++ b/lang/eu/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute eremuak hizki eta zenbakiak solik izan ditzake.',
     'array'                => ':attribute array bat izan behar da.',
     'backup_codes'         => 'Kode hau ez da baliagarria edo iada erabilia izan da.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute :date baino berriagoa izan behar da.',
     'between'              => [
         'numeric' => ':min eta :max bitartean egon behar da :attribute.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute true edo false izan behar da.',
     'confirmed'            => ':attribute berrezpena ez da aurkitu.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute ez da baliozko data.',
     'date_format'          => ':attribute ez da :format formatuan aurkitu.',
     'different'            => ':attribute eta :other ezberdinak izan behar dira.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/fa/activities.php b/lang/fa/activities.php
index 07eb78f3709..85a2d72cbb6 100644
--- a/lang/fa/activities.php
+++ b/lang/fa/activities.php
@@ -36,8 +36,8 @@
     'book_update_notification'    => 'کتاب با موفقیت به روزرسانی شد',
     'book_delete'                 => 'حذف کتاب',
     'book_delete_notification'    => 'کتاب با موفقیت حذف شد',
-    'book_sort'                   => 'مرتب سازی کتاب',
-    'book_sort_notification'      => 'کتاب با موفقیت مرتب سازی شد',
+    'book_sort'                   => 'کتاب‌های مرتب‌شده',
+    'book_sort_notification'      => 'کتاب با موفقیت مجددا مرتب شد',
 
     // Bookshelves
     'bookshelf_create'            => 'ایجاد قفسه',
@@ -99,6 +99,8 @@
     'user_update_notification' => 'کاربر با موفقیت به روز شد',
     'user_delete' => 'کاربر حذف شده',
     'user_delete_notification' => 'کاربر با موفقیت حذف شد',
+    'user_mfa_reset' => 'بازنشانی احراز هویت چندمرحله ای برای کاربر',
+    'user_mfa_reset_notification' => 'بازنشانی روش‌های احراز هویت چندمرحله‌ای',
 
     // API Tokens
     'api_token_create' => 'ایجاد توکن API',
diff --git a/lang/fa/auth.php b/lang/fa/auth.php
index c92f5f22b8a..ae84ceb62cc 100644
--- a/lang/fa/auth.php
+++ b/lang/fa/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'مشخصات وارد شده با اطلاعات ما سازگار نیست.',
     'throttle' => 'دفعات تلاش شما برای ورود بیش از حد مجاز است. لطفا پس از :seconds ثانیه مجددا تلاش فرمایید.',
+    'mfa_throttle' => 'تلاش‌های تأیید هویت چندمرحله‌ای بیش از حد مجاز است. لطفاً پس از :seconds ثانیه دوباره تلاش کنید.',
 
     // Login & Register
     'sign_up' => 'ثبت نام',
@@ -20,6 +21,9 @@
     'username' => 'نام کاربری',
     'email' => 'پست الکترونیک',
     'password' => 'کلمه عبور',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'تایید کلمه عبور',
     'password_hint' => 'باید بیش از 8 کاراکتر باشد',
     'forgot_password' => 'کلمه عبور خود را فراموش کرده اید؟',
diff --git a/lang/fa/common.php b/lang/fa/common.php
index 49667a47c42..3cb42e34290 100644
--- a/lang/fa/common.php
+++ b/lang/fa/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'غیر فعال',
     'never' => 'هرگز',
     'none' => 'هیچکدام',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'صفحه اصلی',
diff --git a/lang/fa/editor.php b/lang/fa/editor.php
index a8b3d211a94..8a05571b845 100644
--- a/lang/fa/editor.php
+++ b/lang/fa/editor.php
@@ -42,13 +42,13 @@
     'callout_warning' => 'هشدار',
     'callout_danger' => 'خطر',
     'bold' => 'توپر',
-    'italic' => 'حروف کج(ایتالیک)',
+    'italic' => 'ایتالیک',
     'underline' => 'زیرخط',
     'strikethrough' => 'خط خورده',
     'superscript' => 'بالانویسی',
     'subscript' => 'پایین نویسی',
     'text_color' => 'رنگ متن',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'رنگ هایلایت',
     'custom_color' => 'رنگ دلخواه',
     'remove_color' => 'حذف رنگ',
     'background_color' => 'رنگ زمینه',
diff --git a/lang/fa/entities.php b/lang/fa/entities.php
index 34a12689afc..7533edd43f8 100644
--- a/lang/fa/entities.php
+++ b/lang/fa/entities.php
@@ -6,10 +6,10 @@
 return [
 
     // Shared
-    'recently_created' => 'اخیرا ایجاد شده',
-    'recently_created_pages' => 'صفحات اخیرا ایجاد شده',
-    'recently_updated_pages' => 'صفحاتی که اخیرا روزآمد شده‌اند',
-    'recently_created_chapters' => 'فصل های اخیرا ایجاد شده',
+    'recently_created' => 'تازه ایجاد شده',
+    'recently_created_pages' => 'صفحه‌های تازه ایجاد شده',
+    'recently_updated_pages' => 'صفحه‌های تازه به‌روزرسانی‌شده',
+    'recently_created_chapters' => 'فصل‌های تازه ایجاد شده',
     'recently_created_books' => 'کتاب های اخیرا ایجاد شده',
     'recently_created_shelves' => 'قفسه کتاب های اخیرا ایجاد شده',
     'recently_update' => 'اخیرا به روز شده',
@@ -39,13 +39,13 @@
     'export_pdf' => 'فایل PDF',
     'export_text' => 'پرونده متنی ساده',
     'export_md' => 'راهنما مارک‌دون',
-    'export_zip' => 'فایل فشرده‌ی قابل‌حمل (ZIP)',
+    'export_zip' => 'فایل فشرده‌ی زیپ',
     'default_template' => 'قالب پیش‌فرض صفحه',
     'default_template_explain' => 'قالبی برای صفحه تعیین کنید که به‌عنوان محتوای پیش‌فرض در تمام صفحاتی که در این مورد ایجاد می‌شوند، به‌کار رود. توجه داشته باشید این قالب تنها در صورتی اعمال می‌شود که سازندهٔ صفحه به صفحهٔ قالب انتخاب‌شده دسترسی نمایشی داشته باشد.',
     'default_template_select' => 'انتخاب صفحهٔ قالب',
     'import' => 'وارد کردن',
     'import_validate' => 'اعتبارسنجی آیتم‌های واردشده',
-    'import_desc' => 'می‌توانید کتاب‌ها، فصل‌ها و صفحات را با استفاده از یک فایل فشرده (ZIP) که از همین سامانه یا نمونه‌ای دیگر استخراج شده، وارد کنید. برای ادامه، یک فایل ZIP انتخاب نمایید. پس از بارگذاری و اعتبارسنجی فایل، در مرحله بعد می‌توانید تنظیمات انتقال را انجام داده و انتقال را تأیید کنید.',
+    'import_desc' => 'می‌توانید کتاب‌ها، فصل‌ها و صفحه‌ها را با استفاده از یک فایل فشردهٔ ZIP وارد کنید که از همین سامانه یا نمونه‌ای دیگر استخراج شده است. برای ادامه، فایل ZIP را انتخاب و بارگذاری کنید. پس از بارگذاری و اعتبارسنجی، در مرحلهٔ بعد می‌توانید تنظیمات ورود را انجام داده و آن را تأیید کنید.',
     'import_zip_select' => 'انتخاب فایل ZIP برای بارگذاری',
     'import_zip_validation_errors' => 'هنگام اعتبارسنجی فایل ZIP ارائه‌شده، خطاهایی شناسایی شد:',
     'import_pending' => 'ورودی‌های در انتظار انتقال',
@@ -54,25 +54,25 @@
     'import_continue_desc' => 'محتوای فایل ZIP بارگذاری‌شده را که قرار است وارد سامانه شود، مرور کنید. پس از اطمینان از صحت آن، انتقال را آغاز نمایید تا محتوا به این سامانه افزوده شود. توجه داشته باشید که پس از انتقال موفق، فایل ZIP بارگذاری‌شده به‌صورت خودکار حذف خواهد شد.',
     'import_details' => 'جزئیات انتقال ورودی',
     'import_run' => 'شروع فرایند انتقال ورودی',
-    'import_size' => 'حجم فایل ZIP واردشده: :size',
-    'import_uploaded_at' => 'زمان بارگذاری: :relativeTime',
-    'import_uploaded_by' => 'بارگذاری شده توسط:',
+    'import_size' => 'حجم فایل ZIP واردشده:size',
+    'import_uploaded_at' => 'زمان بارگذاری:relativeTime',
+    'import_uploaded_by' => 'بارگذاری شده توسط',
     'import_location' => 'مکان انتقال',
     'import_location_desc' => 'برای محتوای واردشده، مقصدی انتخاب کنید. برای ایجاد محتوا در آن مقصد، داشتن مجوزهای لازم ضروری است.',
     'import_delete_confirm' => 'مطمئن هستید که می‌خواهید آیتم واردشده را حدف کنید؟',
     'import_delete_desc' => 'با انجام این کار، فایل ZIP واردشده حذف می‌شود و این عمل بازگشت‌ناپذیر است.',
     'import_errors' => 'خطای انتقال ورودی',
     'import_errors_desc' => 'در جریان تلاش برای انتقال ورودی، خطاهای زیر رخ داد:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'پیمایش صفحات هم‌سطح',
+    'breadcrumb_siblings_for_chapter' => 'پیمایش فصل‌های هم‌سطح',
+    'breadcrumb_siblings_for_book' => 'پیمایش کتاب‌های هم‌سطح',
+    'breadcrumb_siblings_for_bookshelf' => 'پیمایش قفسه‌های هم‌سطح',
 
     // Permissions and restrictions
     'permissions' => 'مجوزها',
     'permissions_desc' => 'مجوزها را در اینجا تنظیم کنید تا مجوزهای پیش فرض تنظیم شده برای نقش های کاربر را لغو کنید.',
-    'permissions_book_cascade' => 'مجوزهای تنظیم‌شده روی کتاب‌ها به‌طور خودکار به فصل‌ها و صفحات داخل آن اختصاص داده می‌شوند، مگر اینکه مجوزهای اختصاصی برای آن‌ها (فصل‌ها و صفحات) تعریف شده باشد.',
-    'permissions_chapter_cascade' => 'مجوزهای تنظیم‌شده روی فصل‌ها به‌طور خودکار به صفحات داخل آن اختصاص داده می‌شوند، مگر اینکه مجوزهای اختصاصی برای آن‌ها (صفحات) تعریف شده باشد.',
+    'permissions_book_cascade' => 'مجوزهای تنظیم‌شده روی کتاب‌ها به‌طور خودکار به فصل‌ها و صفحات داخل آن اختصاص داده می‌شوند، مگر اینکه مجوزهای اختصاصی برای آن‌ها تعریف شده باشد.',
+    'permissions_chapter_cascade' => 'مجوزهای تنظیم‌شده روی فصل‌ها به‌طور خودکار به صفحات داخل آن اختصاص داده می‌شوند، مگر اینکه مجوزهای اختصاصی برای آن‌ها تعریف شده باشد.',
     'permissions_save' => 'ذخيره مجوزها',
     'permissions_owner' => 'مالک',
     'permissions_role_everyone_else' => 'سایر کاربران',
@@ -82,7 +82,7 @@
 
     // Search
     'search_results' => 'نتایج جستجو',
-    'search_total_results_found' => 'نتیجه یافت شد :count | نتایج یافت شده :count',
+    'search_total_results_found' => 'نتیجه یافت شد:count | نتایج یافت شده:count',
     'search_clear' => 'پاک کردن جستجو',
     'search_no_pages' => 'هیچ صفحه ای با این جستجو مطابقت ندارد',
     'search_for_term' => 'جستجو برای :term',
@@ -155,7 +155,7 @@
     'books_delete' => 'حذف کتاب',
     'books_delete_named' => 'حذف کتاب:bookName',
     'books_delete_explain' => 'با این کار کتابی با نام \':bookName\' حذف می شود. تمام صفحات و فصل ها حذف خواهند شد.',
-    'books_delete_confirmation' => 'آیا مطمئن هستید که می خواهید این کتاب را حذف کنید؟',
+    'books_delete_confirmation' => 'آیا مطمئن هستید که می خواهید این کتاب را حذف کنید?',
     'books_edit' => 'ویرایش کتاب',
     'books_edit_named' => 'ویرایش کتاب:bookName',
     'books_form_book_name' => 'نام کتاب',
@@ -169,14 +169,15 @@
     'books_permissions_active' => 'مجوزهای کتاب فعال است',
     'books_search_this' => 'این کتاب را جستجو کنید',
     'books_navigation' => 'ناوبری کتاب',
-    'books_sort' => 'مرتب سازی مطالب کتاب',
+    'books_sort' => 'مرتب‌سازی مطالب کتاب',
     'books_sort_desc' => 'برای سامان‌دهی محتوای یک کتاب، می‌توانید فصل‌ها و صفحات آن را جابه‌جا کنید. همچنین می‌توانید کتاب‌های دیگری بیفزایید تا جابه‌جایی فصل‌ها و صفحات میان کتاب‌ها آسان شود. در صورت تمایل، می‌توانید قاعده‌ای برای مرتب‌سازی خودکار تعیین کنید تا محتوای کتاب در صورت ایجاد تغییرات، به طور خودکار مرتب شود.',
     'books_sort_auto_sort' => 'گزینه مرتب‌سازی خودکار',
     'books_sort_auto_sort_active' => 'مرتب‌سازی خودکار با قاعده: :sortName فعال است',
+    'books_sort_auto_sort_creation_hint' => 'قوانین گزینه‌ی مرتب‌سازی خودکار را می‌توان توسط کاربری که دسترسی‌های لازم را دارد، در بخش تنظیمات "فهرست‌ها و مرتب‌سازی" ایجاد کرد.',
     'books_sort_named' => 'مرتب‌سازی کتاب:bookName',
-    'books_sort_name' => 'مرتب سازی بر اساس نام',
-    'books_sort_created' => 'مرتب سازی بر اساس تاریخ ایجاد',
-    'books_sort_updated' => 'مرتب سازی بر اساس تاریخ به روز رسانی',
+    'books_sort_name' => 'مرتب‌سازی بر اساس نام',
+    'books_sort_created' => 'مرتب‌سازی بر اساس تاریخ ایجاد',
+    'books_sort_updated' => 'مرتب‌سازی بر اساس تاریخ به روز رسانی',
     'books_sort_chapters_first' => 'فصل اول',
     'books_sort_chapters_last' => 'فصل آخر',
     'books_sort_show_other' => 'نمایش کتاب‌های دیگر',
@@ -234,9 +235,7 @@
     'pages_delete_draft' => 'حذف صفحه پیش نویس',
     'pages_delete_success' => 'صفحه حذف شد',
     'pages_delete_draft_success' => 'صفحه پیش نویس حذف شد',
-    'pages_delete_warning_template' => 'این صفحه هم‌اکنون به‌عنوان قالب پیش‌فرض صفحه برای یک کتاب یا فصل در حال استفاده است. پس از حذف این صفحه، کتاب‌ها یا فصل‌های مربوطه دیگر قالب پیش‌فرض صفحه نخواهند داشت.
-
-',
+    'pages_delete_warning_template' => 'این صفحه هم‌اکنون به‌عنوان قالب پیش‌فرض صفحه برای یک کتاب یا فصل در حال استفاده است. پس از حذف این صفحه، کتاب‌ها یا فصل‌های مربوط دیگر قالب پیش‌فرض صفحه نخواهند داشت.',
     'pages_delete_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه را حذف کنید؟',
     'pages_delete_draft_confirm' => 'آیا مطمئن هستید که می خواهید این صفحه پیش نویس را حذف کنید؟',
     'pages_editing_named' => 'ویرایش صفحه :pageName',
@@ -245,7 +244,7 @@
     'pages_edit_draft' => 'ویرایش پیش نویس صفحه',
     'pages_editing_draft' => 'در حال ویرایش پیش نویس',
     'pages_editing_page' => 'در حال ویرایش صفحه',
-    'pages_edit_draft_save_at' => 'پیش نویس ذخیره شده در',
+    'pages_edit_draft_save_at' => 'پیش نویس ذخیره شده در ',
     'pages_edit_delete_draft' => 'حذف پیش نویس',
     'pages_edit_delete_draft_confirm' => 'آیا از حذف تغییرات صفحه پیش‌نویس اطمینان دارید؟ تمامی تغییرات‌تان، از آخرین ذخیره‌سازی کامل، از بین خواهد رفت و ویرایش‌گر به آخرین وضعیت پیش‌نویس ذخیره شده بازگردانی خواهد شد.',
     'pages_edit_discard_draft' => 'دور انداختن پیش نویس',
@@ -253,8 +252,7 @@
     'pages_edit_switch_to_markdown_clean' => '(مطالب تمیز)',
     'pages_edit_switch_to_markdown_stable' => '(محتوای پایدار)',
     'pages_edit_switch_to_wysiwyg' => 'به ویرایشگر WYSIWYG بروید',
-    'pages_edit_switch_to_new_wysiwyg' => 'تغییر به ویرایشگر جدید WYSIWYG
-(ویرایشگر WYSIWYG: «آنچه می‌بینید همان است که به‌دست می‌آورید»)',
+    'pages_edit_switch_to_new_wysiwyg' => 'تغییر به ویرایشگر جدید WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg_desc' => '(در مرحله آزمایش بتا)',
     'pages_edit_set_changelog' => 'تنظیم تغییرات',
     'pages_edit_enter_changelog_desc' => 'توضیح مختصری از تغییراتی که ایجاد کرده اید وارد کنید',
@@ -275,7 +273,7 @@
     'pages_md_insert_drawing' => 'درج طرح',
     'pages_md_show_preview' => 'دیدن پیش نمایش',
     'pages_md_sync_scroll' => 'هماهنگ سازی اسکرول پیش نمایش',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'ویرایشگر متن ساده',
     'pages_drawing_unsaved' => 'نقاشی ذخیره نشده پیدا شد',
     'pages_drawing_unsaved_confirm' => 'نسخه‌ای ذخیره‌نشده از طراحی‌های قبلی پیدا شد. آیا می‌خواهید این طراحی ذخیره‌نشده را بازیابی کنید و به ویرایش آن ادامه دهید؟',
     'pages_not_in_chapter' => 'صفحه در یک فصل نیست',
@@ -333,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'نمایش/پنهان‌سازی نوار کناری',
+    'page_contents' => 'محتوای صفحه',
+    'page_contents_none' => 'هیچ سرتیتری در محتوای صفحه یافت نشد.',
+    'page_contents_info' => 'منوی محتوا از هر سرتیتری که در صفحه استفاده شده باشد تولید می شود.',
     'page_tags' => 'برچسب‌های صفحه',
     'chapter_tags' => 'برچسب‌های فصل',
     'book_tags' => 'برچسب های کتاب',
diff --git a/lang/fa/errors.php b/lang/fa/errors.php
index 9d5257fcf79..94c268793a7 100644
--- a/lang/fa/errors.php
+++ b/lang/fa/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'امکان ایجاد کاربر وجود ندارد؛ زیرا ارسال ایمیل دعوت با خطا مواجه شد.',
     'import_zip_cant_decode_data' => 'محتوای data.json در فایل ZIP پیدا یا رمزگشایی نشد.',
     'import_zip_no_data' => 'داده‌های فایل ZIP فاقد محتوای کتاب، فصل یا صفحه مورد انتظار است.',
+    'import_zip_data_too_large' => 'محتوای فایل ZIP data.json از حداکثر حجم آپلود مجازِ تعیین‌شده در برنامه بیشتر است.',
     'import_validation_failed' => 'اعتبارسنجی فایل ZIP واردشده با خطا مواجه شد:',
     'import_zip_failed_notification' => ' فایل ZIP وارد نشد.',
     'import_perms_books' => 'شما مجوز لازم برای ایجاد کتاب را ندارید.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'راز ارائه شده برای کد API استفاده شده نادرست است',
     'api_user_no_api_permission' => 'مالک نشانه API استفاده شده اجازه برقراری تماس های API را ندارد',
     'api_user_token_expired' => 'رمز مجوز استفاده شده منقضی شده است',
+    'api_cookie_auth_only_get' => 'برای استفاده از API با احراز هویت مبتنی بر cookie فقط درخواست GET مجاز است',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'خطا در هنگام ارسال ایمیل آزمایشی:',
diff --git a/lang/fa/notifications.php b/lang/fa/notifications.php
index 4595fd8252a..b602095860c 100644
--- a/lang/fa/notifications.php
+++ b/lang/fa/notifications.php
@@ -11,9 +11,11 @@
     'updated_page_subject' => 'صفحه جدید: :pageName',
     'updated_page_intro' => 'یک صفحه جدید ایجاد شده است در :appName:',
     'updated_page_debounce' => 'برای جلوگیری از انبوه اعلان‌ها، برای مدتی اعلان‌ ویرایش‌هایی که توسط همان ویرایشگر در این صفحه انجام می‌شود، ارسال نخواهد شد.',
+    'comment_mention_subject' => 'شما در نظرات صفحه :pageName تگ شده‌اید',
+    'comment_mention_intro' => 'شما در نظری در :appName: تگ شده اید:',
 
     'detail_page_name' => 'نام صفحه:',
-    'detail_page_path' => 'نام میسر صفحه:',
+    'detail_page_path' => 'نام مسیر صفحه:',
     'detail_commenter' => 'نظر دهنده:',
     'detail_comment' => 'نظر:',
     'detail_created_by' => 'ایجاد شده توسط:',
diff --git a/lang/fa/preferences.php b/lang/fa/preferences.php
index ceecedc8033..1fdd0a5ebec 100644
--- a/lang/fa/preferences.php
+++ b/lang/fa/preferences.php
@@ -9,7 +9,7 @@
 
     'shortcuts' => 'میانبرها',
     'shortcuts_interface' => 'تنظیمات کلید‌های میانبر رابط کاربری',
-    'shortcuts_toggle_desc' => 'در اینجا می توانید میانبرهای سیستم را که برای پیمایش و ... استفاده می شود، فعال یا غیرفعال کنید.',
+    'shortcuts_toggle_desc' => 'در اینجا می توانید میانبرهای سیستم را که برای پیمایش و... استفاده می شود، فعال یا غیرفعال کنید.',
     'shortcuts_customize_desc' => 'می توانید هر یک از میانبرهای زیر را سفارشی کنید. کافی است پس از انتخاب ورودی برای میانبر، کلید ترکیبی مورد نظر خود را فشار دهید.',
     'shortcuts_toggle_label' => 'میانبرهای صفحه کلید فعال شد',
     'shortcuts_section_navigation' => 'ناوبری و پیمایش',
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'تنظیمات میانبر به روز شده است!',
     'shortcuts_overview_desc' => 'مدیریت میانبرهای صفحه کلید برای پیمایش در رابط کاربری سیستم.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'تنظیمات اطلاع‌رسانی',
     'notifications_desc' => 'تنظیمات اطلاعیه‌های ایمیلی هنگام انجام فعالیت‌های خاص در سیستم.',
     'notifications_opt_own_page_changes' => 'در صورت تغییرات در صفحاتی که متعلق به من است، اطلاع بده',
     'notifications_opt_own_page_comments' => 'در صورت ثبت نظر در صفحاتی که متعلق به من است، اطلاع بده',
+    'notifications_opt_comment_mentions' => 'وقتی که من در یک نظر تگ شده ام اطلاع بده',
     'notifications_opt_comment_replies' => 'پس از درج پاسخ به روی نظراتی که من ثبت کرده‌ام، اطلاع بده',
     'notifications_save' => 'ذخیره تنظیمات',
     'notifications_update_success' => 'تنظیمات اعلان‌ها به روز شده است!',
@@ -35,7 +57,7 @@
     'auth_change_password_success' => 'رمز عبور به روز شد!',
 
     'profile' => 'جزئیات پروفایل',
-    'profile_desc' => 'علاوه بر جزئیاتی که برای ارتباط و شخصی‌سازی سیستم استفاده می‌شود، جزییات حساب خود را که نشان دهنده شما برای سایر کاربران است، مدیریت کنید.',
+    'profile_desc' => 'علاوه بر جزئیاتی که برای ارتباط و شخصی‌سازی سیستم استفاده می‌شود، جزئیات حساب خود را که نشان دهنده شما برای سایر کاربران است، مدیریت کنید.',
     'profile_view_public' => 'مشاهده پروفایل عمومی',
     'profile_name_desc' => 'نام نمایشی خود را تنظیم کنید. این نام بسته به فعالیت شما و محتوای متعلق به شما، برای سایر کاربران سیستم قابل مشاهده است.',
     'profile_email_desc' => 'این ایمیل برای اعلان‌ها و دسترسی به سیستم استفاده خواهد شد.',
diff --git a/lang/fa/settings.php b/lang/fa/settings.php
index e4cb9018ebf..60a7b8417b6 100644
--- a/lang/fa/settings.php
+++ b/lang/fa/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'بدون محدودیت',
 
     // Sorting Settings
-    'sorting' => 'مرتب‌سازی',
-    'sorting_book_default' => 'مرتب‌سازی پیش‌فرض کتاب',
+    'sorting' => 'فهرست‌ها و مرتب‌سازی',
+    'sorting_book_default' => 'قانون پیش‌فرض مرتب‌سازی کتاب',
     'sorting_book_default_desc' => 'قانون پیش‌فرض مرتب‌سازی را برای کتاب‌های جدید انتخاب کنید. تغییر قانون بر ترتیب کتاب‌های موجود تأثیری ندارد و می‌تواند برای هر کتاب به‌صورت جداگانه تغییر یابد.',
     'sorting_rules' => 'قوانین مرتب‌سازی',
     'sorting_rules_desc' => 'این‌ها عملیات مرتب‌سازی از پیش تعریف‌شده‌ای هستند که می‌توانید آن‌ها را بر محتوای سیستم اعمال کنید.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'تاریخ به‌روزرسانی',
     'sort_rule_op_chapters_first' => 'ابتدا فصل‌ها',
     'sort_rule_op_chapters_last' => 'فصل‌ها در آخر',
+    'sorting_page_limits' => 'محدودیت نمایش در هر صفحه',
+    'sorting_page_limits_desc' => 'تعیین کنید که چه تعداد آیتم در فهرست‌های مختلف سیستم در هر صفحه نمایش داده شود. معمولاً مقدار کمتر عملکرد بهتری خواهد داشت، در حالی که مقدار بیشتر نیاز به کلیک کردن در صفحات متعدد را از بین می‌برد. استفاده از ضریبی از ۶ توصیه می‌شود.',
 
     // Maintenance settings
     'maint' => 'نگهداری',
@@ -195,14 +197,18 @@
     'role_import_content' => 'وارد کردن محتوا',
     'role_editor_change' => 'تغییر ویرایشگر صفحه',
     'role_notifications' => 'دریافت و مدیریت اعلان‌ها',
+    'role_permission_note_users_and_roles' => 'این دسترسی ها از نظر فنی امکان مشاهده و جستجوی کاربران و نقش ها را در سیستم فراهم می کنند.',
     'role_asset' => 'مجوزهای دارایی',
     'roles_system_warning' => 'توجه داشته باشید که دسترسی به هر یک از سه مجوز فوق می‌تواند به کاربر اجازه دهد تا امتیازات خود یا امتیازات دیگران را در سیستم تغییر دهد. فقط نقش هایی را با این مجوزها به کاربران مورد اعتماد اختصاص دهید.',
     'role_asset_desc' => 'این مجوزها دسترسی پیش‌فرض به دارایی‌های درون سیستم را کنترل می‌کنند. مجوزهای مربوط به کتاب‌ها، فصل‌ها و صفحات این مجوزها را لغو می‌کنند.',
     'role_asset_admins' => 'به ادمین‌ها به‌طور خودکار به همه محتوا دسترسی داده می‌شود، اما این گزینه‌ها ممکن است گزینه‌های UI را نشان داده یا پنهان کنند.',
     'role_asset_image_view_note' => 'این مربوط به مرئی بودن در بخش مدیر تصاویر است. دسترسی عملی به تصاویر آپلود شده بستگی به گزینه ذخیره‌سازی تصویر سیستم دارد.',
+    'role_asset_users_note' => 'این دسترسی ها از نظر فنی امکان مشاهده و جستجوی کاربران و نقش ها را در سیستم فراهم می کنند.',
     'role_all' => 'همه',
     'role_own' => 'صاحب',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'توسط دارایی که در آن آپلود می شود کنترل می شود',
+    'role_controlled_by_page_delete' => 'کنترل شده با دسترسی حذف صفحه',
     'role_save' => 'ذخیره نقش',
     'role_users' => 'کاربران در این نقش',
     'role_users_none' => 'در حال حاضر هیچ کاربری به این نقش اختصاص داده نشده است',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'تنظیم احراز هویت چند مرحله ای یک لایه امنیتی دیگر به حساب شما اضافه میکند.',
     'users_mfa_x_methods' => ':count روش پیکربندی شده است|:count روش های پیکربندی شده',
     'users_mfa_configure' => 'روش پیکربندی',
+    'users_mfa_reset' => 'بازنشانی روش های احراز هویت چندمرحله ای',
+    'users_mfa_reset_desc' => 'این کار تمام روش‌های احراز هویت چندمرحله‌ای پیکربندی‌شده برای این کاربر را بازنشانی و پاک می‌کند. اگر احراز هویت چندمرحله‌ای توسط هر یک از نقش‌های آن‌ها الزامی شده باشد، در ورود بعدی از آن‌ها خواسته می‌شود که روش‌های جدیدی را پیکربندی کنند.',
+    'users_mfa_reset_confirm' => 'آیا شما از بازنشانی احراز هویت چندمرحله ای برای این کاربر اطمینان دارید؟',
 
     // API Tokens
     'user_api_token_create' => 'ایجاد توکن API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/fa/validation.php b/lang/fa/validation.php
index e1c69ece9a1..f6641234559 100644
--- a/lang/fa/validation.php
+++ b/lang/fa/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute باید فقط حروف الفبا و اعداد باشد.',
     'array'                => ':attribute باید آرایه باشد.',
     'backup_codes'         => 'کد ارائه شده معتبر نیست یا قبلا استفاده شده است.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute باید تاریخی قبل از :date باشد.',
     'between'              => [
         'numeric' => ':attribute باید بین :min و :max باشد.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute فقط می‌تواند true و یا false باشد.',
     'confirmed'            => ':attribute با فیلد تکرار مطابقت ندارد.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute یک تاریخ معتبر نیست.',
     'date_format'          => ':attribute با الگوی :format مطابقت ندارد.',
     'different'            => ':attribute و :other باید از یکدیگر متفاوت باشند.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'بارگذاری فایل :attribute موفقیت آمیز نبود.',
 
     'zip_file' => 'ویژگی :attribute باید به یک فایل درون پرونده فشرده شده اشاره کند.',
+    'zip_file_size' => 'حجم فایل :attribute نباید بیشتر از :size مگابایت باشد.',
     'zip_file_mime' => 'ویژگی :attribute باید به فایلی با نوع :validTypes اشاره کند، اما نوع یافت‌شده :foundType است.',
     'zip_model_expected' => 'سیستم در این بخش انتظار دریافت یک شیء داده‌ای را داشت، اما «:type» دریافت گردید',
     'zip_unique' => 'برای هر نوع شیء در فایل ZIP، مقدار ویژگی :attribute باید یکتا و بدون تکرار باشد.',
diff --git a/lang/fi/activities.php b/lang/fi/activities.php
index a5ee14906ef..95c192e229f 100644
--- a/lang/fi/activities.php
+++ b/lang/fi/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Käyttäjä päivitettiin onnistuneesti',
     'user_delete' => 'poisti käyttäjän',
     'user_delete_notification' => 'Käyttäjä poistettiin onnistuneesti',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'loi API-tunnisteen',
diff --git a/lang/fi/auth.php b/lang/fi/auth.php
index 580c8679726..f9a62579e5d 100644
--- a/lang/fi/auth.php
+++ b/lang/fi/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Annettuja käyttäjätietoja ei löydy.',
     'throttle' => 'Liikaa kirjautumisyrityksiä. Yritä uudelleen :seconds sekunnin päästä.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Rekisteröidy',
@@ -20,6 +21,9 @@
     'username' => 'Käyttäjätunnus',
     'email' => 'Sähköposti',
     'password' => 'Salasana',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Vahvista salasana',
     'password_hint' => 'Tulee olla vähintään 8 merkkiä',
     'forgot_password' => 'Unohditko salasanan?',
diff --git a/lang/fi/common.php b/lang/fi/common.php
index e05f40f44e6..895fd3fab5a 100644
--- a/lang/fi/common.php
+++ b/lang/fi/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Ei aktiivinen',
     'never' => 'Ei koskaan',
     'none' => 'Ei mitään',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Kotisivu',
diff --git a/lang/fi/entities.php b/lang/fi/entities.php
index c64621f0d12..db53669bbae 100644
--- a/lang/fi/entities.php
+++ b/lang/fi/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Järjestä kirja :bookName',
     'books_sort_name' => 'Järjestä nimen mukaan',
     'books_sort_created' => 'Järjestä luontipäiväyksen mukaan',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Näytä/piilota sivupalkki',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Sivun tunnisteet',
     'chapter_tags' => 'Lukujen tunnisteet',
     'book_tags' => 'Kirjojen tunnisteet',
diff --git a/lang/fi/errors.php b/lang/fi/errors.php
index 9af7490d521..a51edf5bec9 100644
--- a/lang/fi/errors.php
+++ b/lang/fi/errors.php
@@ -110,6 +110,7 @@
     'import_zip_cant_read' => 'ZIP-tiedostoa ei voitu lukea.',
     'import_zip_cant_decode_data' => 'ZIP-tiedoston data.json sisältöä ei löydy eikä sitä voitu purkaa.',
     'import_zip_no_data' => 'ZIP-tiedostoilla ei ole odotettua kirjaa, lukua tai sivun sisältöä.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Tuonti ZIP epäonnistui virheiden kanssa:',
     'import_zip_failed_notification' => 'ZIP-tiedoston tuominen epäonnistui.',
     'import_perms_books' => 'Sinulla ei ole tarvittavia oikeuksia luoda kirjoja.',
@@ -125,6 +126,7 @@
     'api_incorrect_token_secret' => 'API-tunnisteelle annettu salainen avain on virheellinen',
     'api_user_no_api_permission' => 'Käytetyn API-tunnisteen omistajalla ei ole oikeutta tehdä API-kutsuja',
     'api_user_token_expired' => 'Käytetty valtuutuskoodi on vanhentunut',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Virhe testisähköpostia lähetettäessä:',
diff --git a/lang/fi/notifications.php b/lang/fi/notifications.php
index a737ad7d9b4..647378ded83 100644
--- a/lang/fi/notifications.php
+++ b/lang/fi/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Päivitetty sivu: :pageName',
     'updated_page_intro' => 'Sivu on päivitetty sivustolla :appName:',
     'updated_page_debounce' => 'Useiden ilmoitusten välttämiseksi sinulle ei toistaiseksi lähetetä ilmoituksia saman toimittajan tekemistä uusista muokkauksista tälle sivulle.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Sivun nimi:',
     'detail_page_path' => 'Sivun polku:',
diff --git a/lang/fi/preferences.php b/lang/fi/preferences.php
index 25cd76bf781..476e1d07ab6 100644
--- a/lang/fi/preferences.php
+++ b/lang/fi/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Pikanäppäinten asetukset on päivitetty!',
     'shortcuts_overview_desc' => 'Hallitse pikanäppäimiä, joilla voit navigoida järjestelmän käyttöliittymässä.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Ilmoitusasetukset',
     'notifications_desc' => 'Hallitse järjestelmän toimintoihin liittyviä sähköposti-ilmoituksia.',
     'notifications_opt_own_page_changes' => 'Ilmoita omistamilleni sivuille tehdyistä muutoksista',
     'notifications_opt_own_page_comments' => 'Ilmoita omistamilleni sivuille tehdyistä kommenteista',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Ilmoita vastauksista kommentteihini',
     'notifications_save' => 'Tallenna asetukset',
     'notifications_update_success' => 'Ilmoitusasetukset on päivitetty!',
diff --git a/lang/fi/settings.php b/lang/fi/settings.php
index d9e91d4fa88..c451ae2c913 100644
--- a/lang/fi/settings.php
+++ b/lang/fi/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ei rajoituksia',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Huolto',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Vaihda sivun editoria',
     'role_notifications' => 'Vastaanota ja hallinnoi ilmoituksia',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Sisältöjen oikeudet',
     'roles_system_warning' => 'Huomaa, että minkä tahansa edellä mainituista kolmesta käyttöoikeudesta voi antaa käyttäjälle mahdollisuuden muuttaa omia tai muiden järjestelmän käyttäjien oikeuksia. Anna näitä oikeuksia sisältävät roolit vain luotetuille käyttäjille.',
     'role_asset_desc' => 'Näillä asetuksilla hallitaan oletuksena annettavia käyttöoikeuksia järjestelmässä oleviin sisältöihin. Yksittäisten kirjojen, lukujen ja sivujen käyttöoikeudet kumoavat nämä käyttöoikeudet.',
     'role_asset_admins' => 'Ylläpitäjät saavat automaattisesti pääsyn kaikkeen sisältöön, mutta nämä vaihtoehdot voivat näyttää tai piilottaa käyttöliittymävalintoja.',
     'role_asset_image_view_note' => 'Tämä tarkoittaa näkyvyyttä kuvien hallinnassa. Pääsy ladattuihin kuvatiedostoihin riippuu asetetusta kuvien tallennusvaihtoehdosta.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Kaikki',
     'role_own' => 'Omat',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Määräytyy sen sisällön mukaan, johon ne on ladattu',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Tallenna rooli',
     'role_users' => 'Käyttäjät tässä roolissa',
     'role_users_none' => 'Yhtään käyttäjää ei ole osoitettuna tähän rooliin',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Paranna käyttäjätilisi turvallisuutta ja ota käyttöön monivaiheinen tunnistautuminen.',
     'users_mfa_x_methods' => ':count menetelmä määritetty|:count menetelmää määritetty',
     'users_mfa_configure' => 'Määritä menetelmiä',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Luo uusi API-tunniste',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/fi/validation.php b/lang/fi/validation.php
index 8adc934a177..dfa7f3b940f 100644
--- a/lang/fi/validation.php
+++ b/lang/fi/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute voi sisältää vain kirjaimia ja numeroita.',
     'array'                => ':attribute tulee olla taulukkomuuttuja.',
     'backup_codes'         => 'Annettu koodi ei ole kelvollinen tai se on jo käytetty.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute päiväyksen tulee olla ennen :date.',
     'between'              => [
         'numeric' => ':attribute tulee olla välillä :min ja :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute tulee olla tosi tai epätosi.',
     'confirmed'            => ':attribute vahvistus ei täsmää.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute ei ole kelvollinen päiväys.',
     'date_format'          => ':attribute ei täsmää muodon :format kanssa.',
     'different'            => ':attribute ja :other tulee erota toisistaan.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Tiedostoa ei voitu ladata. Palvelin ei ehkä hyväksy tämän kokoisia tiedostoja.',
 
     'zip_file' => 'Attribuutin :attribute on viitattava tiedostoon ZIP-tiedoston sisällä.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/fr/activities.php b/lang/fr/activities.php
index b65134a2409..e0c51962ae8 100644
--- a/lang/fr/activities.php
+++ b/lang/fr/activities.php
@@ -59,7 +59,7 @@
     'favourite_remove_notification' => '":name" a été supprimé de vos favoris',
 
     // Watching
-    'watch_update_level_notification' => 'Suivre les préférences mises à jour avec succès',
+    'watch_update_level_notification' => 'Préférences de surveillance mises à jour avec succès',
 
     // Auth
     'auth_login' => 'connecté',
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Utilisateur mis à jour avec succès',
     'user_delete' => 'utilisateur supprimé',
     'user_delete_notification' => 'Utilisateur supprimé avec succès',
+    'user_mfa_reset' => 'réinitialiser l\'authentification multifacteur pour l\'utilisateur',
+    'user_mfa_reset_notification' => 'Les méthodes d\'authentification multifacteurs sont réinitialisées',
 
     // API Tokens
     'api_token_create' => 'a créé un jeton API',
diff --git a/lang/fr/auth.php b/lang/fr/auth.php
index fab11a83bfc..771fc718fe8 100644
--- a/lang/fr/auth.php
+++ b/lang/fr/auth.php
@@ -8,18 +8,22 @@
 
     'failed' => 'Ces informations ne correspondent à aucun compte.',
     'throttle' => 'Trop d\'essais, veuillez réessayer dans :seconds secondes.',
+    'mfa_throttle' => 'Trop de tentatives de vérification multifactorielle. Veuillez réessayer dans :secondes secondes.',
 
     // Login & Register
     'sign_up' => 'S\'inscrire',
     'log_in' => 'Se connecter',
-    'log_in_with' => 'Se connecter avec :socialDriver',
+    'log_in_with' => 'Connexion avec :socialDriver',
     'sign_up_with' => 'S\'inscrire avec :socialDriver',
-    'logout' => 'Se déconnecter',
+    'logout' => 'Déconnexion',
 
     'name' => 'Nom',
     'username' => 'Nom d\'utilisateur',
     'email' => 'E-mail',
     'password' => 'Mot de passe',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirmez le mot de passe',
     'password_hint' => 'Doit être d\'au moins 8 caractères',
     'forgot_password' => 'Mot de passe oublié ?',
diff --git a/lang/fr/common.php b/lang/fr/common.php
index 8f8a31135e0..8d60da10f45 100644
--- a/lang/fr/common.php
+++ b/lang/fr/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactif',
     'never' => 'Jamais',
     'none' => 'Aucun',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Accueil',
diff --git a/lang/fr/editor.php b/lang/fr/editor.php
index 73bc6ad21db..4d4d8c0e87a 100644
--- a/lang/fr/editor.php
+++ b/lang/fr/editor.php
@@ -35,7 +35,7 @@
     'header_tiny' => 'En-tête minuscule',
     'paragraph' => 'Paragraphe',
     'blockquote' => 'Bloc de citation',
-    'inline_code' => 'Ligne de Code',
+    'inline_code' => 'Ligne de code',
     'callouts' => 'Légendes',
     'callout_information' => 'Information',
     'callout_success' => 'Succès',
@@ -47,7 +47,7 @@
     'strikethrough' => 'Barré',
     'superscript' => 'Exposant',
     'subscript' => 'Indice',
-    'text_color' => 'Couleur Texte',
+    'text_color' => 'Couleur de texte',
     'highlight_color' => 'Couleur de surlignage',
     'custom_color' => 'Couleur personnalisée',
     'remove_color' => 'Supprimer la couleur',
@@ -75,7 +75,7 @@
     'insert_media_title' => 'Insérer/Modifier un média',
     'clear_formatting' => 'Effacer le formatage',
     'source_code' => 'Code source',
-    'source_code_title' => 'Code Source',
+    'source_code_title' => 'Code source',
     'fullscreen' => 'Plein écran',
     'image_options' => 'Options d\'image',
 
@@ -130,7 +130,7 @@
     'caption' => 'Légende',
     'show_caption' => 'Afficher la légende',
     'constrain' => 'Conserver les proportions',
-    'cell_border_solid' => 'En continue',
+    'cell_border_solid' => 'Continu',
     'cell_border_dotted' => 'En pointillé',
     'cell_border_dashed' => 'En tirets',
     'cell_border_double' => 'En double trait',
diff --git a/lang/fr/entities.php b/lang/fr/entities.php
index ecf26442bea..3479ab57221 100644
--- a/lang/fr/entities.php
+++ b/lang/fr/entities.php
@@ -54,7 +54,7 @@
     'import_continue_desc' => 'Examinez le contenu à importer à partir du fichier ZIP téléchargé. Lorsque vous êtes prêt, lancez l\'importation pour ajouter son contenu à ce système. Le fichier d\'importation ZIP téléchargé sera automatiquement supprimé si l\'importation est réussie.',
     'import_details' => 'Détails de l\'importation',
     'import_run' => 'Exécuter Importation',
-    'import_size' => ':size taille du ZIP d\'import',
+    'import_size' => ':size Taille du fichier ZIP à importer',
     'import_uploaded_at' => ':relativeTime téléchargé',
     'import_uploaded_by' => 'Téléchargé par',
     'import_location' => 'Emplacement de l\'importation',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Déplacer les pages et chapitres au sein d’un livre pour en réorganiser le contenu. D’autres livres peuvent être ajoutés pour faciliter le déplacement des pages et chapitres entre les livres. Facultativement, une règle de tri automatique peut être mise en place afin de trier le livre lorsqu’il est édité.',
     'books_sort_auto_sort' => 'Option de tri automatique',
     'books_sort_auto_sort_active' => 'Tri automatique actif : :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Les règles de tri automatiques peuvent être créées dans la section « Listes et tri » des préférences par un utilisateur disposant des autorisations appropriées.',
     'books_sort_named' => 'Trier le livre :bookName',
     'books_sort_name' => 'Trier par le nom',
     'books_sort_created' => 'Trier par la date de création',
@@ -330,13 +331,16 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Afficher/masquer la barre latérale',
-    'page_tags' => 'Mots-clés de la page',
-    'chapter_tags' => 'Mots-clés du chapitre',
-    'book_tags' => 'Mots-clés du livre',
-    'shelf_tags' => 'Mots-clés de l\'étagère',
-    'tag' => 'Mot-clé',
-    'tags' =>  'Mots-clés',
-    'tags_index_desc' => 'Les tags peuvent être appliqués au contenu du système pour appliquer une forme flexible de catégorisation. Les tags peuvent avoir à la fois une clé et une valeur, la valeur étant facultative. Une fois appliqué, le contenu peut ensuite être interrogé à l’aide du nom et de la valeur du tag.',
+    'page_contents' => 'Contenu de la page',
+    'page_contents_none' => 'Aucun titre n\'a été trouvé dans le contenu de la page.',
+    'page_contents_info' => 'Le menu de contenu est généré à partir de tous les formats de titres utilisés dans la page.',
+    'page_tags' => 'Étiquettes de la page',
+    'chapter_tags' => 'Étiquettes du chapitre',
+    'book_tags' => 'Étiquettes du livre',
+    'shelf_tags' => 'Étiquettes de l\'étagère',
+    'tag' => 'Étiquette',
+    'tags' =>  'Étiquettes',
+    'tags_index_desc' => 'Les étiquettes peuvent être mises sur le contenu pour appliquer une forme flexible de catégorisation. Les étiquettes peuvent avoir à la fois une clé et une valeur, la valeur étant facultative. Une fois appliqué, le contenu peut ensuite être interrogé à l’aide du nom et de la valeur de l’étiquette.',
     'tag_name' =>  'Nom de l’étiquette',
     'tag_value' => 'Valeur du mot-clé (optionnel)',
     'tags_explain' => "Ajouter des mots-clés pour catégoriser votre contenu.",
diff --git a/lang/fr/errors.php b/lang/fr/errors.php
index 94d21e1dd14..b74fb5465db 100644
--- a/lang/fr/errors.php
+++ b/lang/fr/errors.php
@@ -13,7 +13,7 @@
     'auth_pre_register_theme_prevention' => 'Le compte utilisateur n\'a pas pu être enregistré avec les informations fournies',
     'email_already_confirmed' => 'Cet e-mail a déjà été validé, vous pouvez vous connecter.',
     'email_confirmation_invalid' => 'Cette confirmation est invalide. Veuillez essayer de vous inscrire à nouveau.',
-    'email_confirmation_expired' => 'Le jeton de confirmation est périmé. Un nouvel e-mail vous a été envoyé.',
+    'email_confirmation_expired' => 'Le jeton de confirmation a expiré. Un nouvel e-mail vous a été envoyé.',
     'email_confirmation_awaiting' => 'L\'adresse e-mail du compte utilisé doit être confirmée',
     'ldap_fail_anonymous' => 'L\'accès LDAP anonyme n\'a pas abouti',
     'ldap_fail_authed' => 'L\'accès LDAP n\'a pas abouti avec cet utilisateur et ce mot de passe',
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Impossible de lire le fichier ZIP.',
     'import_zip_cant_decode_data' => 'Impossible de trouver et de décoder le contenu ZIP data.json.',
     'import_zip_no_data' => 'Les données du fichier ZIP n\'ont pas de livre, de chapitre ou de page attendus.',
+    'import_zip_data_too_large' => 'Le contenu du fichier ZIP pour data.json dépasse la taille maximale de téléversement autorisée.',
     'import_validation_failed' => 'L\'importation du ZIP n\'a pas été validée avec les erreurs :',
     'import_zip_failed_notification' => 'Impossible d\'importer le fichier ZIP.',
     'import_perms_books' => 'Vous n\'avez pas les permissions requises pour créer des livres.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Le secret fourni pour le jeton d\'API utilisé est incorrect',
     'api_user_no_api_permission' => 'Le propriétaire du jeton API utilisé n\'a pas la permission de passer des requêtes API',
     'api_user_token_expired' => 'Le jeton d\'autorisation utilisé a expiré',
+    'api_cookie_auth_only_get' => 'Seules les requêtes GET sont autorisées lors de l’utilisation de l’API avec une authentification basée sur les cookies',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Erreur émise lors de l\'envoi d\'un e-mail de test :',
diff --git a/lang/fr/notifications.php b/lang/fr/notifications.php
index 5d7ae88f72b..dc4127b032f 100644
--- a/lang/fr/notifications.php
+++ b/lang/fr/notifications.php
@@ -4,13 +4,15 @@
  */
 return [
 
-    'new_comment_subject' => 'Nouveau commentaire sur la page: :pageName',
+    'new_comment_subject' => 'Nouveau commentaire sur la page : :pageName',
     'new_comment_intro' => 'Un utilisateur a commenté une page dans :appName:',
     'new_page_subject' => 'Nouvelle page: :pageName',
     'new_page_intro' => 'Une nouvelle page a été créée dans :appName:',
     'updated_page_subject' => 'Page mise à jour: :pageName',
     'updated_page_intro' => 'Une page a été mise à jour dans :appName:',
     'updated_page_debounce' => 'Pour éviter de nombreuses notifications, pendant un certain temps, vous ne recevrez pas de notifications pour d\'autres modifications de cette page par le même éditeur.',
+    'comment_mention_subject' => 'Vous avez été mentionné dans un commentaire sur la page : :pageName',
+    'comment_mention_intro' => 'Vous avez été mentionné dans un commentaire sur :appName:',
 
     'detail_page_name' => 'Nom de la page :',
     'detail_page_path' => 'Chemin de la page :',
diff --git a/lang/fr/preferences.php b/lang/fr/preferences.php
index 2180ed70c46..62f6db27702 100644
--- a/lang/fr/preferences.php
+++ b/lang/fr/preferences.php
@@ -15,14 +15,36 @@
     'shortcuts_section_navigation' => 'Navigation',
     'shortcuts_section_actions' => 'Actions communes',
     'shortcuts_save' => 'Sauvegarder les raccourcis',
-    'shortcuts_overlay_desc' => 'Note : Lorsque les raccourcis sont activés, assistant est disponible en appuyant sur "?" qui mettra en surbrillance les raccourcis disponibles pour les actions actuellement visibles à l\'écran.',
+    'shortcuts_overlay_desc' => 'Note : Lorsque les raccourcis sont activés, assistant est disponible en appuyant sur «?» qui mettra en surbrillance les raccourcis disponibles pour les actions actuellement visibles à l\'écran.',
     'shortcuts_update_success' => 'Les préférences de raccourci ont été mises à jour !',
     'shortcuts_overview_desc' => 'Gérer les raccourcis clavier que vous pouvez utiliser pour naviguer dans l\'interface utilisateur du système.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Préférences de notification',
     'notifications_desc' => 'Contrôlez les notifications par e-mail que vous recevez lorsque certaines activités sont effectuées dans le système.',
     'notifications_opt_own_page_changes' => 'Notifier lors des modifications des pages que je possède',
     'notifications_opt_own_page_comments' => 'Notifier lorsque les pages que je possède sont commentées',
+    'notifications_opt_comment_mentions' => 'Notifier lorsque je suis mentionné dans un commentaire',
     'notifications_opt_comment_replies' => 'Notifier les réponses à mes commentaires',
     'notifications_save' => 'Enregistrer les préférences',
     'notifications_update_success' => 'Les préférences de notification ont été mises à jour !',
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
index e73d8a4b19d..ec5c5a38f48 100644
--- a/lang/fr/settings.php
+++ b/lang/fr/settings.php
@@ -17,14 +17,14 @@
     'app_features_security' => 'Fonctionnalités et sécurité',
     'app_name' => 'Nom de l\'application',
     'app_name_desc' => 'Ce nom est affiché dans l\'en-tête et les e-mails.',
-    'app_name_header' => 'Afficher le nom dans l\'en-tête ?',
+    'app_name_header' => 'Afficher le nom dans l\'en-tête',
     'app_public_access' => 'Accès public',
     'app_public_access_desc' => 'L\'activation de cette option permettra aux visiteurs, qui ne sont pas connectés, d\'accéder au contenu de votre instance BookStack.',
     'app_public_access_desc_guest' => 'L\'accès pour les visiteurs publics peut être contrôlé par l\'utilisateur "Guest".',
     'app_public_access_toggle' => 'Autoriser l\'accès public',
     'app_public_viewing' => 'Accepter l\'affichage public des pages ?',
     'app_secure_images' => 'Ajout d\'image sécurisé',
-    'app_secure_images_toggle' => 'Activer l\'ajout d\'image sécurisé',
+    'app_secure_images_toggle' => 'Activer l\'ajout d\'image sécurisée',
     'app_secure_images_desc' => 'Pour des questions de performances, toutes les images sont publiques. Cette option ajoute une chaîne aléatoire difficile à deviner dans les URLs des images.',
     'app_default_editor' => 'Éditeur de page par défaut',
     'app_default_editor_desc' => 'Sélectionnez l\'éditeur qui sera utilisé par défaut lors de l\'édition de nouvelles pages. Cela peut être remplacé au niveau de la page où les permissions sont autorisées.',
@@ -39,7 +39,7 @@
     'app_homepage_desc' => 'Choisissez une page à afficher sur la page d\'accueil au lieu de la vue par défaut. Les permissions sont ignorées pour les pages sélectionnées.',
     'app_homepage_select' => 'Choisissez une page',
     'app_footer_links' => 'Liens de pied de page',
-    'app_footer_links_desc' => 'Ajoutez des liens dans le pied de page du site. Ils seront affichés en bas de la plupart des pages, incluant celles qui ne nécesittent pas de connexion. Vous pouvez utiliser l\'étiquette "trans::<key>" pour utiliser les traductions définies par le système. Par exemple, utiliser "trans::common.privacy_policy" fournira la traduction de "Politique de Confidentalité" et "trans::common.terms_of_service" fournira la traduction de "Conditions d\'utilisation".',
+    'app_footer_links_desc' => 'Ajoutez des liens dans le pied de page du site. Ils seront affichés en bas de la plupart des pages, incluant celles qui ne nécessitent pas de connexion. Vous pouvez utiliser l\'étiquette "trans::<key>" pour utiliser les traductions définies par le système. Par exemple, utiliser "trans::common.privacy_policy" fournira la traduction de "Politique de Confidentalité" et "trans::common.terms_of_service" fournira la traduction de "Conditions d\'utilisation".',
     'app_footer_links_label' => 'Libellé du lien',
     'app_footer_links_url' => 'URL du lien',
     'app_footer_links_add' => 'Ajouter un lien en pied de page',
@@ -61,21 +61,21 @@
     'page_draft_color' => 'Couleur des brouillons',
 
     // Registration Settings
-    'reg_settings' => 'Préférence pour l\'inscription',
+    'reg_settings' => 'Paramètres d\'inscription',
     'reg_enable' => 'Activer l\'inscription',
     'reg_enable_toggle' => 'Activer l\'inscription',
-    'reg_enable_desc' => 'Lorsque l\'inscription est activée, l\'utilisateur pourra s\'enregistrer en tant qu\'utilisateur de l\'application. Lors de l\'inscription, ils se voient attribuer un rôle par défaut.',
-    'reg_default_role' => 'Rôle par défaut lors de l\'inscription',
+    'reg_enable_desc' => 'Lorsque l\'inscription est activée, l\'utilisateur peut s\'inscrire lui-même en tant qu\'utilisateur de l\'application. Lors de son inscription, il se voit attribuer un rôle unique par défaut.',
+    'reg_default_role' => 'Rôle de l\'utilisateur par défaut après l\'inscription',
     'reg_enable_external_warning' => 'L\'option ci-dessus est ignorée lorsque l\'authentification externe LDAP ou SAML est activée. Les comptes utilisateur pour les membres non existants seront créés automatiquement si l\'authentification, par rapport au système externe utilisé, est réussie.',
     'reg_email_confirmation' => 'Confirmation de l\'e-mail',
     'reg_email_confirmation_toggle' => 'Obliger la confirmation par e-mail ?',
     'reg_confirm_email_desc' => 'Si la restriction de domaine est activée, la confirmation sera automatiquement obligatoire et cette valeur sera ignorée.',
-    'reg_confirm_restrict_domain' => 'Restreindre l\'inscription à un domaine',
-    'reg_confirm_restrict_domain_desc' => 'Entrez une liste de domaines acceptés lors de l\'inscription, séparés par une virgule. Les utilisateurs recevront un e-mail de confirmation à cette adresse. <br> Les utilisateurs pourront changer leur adresse après inscription s\'ils le souhaitent.',
+    'reg_confirm_restrict_domain' => 'Restriction de domaine',
+    'reg_confirm_restrict_domain_desc' => 'Indiquez, séparés par des virgules, les domaines de messagerie autorisés pour l\'inscription. Les utilisateurs recevront un e-mail pour confirmer leur adresse avant de pouvoir utiliser l\'application. <br> Notez qu\'ils pourront modifier leur adresse e-mail après leur inscription.',
     'reg_confirm_restrict_domain_placeholder' => 'Aucune restriction en place',
 
     // Sorting Settings
-    'sorting' => 'Tri',
+    'sorting' => 'Listes et tri',
     'sorting_book_default' => 'Tri des livres par défaut',
     'sorting_book_default_desc' => 'Sélectionnez le tri par défaut à mettre en place sur les nouveaux livres. Cela n’affectera pas les livres existants, et peut être redéfini dans les livres.',
     'sorting_rules' => 'Règles de tri',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Date de mise à jour',
     'sort_rule_op_chapters_first' => 'Chapitres en premier',
     'sort_rule_op_chapters_last' => 'Chapitres en dernier',
+    'sorting_page_limits' => 'Limite d\'affichage par page',
+    'sorting_page_limits_desc' => 'Définissez le nombre d’éléments à afficher par page dans les différentes listes du système. En général, un nombre plus faible offre de meilleures performances, tandis qu’un nombre plus élevé réduit le besoin de naviguer entre plusieurs pages. Il est recommandé d’utiliser un multiple de 6.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importer le contenu',
     'role_editor_change' => 'Changer l\'éditeur de page',
     'role_notifications' => 'Recevoir et gérer les notifications',
+    'role_permission_note_users_and_roles' => 'Ces autorisations permettront également l\'accès à la consultation et la recherche des utilisateurs et des rôles dans le système.',
     'role_asset' => 'Permissions des ressources',
     'roles_system_warning' => 'Sachez que l\'accès à l\'une des trois permissions ci-dessus peut permettre à un utilisateur de modifier ses propres privilèges ou les privilèges des autres utilisateurs du système. N\'attribuez uniquement des rôles avec ces permissions qu\'à des utilisateurs de confiance.',
     'role_asset_desc' => 'Ces permissions contrôlent l\'accès par défaut des ressources dans le système. Les permissions dans les livres, les chapitres et les pages ignoreront ces permissions',
     'role_asset_admins' => 'Les administrateurs ont automatiquement accès à tous les contenus mais les options suivantes peuvent afficher ou masquer certaines options de l\'interface.',
     'role_asset_image_view_note' => 'Cela concerne la visibilité dans le gestionnaire d\'images. L\'accès réel des fichiers d\'image téléchargés dépendra de l\'option de stockage d\'images du système.',
+    'role_asset_users_note' => 'Ces autorisations permettront également l\'accès à la consultation et la recherche des utilisateurs dans le système.',
     'role_all' => 'Tous',
     'role_own' => 'Propres',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Contrôlé par les ressources les ayant envoyés',
+    'role_controlled_by_page_delete' => 'Contrôlé par les autorisations de suppression de page',
     'role_save' => 'Enregistrer le rôle',
     'role_users' => 'Utilisateurs ayant ce rôle',
     'role_users_none' => 'Aucun utilisateur avec ce rôle actuellement',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Configurer l\'authentification multi-facteurs ajoute une couche supplémentaire de sécurité à votre compte utilisateur.',
     'users_mfa_x_methods' => ':count méthode configurée|:count méthodes configurées',
     'users_mfa_configure' => 'Méthode de configuration',
+    'users_mfa_reset' => 'Réinitialiser les méthodes d\'authentification multifacteurs',
+    'users_mfa_reset_desc' => 'Cette action réinitialisera et supprimera toutes les méthodes d\'authentification multifacteurs configurées pour cet utilisateur. Si l\'authentification multifacteurs est requise par l\'un de ses rôles, il sera invité à configurer de nouvelles méthodes lors de sa prochaine connexion.',
+    'users_mfa_reset_confirm' => 'Êtes-vous sûr de vouloir réinitialiser l\'authentification multifacteurs pour cet utilisateur ?',
 
     // API Tokens
     'user_api_token_create' => 'Créer un nouveau jeton API',
@@ -266,7 +275,7 @@
     'user_api_token_name_desc' => 'Donnez à votre jeton un nom lisible pour l\'identifier plus tard.',
     'user_api_token_expiry' => 'Date d\'expiration',
     'user_api_token_expiry_desc' => 'Définissez une date à laquelle ce jeton expire. Après cette date, les demandes effectuées à l\'aide de ce jeton ne fonctionneront plus. Le fait de laisser ce champ vide entraînera une expiration dans 100 ans.',
-    'user_api_token_create_secret_message' => 'Immédiatement après la création de ce jeton, un "ID de jeton" "et" Secret de jeton "sera généré et affiché. Le secret ne sera affiché qu\'une seule fois, alors assurez-vous de copier la valeur dans un endroit sûr et sécurisé avant de continuer.',
+    'user_api_token_create_secret_message' => 'Immédiatement après la création de ce jeton, un "ID de jeton" et "Secret de jeton" sera généré et affiché. Le secret ne sera affiché qu\'une seule fois, alors assurez-vous de copier la valeur dans un endroit sûr et sécurisé avant de continuer.',
     'user_api_token' => 'Jeton API',
     'user_api_token_id' => 'Token ID',
     'user_api_token_id_desc' => 'Il s\'agit d\'un identifiant généré par le système non modifiable pour ce jeton qui devra être fourni dans les demandes d\'API.',
@@ -358,7 +367,9 @@
         'ru' => 'Russe',
         'sk' => 'Slovaque',
         'sl' => 'Slovène',
+        'sr' => 'Српски',
         'sv' => 'Suédois',
+        'th' => 'ภาษาไทย',
         'tr' => 'Turc',
         'uk' => 'Ukrainien',
         'uz' => 'O‘zbekcha',
diff --git a/lang/fr/validation.php b/lang/fr/validation.php
index 7db0493a165..83d55713c13 100644
--- a/lang/fr/validation.php
+++ b/lang/fr/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute doit contenir uniquement des chiffres et des lettres.',
     'array'                => ':attribute doit être un tableau.',
     'backup_codes'         => 'Le code fourni n\'est pas valide ou a déjà été utilisé.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute doit être inférieur à :date.',
     'between'              => [
         'numeric' => ':attribute doit être compris entre :min et :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute doit être vrai ou faux.',
     'confirmed'            => ':attribute la confirmation n\'est pas valide.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute n\'est pas une date valide.',
     'date_format'          => ':attribute ne correspond pas au format :format.',
     'different'            => ':attribute et :other doivent être différents l\'un de l\'autre.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Le fichier n\'a pas pu être envoyé. Le serveur peut ne pas accepter des fichiers de cette taille.',
 
     'zip_file' => 'L\'attribut :attribute doit référencer un fichier dans le ZIP.',
+    'zip_file_size' => 'Le fichier :attribute ne doit pas dépasser :size Mo.',
     'zip_file_mime' => ':attribute doit référencer un fichier de type :validTypes, trouvé :foundType.',
     'zip_model_expected' => 'Objet de données attendu, mais ":type" trouvé.',
     'zip_unique' => 'L\'attribut :attribute doit être unique pour le type d\'objet dans le ZIP.',
diff --git a/lang/he/activities.php b/lang/he/activities.php
index 8dd244b7247..52bf134d0c2 100644
--- a/lang/he/activities.php
+++ b/lang/he/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'משתמש עודכן בהצלחה',
     'user_delete' => 'משתמש נמחק',
     'user_delete_notification' => 'משתמש הוסר בהצלחה',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'API Token נוצר',
@@ -128,12 +130,12 @@
     'comment_delete'              => 'תגובה נמחקה',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'נוצר חוק מיון',
+    'sort_rule_create_notification' => 'חוק מיון נוצר בהצלחה',
+    'sort_rule_update' => 'חוק מיון עודכן',
+    'sort_rule_update_notification' => 'חוק מיון עודכן בהצלחה',
+    'sort_rule_delete' => 'חוק מיון נמחק',
+    'sort_rule_delete_notification' => 'חוק מיון נמחק בהצלחה',
 
     // Other
     'permissions_update'          => 'הרשאות עודכנו',
diff --git a/lang/he/auth.php b/lang/he/auth.php
index 2948d5b2078..f87cbaaed3b 100644
--- a/lang/he/auth.php
+++ b/lang/he/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'פרטי ההתחברות אינם תואמים את הנתונים שלנו.',
     'throttle' => 'נסיונות התחברות מהירים מדי, יש להמתין :seconds שניות ולנסות שנית.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'הרשמה למערכת',
@@ -20,6 +21,9 @@
     'username' => 'שם משתמש',
     'email' => 'אי-מייל',
     'password' => 'סיסמא',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'אימות סיסמא',
     'password_hint' => '‏אורך הסיסמה חייב להיות לפחות 8 תווים',
     'forgot_password' => 'שכחת סיסמא?',
@@ -106,12 +110,13 @@
     'mfa_verify_access' => 'אשר גישה',
     'mfa_verify_access_desc' => 'חשבון המשתמש שלך דורש ממך לאת את הזהות שלך בשכבת הגנה נוספת על מנת לאפשר לך גישה. יש לאשר גישה דרך אחד האמצעים הקיימים על מנת להמשיך.',
     'mfa_verify_no_methods' => 'אין אפשרויות אימות דו-שלבי מוגדרות',
-    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
+    'mfa_verify_no_methods_desc' => 'לא נמצאו אפשרויות ווידוא זהות עבור המשתמש שלך.
+נדרש לקנפג לפחות אחד על מנת לקבל גישה.',
     'mfa_verify_use_totp' => 'אמת באמצעות אפליקציה',
     'mfa_verify_use_backup_codes' => 'אמת באמצעות קוד גיבוי',
     'mfa_verify_backup_code' => 'קוד גיבוי',
     'mfa_verify_backup_code_desc' => 'הזן מטה אחד מקודי הגיבוי הנותרים לך:',
     'mfa_verify_backup_code_enter_here' => 'הזן קוד גיבוי כאן',
     'mfa_verify_totp_desc' => 'הזן את הקוד, שהונפק דרך האפליקציה שלך, מטה:',
-    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
+    'mfa_setup_login_notification' => 'אמצעי זיהוי זהות הוגדרו, אנא התחבר מחדש.',
 ];
diff --git a/lang/he/common.php b/lang/he/common.php
index 2e387f67d78..c176a06f39e 100644
--- a/lang/he/common.php
+++ b/lang/he/common.php
@@ -30,8 +30,8 @@
     'create' => 'צור',
     'update' => 'עדכן',
     'edit' => 'ערוך',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'הכנס לארכיון',
+    'unarchive' => 'הוצא מארכיון',
     'sort' => 'מיין',
     'move' => 'הזז',
     'copy' => 'העתק',
@@ -84,6 +84,8 @@
     'status_inactive' => 'לא פעיל',
     'never' => 'אף פעם',
     'none' => 'ללא',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'דף הבית',
diff --git a/lang/he/entities.php b/lang/he/entities.php
index 0cf2bb7fd32..12f92e1f046 100644
--- a/lang/he/entities.php
+++ b/lang/he/entities.php
@@ -22,8 +22,8 @@
     'meta_created_name' => 'נוצר :timeLength על ידי :user',
     'meta_updated' => 'עודכן :timeLength',
     'meta_updated_name' => 'עודכן :timeLength על ידי :user',
-    'meta_owned_name' => 'Owned by :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_owned_name' => 'בבעלות של :user',
+    'meta_reference_count' => '',
     'entity_select' => 'בחר יישות',
     'entity_select_lack_permission' => 'אין לך אישורים דרושים לבחירת פריט זה',
     'images' => 'תמונות',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'מיין את הספר :bookName',
     'books_sort_name' => 'מיין לפי שם',
     'books_sort_created' => 'מיין לפי תאריך יצירה',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'תגיות דף',
     'chapter_tags' => 'תגיות פרק',
     'book_tags' => 'תגיות ספר',
diff --git a/lang/he/errors.php b/lang/he/errors.php
index 75f7949ea76..99249fb516e 100644
--- a/lang/he/errors.php
+++ b/lang/he/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/he/notifications.php b/lang/he/notifications.php
index 8385c0a6da3..cfab57117f4 100644
--- a/lang/he/notifications.php
+++ b/lang/he/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'עמוד עודכן :pageName',
     'updated_page_intro' => 'דף עודכן ב:appName:',
     'updated_page_debounce' => 'על מנת לעצור הצפת התראות, לזמן מסוים אתה לא תקבל התראות על שינויים עתידיים בדף זה על ידי אותו עורך.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'שם עמוד:',
     'detail_page_path' => 'נתיב לעמוד:',
diff --git a/lang/he/preferences.php b/lang/he/preferences.php
index 9e05eefb3ab..9d68a122634 100644
--- a/lang/he/preferences.php
+++ b/lang/he/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'העדפותיך נשמרו!',
     'shortcuts_overview_desc' => 'ניהול קיצורי מקלדת שבשימוש לניווט מהיר בממשק המשתמש.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'הגדרת התראות',
     'notifications_desc' => 'העדפות קבלת מייל והתראות כאשר מבוצעת פעולה מסויימת במערכת.',
     'notifications_opt_own_page_changes' => 'עדכן אותי כאשר מתבצעים שינויים לדפים שבבעלותי',
     'notifications_opt_own_page_comments' => 'עדכן אותי כאשר נוספות הערות לדפים שבבעלותי',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'עדכן אותי כאשר מתקבלות תגובות להערות שלי',
     'notifications_save' => 'שמור העדפות',
     'notifications_update_success' => 'הגדרת התראות עודכנו!',
diff --git a/lang/he/settings.php b/lang/he/settings.php
index 5b405072f86..f2c2ae1a5e4 100644
--- a/lang/he/settings.php
+++ b/lang/he/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'אין הגבלה לדומיין',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'תחזוקה',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'שנה עורך עמודים',
     'role_notifications' => 'ניהול התראות',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'הרשאות משאבים',
     'roles_system_warning' => 'שימו לב לכך שגישה לכל אחת משלושת ההרשאות הנ"ל יכולה לאפשר למשתמש לשנות את הפריווילגיות שלהם או של אחרים במערכת. הגדירו תפקידים להרשאות אלה למשתמשים בהם אתם בוטחים בלבד.',
     'role_asset_desc' => 'הרשאות אלו שולטות בגישת ברירת המחדל למשאבים בתוך המערכת. הרשאות של ספרים, פרקים ודפים יגברו על הרשאות אלו.',
     'role_asset_admins' => 'מנהלים מקבלים הרשאה מלאה לכל התוכן אך אפשרויות אלו עלולות להציג או להסתיר אפשרויות בממשק',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'הכל',
     'role_own' => 'שלי',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'נשלטים על ידי המשאב אליו הועלו',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'שמור תפקיד',
     'role_users' => 'משתמשים משוייכים לתפקיד זה',
     'role_users_none' => 'אין משתמשים המשוייכים לתפקיד זה',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'צור אסימון API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/he/validation.php b/lang/he/validation.php
index 2d4f8b30598..f457f9e3f08 100644
--- a/lang/he/validation.php
+++ b/lang/he/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'שדה :attribute יכול להכיל אותיות ומספרים בלבד.',
     'array'                => 'שדה :attribute חייב להיות מערך.',
     'backup_codes'         => 'קוד שהוזן לא תקין או שכבר השתמשו בו.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'שדה :attribute חייב להיות תאריך לפני :date.',
     'between'              => [
         'numeric' => 'שדה :attribute חייב להיות בין :min ל-:max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'שדה :attribute חייב להיות אמת או שקר.',
     'confirmed'            => 'שדה האישור של :attribute לא תואם.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'שדה :attribute אינו תאריך תקני.',
     'date_format'          => 'שדה :attribute לא תואם את הפורמט :format.',
     'different'            => 'שדה :attribute ושדה :other חייבים להיות שונים.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'שדה :attribute ארעה שגיאה בעת ההעלאה.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/hr/activities.php b/lang/hr/activities.php
index bf79f9ab14a..06fec08d29d 100644
--- a/lang/hr/activities.php
+++ b/lang/hr/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Korisnik je uspješno ažuriran',
     'user_delete' => 'izbrisani korisnik',
     'user_delete_notification' => 'Korisnik je uspješno uklonjen',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/hr/auth.php b/lang/hr/auth.php
index bef07edcdaf..3718aa7dd0d 100644
--- a/lang/hr/auth.php
+++ b/lang/hr/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Ove vjerodajnice ne podudaraju se s našim zapisima.',
     'throttle' => 'Previše pokušaja prijave. Molimo vas da pokušate za :seconds sekundi.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registrirajte se',
@@ -20,6 +21,9 @@
     'username' => 'Korisničko ime',
     'email' => 'E-pošta',
     'password' => 'Lozinka',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Potvrdite lozinku',
     'password_hint' => 'Mora biti najmanje 8 znakova',
     'forgot_password' => 'Zaboravili ste lozinku?',
diff --git a/lang/hr/common.php b/lang/hr/common.php
index 7cd779593bf..df40cbd23ea 100644
--- a/lang/hr/common.php
+++ b/lang/hr/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Neaktivno',
     'never' => 'Nikada',
     'none' => 'Ništa',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Naslovna Stranica',
diff --git a/lang/hr/entities.php b/lang/hr/entities.php
index 99df50ea33c..320f85ecc50 100644
--- a/lang/hr/entities.php
+++ b/lang/hr/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Razvrstaj knjigu :bookName',
     'books_sort_name' => 'Razvrstaj po imenu',
     'books_sort_created' => 'Razvrstaj po datumu nastanka',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Oznake stranice',
     'chapter_tags' => 'Oznake poglavlja',
     'book_tags' => 'Oznake knjiga',
diff --git a/lang/hr/errors.php b/lang/hr/errors.php
index 92b9de7d24e..298fcb81ba2 100644
--- a/lang/hr/errors.php
+++ b/lang/hr/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Netočan API token',
     'api_user_no_api_permission' => 'Vlasnik API tokena nema potrebna dopuštenja',
     'api_user_token_expired' => 'Autorizacija je istekla',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Pogreška prilikom slanja testnog email:',
diff --git a/lang/hr/notifications.php b/lang/hr/notifications.php
index c3a38cdfaa4..c9428e2dc58 100644
--- a/lang/hr/notifications.php
+++ b/lang/hr/notifications.php
@@ -13,6 +13,8 @@
 Ažurirana stranica: :pageName',
     'updated_page_intro' => 'Stranica je ažurirana u :appName:',
     'updated_page_debounce' => 'Kako biste spriječili velik broj obavijesti, nećete primati obavijesti o daljnjim izmjenama ove stranice od istog urednika neko vrijeme.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Naziv Stranice:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/hr/preferences.php b/lang/hr/preferences.php
index 2f409f8d3e4..116e6e43095 100644
--- a/lang/hr/preferences.php
+++ b/lang/hr/preferences.php
@@ -19,12 +19,34 @@
     'shortcuts_update_success' => 'Postavke prečaca su ažurirane!',
     'shortcuts_overview_desc' => 'Upravljajte prečacima tastature koje možete koristiti za navigaciju korisničkim sučeljem sustava.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Postavke Obavijesti',
     'notifications_desc' => 'Kontrolirajte e-mail obavijesti koje primate kada se određene aktivnosti izvrše unutar sustava.',
     'notifications_opt_own_page_changes' => 'Obavijesti o promjenama na stranicama koje posjedujem',
     'notifications_opt_own_page_comments' => 'ChatGPT
 
 Obavijesti o komentarima na stranicama koje posjedujem',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Obavijesti o odgovorima na moje komentare',
     'notifications_save' => 'Spremi Postavke',
     'notifications_update_success' => 'Postavke obavijesti su ažurirane!',
diff --git a/lang/hr/settings.php b/lang/hr/settings.php
index 5f000742631..bc5f10f19f8 100644
--- a/lang/hr/settings.php
+++ b/lang/hr/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Bez ograničenja',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Održavanje',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Promijeni uređivač stranica',
     'role_notifications' => 'Primanje i upravljanje obavijestima',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Upravljanje vlasništvom',
     'roles_system_warning' => 'Uzmite u obzir da pristup bilo kojem od ovih dopuštenja dozvoljavate korisniku upravljanje dopuštenjima ostalih u sustavu. Ova dopuštenja dodijelite pouzdanim korisnicima.',
     'role_asset_desc' => 'Ova dopuštenja kontroliraju zadane pristupe. Dopuštenja za knjige, poglavlja i stranice ih poništavaju.',
     'role_asset_admins' => 'Administratori automatski imaju pristup svim sadržajima, ali ove opcije mogu prikazati ili sakriti korisnička sučelja.',
     'role_asset_image_view_note' => 'Ovo se odnosi na vidljivost unutar upravitelja slika. Stvarni pristup uploadiranim slikovnim datotekama ovisit će o odabranim opcijama pohrane slika u sustavu.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Sve',
     'role_own' => 'Vlastito',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrolirano od strane vlasnika',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Spremi ulogu',
     'role_users' => 'Korisnici u ovoj ulozi',
     'role_users_none' => 'Trenutno nijedan korisnik nije u ovoj ulozi',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Postavite višestruku provjeru autentičnosti kao dodatni sloj sigurnosti za svoj korisnički račun.',
     'users_mfa_x_methods' => ':count metoda konfigurirano|:count metode konfigurirane',
     'users_mfa_configure' => 'Konfiguriraj Metode',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Stvori API token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/hr/validation.php b/lang/hr/validation.php
index 32b11a9bd80..6894ee02958 100644
--- a/lang/hr/validation.php
+++ b/lang/hr/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute može sadržavati samo slova i brojeve.',
     'array'                => ':attribute mora biti niz.',
     'backup_codes'         => 'Navedeni kod nije valjan ili je već korišten.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute mora biti prije :date.',
     'between'              => [
         'numeric' => ':attribute mora biti između :min i :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute mora biti točno ili netočno.',
     'confirmed'            => ':attribute potvrde se ne podudaraju.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nema valjani datum.',
     'date_format'          => ':attribute ne odgovara formatu :format.',
     'different'            => ':attribute i :other se moraju razlikovati.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Datoteka se ne može prenijeti. Server možda ne prihvaća datoteke te veličine.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/hu/activities.php b/lang/hu/activities.php
index 43683930bea..a64af5a187e 100644
--- a/lang/hu/activities.php
+++ b/lang/hu/activities.php
@@ -67,9 +67,9 @@
     'auth_password_reset_request' => 'jelszó visszaállítást kért',
     'auth_password_reset_update' => 'felhasználói jelszó visszaállítás',
     'mfa_setup_method' => 'MFA módszert állított be',
-    'mfa_setup_method_notification' => 'Többfaktoros azonosítás sikeresen beállítva',
+    'mfa_setup_method_notification' => 'Többlépcsős azonosítás sikeresen beállítva',
     'mfa_remove_method' => 'MFA módszert törölt',
-    'mfa_remove_method_notification' => 'Többfaktoros azonosítás sikeresen törölve',
+    'mfa_remove_method_notification' => 'Többlépcsős azonosítás sikeresen törölve',
 
     // Settings
     'settings_update' => 'frissítette a beállításokat',
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Webhook sikeresen törölve',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'import elkészült',
+    'import_create_notification' => 'Az import sikeresen feltöltve',
+    'import_run' => 'import frissítve',
+    'import_run_notification' => 'A tartalom sikeresen importálva',
+    'import_delete' => 'import törölve',
+    'import_delete_notification' => 'Az import sikeresen törölve',
 
     // Users
     'user_create' => 'létrehozta a felhasználót',
@@ -99,14 +99,16 @@
     'user_update_notification' => 'Felhasználó sikeresen frissítve',
     'user_delete' => 'felhasználót törölt',
     'user_delete_notification' => 'Felhasználó sikeresen eltávolítva',
+    'user_mfa_reset' => 'MFA alaphelyzetbe állítva felhasználónak',
+    'user_mfa_reset_notification' => 'Többlépcsős azonosítási módok alaphelyzetbe állítva',
 
     // API Tokens
-    'api_token_create' => 'létrehozta az API tokent',
-    'api_token_create_notification' => 'API token sikeresen létrehozva',
-    'api_token_update' => 'frissítette az API tokent',
-    'api_token_update_notification' => 'API token sikeresen frissítve',
-    'api_token_delete' => 'törölte az API tokent',
-    'api_token_delete_notification' => 'API token sikeresen törölve',
+    'api_token_create' => 'létrehozta az API kulcsot',
+    'api_token_create_notification' => 'API kulcs sikeresen létrehozva',
+    'api_token_update' => 'frissítette az API kulcsot',
+    'api_token_update_notification' => 'API kulcs sikeresen frissítve',
+    'api_token_delete' => 'törölte az API kulcsot',
+    'api_token_delete_notification' => 'API kulcs sikeresen törölve',
 
     // Roles
     'role_create' => 'szerepkört hozott létre',
@@ -118,14 +120,14 @@
 
     // Recycle Bin
     'recycle_bin_empty' => 'kiürítette a lomtárat',
-    'recycle_bin_restore' => 'lomtárból visszaállítva',
-    'recycle_bin_destroy' => 'lomtárból törölve',
+    'recycle_bin_restore' => 'visszaállított a lomtárból',
+    'recycle_bin_destroy' => 'törölte a lomtárból',
 
     // Comments
-    'commented_on'                => 'megjegyzést fűzött hozzá:',
-    'comment_create'              => 'hozzáadott hozzászólás',
-    'comment_update'              => 'frissített hozzászólás',
-    'comment_delete'              => 'megjegyzés törlése',
+    'commented_on'                => 'megjegyzést fűzött hozzá',
+    'comment_create'              => 'hozzáadott egy hozzászólást',
+    'comment_update'              => 'frissített egy hozzászólást',
+    'comment_delete'              => 'törölt egy hozzászólást',
 
     // Sort Rules
     'sort_rule_create' => 'létrehozta a rendezési szabályt',
@@ -136,5 +138,5 @@
     'sort_rule_delete_notification' => 'Rendezési szabály sikeresen törölve',
 
     // Other
-    'permissions_update'          => 'engedélyek frissítve',
+    'permissions_update'          => 'frissítette ez engedélyeket',
 ];
diff --git a/lang/hu/auth.php b/lang/hu/auth.php
index 90669e2fba2..b047d8016d5 100644
--- a/lang/hu/auth.php
+++ b/lang/hu/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Ezek a hitelesítő adatok nem egyeznek a rögzítettekkel.',
     'throttle' => 'Túl sok bejelentkezési próbálkozás. :seconds múlva lehet újra megpróbálni.',
+    'mfa_throttle' => 'Túl sok többlépcsős azonosítási próbálkozás. :seconds múlva lehet újra megpróbálni.',
 
     // Login & Register
     'sign_up' => 'Regisztráció',
@@ -20,6 +21,9 @@
     'username' => 'Felhasználónév',
     'email' => 'Email',
     'password' => 'Jelszó',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Jelszó megerősítése',
     'password_hint' => 'Legalább 8 karakter hosszú legyen',
     'forgot_password' => 'Elfelejtett jelszó?',
@@ -33,85 +37,85 @@
     'social_registration_text' => 'Regisztráció és bejelentkezés másik szolgáltatással.',
 
     'register_thanks' => 'Köszönjük a regisztrációt!',
-    'register_confirm' => 'Ellenőrizze a megadott e-mail címet, és kattintson a megerősítő gombra :appName eléréséhez.',
+    'register_confirm' => 'Ellenőrizze a megadott email címet, és kattintson a megerősítő gombra :appName eléréséhez.',
     'registrations_disabled' => 'A regisztráció jelenleg le van tiltva',
     'registration_email_domain_invalid' => 'Ebből az email tartományról nem lehet hozzáférni ehhez az alkalmazáshoz',
     'register_success' => 'Köszönjük a regisztrációt! A regisztráció és a bejelentkezés megtörtént.',
 
     // Login auto-initiation
     'auto_init_starting' => 'Bejelentkezési kísérlet',
-    'auto_init_starting_desc' => 'Kapcsolatba lépünk az azonosítási rendszereddel, hogy elkezdjük a bejelentkezési folyamatot. Ha 5 másodperc után sem történik előrelépés, próbálkozhatsz az alábbi linkre kattintva.',
+    'auto_init_starting_desc' => 'Kapcsolatba lépünk az azonosítási rendszerrel, hogy elkezdjük a bejelentkezési folyamatot. Ha 5 másodperc után sem történik előrelépés, próbálkozhat az alábbi linkre kattintva.',
     'auto_init_start_link' => 'Folytatás azonosítással',
 
     // Password Reset
     'reset_password' => 'Jelszó visszaállítása',
-    'reset_password_send_instructions' => 'Adja meg az e-mail címet, amire a jelszó-visszaállító linket küldjük.',
+    'reset_password_send_instructions' => 'Adja meg az email címet, amire a jelszó-visszaállító linket küldjük.',
     'reset_password_send_button' => 'Visszaállító hivatkozás elküldése',
-    'reset_password_sent' => 'A jelszó-visszaállító linket e-mailben fogjuk elküldeni a(z) :email címre, ha beállításra került a rendszerben.',
+    'reset_password_sent' => 'A jelszó-visszaállító linket emailben fogjuk elküldeni a(z) :email címre, ha található felhasználó ezzel a címmel a rendszerben.',
     'reset_password_success' => 'A jelszó sikeresen visszaállítva.',
     'email_reset_subject' => ':appName jelszó visszaállítása',
-    'email_reset_text' => 'Ezt az e-mailt azért küldtük, mert egy jelszó-visszaállításra vonatkozó kérést kaptunk ebből a fiókból.',
+    'email_reset_text' => 'Ezt az emailt azért küldtük, mert egy jelszó-visszaállításra vonatkozó kérést kaptunk ebből a fiókból.',
     'email_reset_not_requested' => 'Ha nem Ön kérte a jelszó visszaállítását, akkor nincs szükség további intézkedésre.',
 
     // Email Confirmation
     'email_confirm_subject' => ':appName alkalmazásban beállított email címet meg kell erősíteni',
     'email_confirm_greeting' => ':appName köszöni a csatlakozást!',
-    'email_confirm_text' => 'Az email címet a lenti gombra kattintva lehet megerősíteni:',
+    'email_confirm_text' => 'Kérjük erősítse meg email címét a lenti gombra kattintva:',
     'email_confirm_action' => 'Email megerősítése',
-    'email_confirm_send_error' => 'Az e-mail megerősítés kötelező, de a rendszer nem tudta elküldeni az e-mailt. Keresse fel az adminisztrátort, és gondoskodjon róla, hogy az e-mail helyesen van beállítva.',
-    'email_confirm_success' => 'Az Ön e-mail címe sikeresen meg lett erősítve, most már be tud jelentkezni az e-mail címe használatával.',
-    'email_confirm_resent' => 'Megerősítő e-mail újraküldve. Ellenőrizze a bejövő üzeneteit!',
+    'email_confirm_send_error' => 'Az email megerősítés kötelező, de a rendszer nem tudta elküldeni az emailt. Keresse fel az adminisztrátort, és gondoskodjon róla, hogy az email helyesen van beállítva.',
+    'email_confirm_success' => 'Az Ön email címe sikeresen meg lett erősítve, most már be tud jelentkezni az email címe használatával.',
+    'email_confirm_resent' => 'Megerősítő email újraküldve. Ellenőrizze a bejövő üzeneteit!',
     'email_confirm_thanks' => 'Köszönjük a megerősítést!',
-    'email_confirm_thanks_desc' => 'Kérjük, várjon egy pillanatot, amíg a megerősítést kezeljük. Ha nem kerül átirányításra 3 másodperc után, kattintson a lenti "Folytatás" linkre a továbbhaladáshoz.',
+    'email_confirm_thanks_desc' => 'Kérjük, várjon egy pillanatot, amíg a megerősítést kezeljük. Ha nem kerül átirányításra 3 másodpercen belül, kattintson a lenti "Folytatás" linkre a továbbhaladáshoz.',
 
     'email_not_confirmed' => 'Az email cím nincs megerősítve',
-    'email_not_confirmed_text' => 'Az email cím még nincs megerősítve.',
-    'email_not_confirmed_click_link' => 'Kattintson a regisztráció után nem sokkal elküldött e-mailben található hivatkozásra.',
+    'email_not_confirmed_text' => 'Az Ön email címe még nincs megerősítve.',
+    'email_not_confirmed_click_link' => 'Kattintson a regisztráció után nem sokkal elküldött emailben található hivatkozásra.',
     'email_not_confirmed_resend' => 'Ha nem érkezik meg a megerősítő email, a lenti űrlap beküldésével újra lehet küldeni.',
     'email_not_confirmed_resend_button' => 'Megerősítő email újraküldése',
 
     // User Invite
-    'user_invite_email_subject' => 'Ez egy meghívó :appName weboldalhoz!',
-    'user_invite_email_greeting' => 'Létre lett hozva egy fiók az :appName weboldalon.',
-    'user_invite_email_text' => 'Jelszó beállításához és hozzáféréshez a lenti gombra kell kattintani:',
+    'user_invite_email_subject' => 'Meghívták a(z) :appName weboldalra!',
+    'user_invite_email_greeting' => 'Létre lett hozva egy fiók a(z) :appName weboldalon.',
+    'user_invite_email_text' => 'Jelszó beállításához és hozzáféréshez kattintson a lenti gombra:',
     'user_invite_email_action' => 'Fiók jelszó beállítása',
     'user_invite_page_welcome' => ':appName üdvözöl!',
-    'user_invite_page_text' => 'A fiók véglegesítéséhez és a hozzáféréshez be kell állítani egy jelszót ami :appName weboldalon lesz használva a bejelentkezéshez.',
+    'user_invite_page_text' => 'A fiók véglegesítéséhez és a hozzáféréshez be kell állítania egy jelszót ami a(z) :appName weboldalon lesz használva a bejelentkezéshez.',
     'user_invite_page_confirm_button' => 'Jelszó megerősítése',
-    'user_invite_success_login' => 'Jelszó beállítva. Most már be tudsz jelentkezni a beállított jelszóval a következő rendszerbe: :appName!',
+    'user_invite_success_login' => 'Jelszó beállítva. Most már be tud jelentkezni a beállított jelszóval a(z) :appName rendszerbe!',
 
     // Multi-factor Authentication
     'mfa_setup' => 'Többlépcsős azonosítás beállítása',
     'mfa_setup_desc' => 'Állítsa be a többlépcsős azonosítást egy extra biztonsági rétegként a felhasználói fiókjához.',
     'mfa_setup_configured' => 'Már beállítva',
     'mfa_setup_reconfigure' => 'Újrakonfigurálás',
-    'mfa_setup_remove_confirmation' => 'Biztosan ki szeretné kapcsolni a többlépcsős azonosítást?',
+    'mfa_setup_remove_confirmation' => 'Biztosan el szeretné távolítani ezt a többlépcsős azonosítási módot?',
     'mfa_setup_action' => 'Beállítások',
     'mfa_backup_codes_usage_limit_warning' => 'Kevesebb, mint 5 visszaállítási kódja maradt. Kérem, hogy generáljon új kódokat, hogy csökkentse a rendszerből való kizárásának esélyét.',
     'mfa_option_totp_title' => 'Mobilalkalmazás',
-    'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
-    'mfa_option_backup_codes_title' => 'Visszaállítási kulcsok',
+    'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szüksége, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
+    'mfa_option_backup_codes_title' => 'Visszaállítási kódok',
     'mfa_option_backup_codes_desc' => 'Egyszer használatos biztonsági kódokat hoz létre, amelyeket bejelentkezéskor kell megadnia személyazonosságának igazolására. Ügyeljen arra, hogy ezeket biztonságos helyen tárolja.',
     'mfa_gen_confirm_and_enable' => 'Jóváhagyás és engedélyezés',
     'mfa_gen_backup_codes_title' => 'Visszaállítási kódok beállítása',
-    'mfa_gen_backup_codes_desc' => 'Tárolja el egy biztonságos helyen az alábbi kódokat. Bejelentkezés során fel tudja használni őket másodlagos bejelentkezési kódként.',
+    'mfa_gen_backup_codes_desc' => 'Tárolja el egy biztonságos helyen az alábbi kódokat! Bejelentkezés során fel tudja használni őket másodlagos bejelentkezési kódként.',
     'mfa_gen_backup_codes_download' => 'Kódok letöltése',
-    'mfa_gen_backup_codes_usage_warning' => 'A kódok egyszerhasználatosak',
+    'mfa_gen_backup_codes_usage_warning' => 'A kódok egyszer használatosak',
     'mfa_gen_totp_title' => 'Mobilalkalmazás beállítása',
-    'mfa_gen_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
-    'mfa_gen_totp_scan' => 'Szkenneld be az alábbi QR-kódot az általad használt azonosító alkalmazásoddal, hogy használhasd az alkalmazást.',
+    'mfa_gen_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szüksége, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
+    'mfa_gen_totp_scan' => 'Olvassa be az alábbi QR-kódot az Ön által használt azonosító alkalmazással, hogy használhassa az alkalmazást.',
     'mfa_gen_totp_verify_setup' => 'Beállítások ellenőrzése',
-    'mfa_gen_totp_verify_setup_desc' => 'Ellenőrizd, hogy minden működik, azzal hogy beírod a kapott kódot amit az authentikátor alkalmazás generált az alábbi beviteli mezőbe:',
-    'mfa_gen_totp_provide_code_here' => 'Add meg az alkalmazás által generált kódot ide',
+    'mfa_gen_totp_verify_setup_desc' => 'Ellenőrizze, hogy minden működik azzal, hogy beírja az azonosító alkalmazás által generált kódot az alábbi mezőbe:',
+    'mfa_gen_totp_provide_code_here' => 'Adja meg az alkalmazás által generált kódot ide',
     'mfa_verify_access' => 'Hozzáférés ellenőrzése',
-    'mfa_verify_access_desc' => 'Felhasználói fiókja megköveteli, hogy erősítse meg személyazonosságát egy további ellenőrzési szinttel, mielőtt hozzáférést kapna. A folytatáshoz használja az egyik konfigurált módszert.',
-    'mfa_verify_no_methods' => 'Nincs konfigurálva MFA',
-    'mfa_verify_no_methods_desc' => 'Nem található többlépcsős hitelesítési módszer a fiókjához. A hozzáféréshez legalább egy módszert be kell állítania.',
+    'mfa_verify_access_desc' => 'Felhasználói fiókja megköveteli, hogy erősítse meg személyazonosságát egy további ellenőrzési szinttel, mielőtt hozzáférést kapna. A folytatáshoz használja az egyik beállított módot.',
+    'mfa_verify_no_methods' => 'Nincsen beállítva mód',
+    'mfa_verify_no_methods_desc' => 'Nem található többlépcsős hitelesítési mód a fiókjához. A hozzáféréshez legalább egy módot be kell állítania.',
     'mfa_verify_use_totp' => 'Ellenőrzés mobil alkalmazás használatával',
     'mfa_verify_use_backup_codes' => 'Ellenőrzés visszaállítási kóddal',
     'mfa_verify_backup_code' => 'Visszaállítási kód',
     'mfa_verify_backup_code_desc' => 'Adjon meg egy még fel nem használt visszaállítási kódot:',
-    'mfa_verify_backup_code_enter_here' => 'Írd be a tartalék kódot',
+    'mfa_verify_backup_code_enter_here' => 'Írja be a visszaállítási kódot',
     'mfa_verify_totp_desc' => 'Írja be alább a mobilalkalmazásával generált kódot:',
-    'mfa_setup_login_notification' => 'Többfaktoros hitelesítés konfigurálva. Kérjük, most jelentkezzen be újra a konfigurált módszerrel.',
+    'mfa_setup_login_notification' => 'Többlépcsős hitelesítés beállítva. Kérjük, most jelentkezzen be újra a beállított módszerrel.',
 ];
diff --git a/lang/hu/common.php b/lang/hu/common.php
index e65e6890921..f0f6461387c 100644
--- a/lang/hu/common.php
+++ b/lang/hu/common.php
@@ -20,7 +20,7 @@
     'description' => 'Leírás',
     'role' => 'Szerepkör',
     'cover_image' => 'Borítókép',
-    'cover_image_description' => 'Ennek a képnek körülbelül 440 x 250 képpont méretűnek kell lennie, bár rugalmasan méretezhető és levágható, hogy a felhasználói felülethez illeszkedjen a különböző lehetőségek esetén, így a megjelenítés tényleges méretei eltérőek lesznek.',
+    'cover_image_description' => 'Ennek a képnek körülbelül 440 x 250 pixel méretűnek kell lennie, bár rugalmasan méretezhető és levágható, hogy a felhasználói felülethez illeszkedjen a különböző alkalmazások esetén, így a megjelenítés tényleges méretei eltérőek lesznek.',
 
     // Actions
     'actions' => 'Műveletek',
@@ -30,8 +30,8 @@
     'create' => 'Létrehozás',
     'update' => 'Frissítés',
     'edit' => 'Szerkesztés',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archiválás',
+    'unarchive' => 'Archiválás visszavonása',
     'sort' => 'Rendezés',
     'move' => 'Áthelyezés',
     'copy' => 'Másolás',
@@ -53,7 +53,7 @@
     'filter_active' => 'Aktív szűrő:',
     'filter_clear' => 'Szűrő törlése',
     'download' => 'Letöltés',
-    'open_in_tab' => 'Megnyitás új tab-on',
+    'open_in_tab' => 'Megnyitás új fülön',
     'open' => 'Megnyitás',
 
     // Sort Options
@@ -70,7 +70,7 @@
     'deleted_user' => 'Törölt felhasználó',
     'no_activity' => 'Nincs megjeleníthető aktivitás',
     'no_items' => 'Nincsenek elérhető elemek',
-    'back_to_top' => 'Oldal eleje',
+    'back_to_top' => 'Oldal tetejére',
     'skip_to_main_content' => 'Ugrás a fő tartalomra',
     'toggle_details' => 'Részletek átkapcsolása',
     'toggle_thumbnails' => 'Bélyegképek átkapcsolása',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktív',
     'never' => 'Soha',
     'none' => 'Egyik sem',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Kezdőlap',
@@ -97,12 +99,12 @@
 
     // Layout tabs
     'tab_info' => 'Információ',
-    'tab_info_label' => 'Tab: Másodlagos információk megjelenítése',
+    'tab_info_label' => 'Fül: Másodlagos információk megjelenítése',
     'tab_content' => 'Tartalom',
-    'tab_content_label' => 'Tab: Elsődleges információk megjelenítése',
+    'tab_content_label' => 'Fül: Elsődleges információk megjelenítése',
 
     // Email Content
-    'email_action_help' => 'Probléma esetén a lenti ":actionText" gombra kell kattintani, majd ki kell másolni a lenti webcímet és be kell illeszteni egy böngészőbe:',
+    'email_action_help' => 'Ha problémája van a(z) ":actionText" gombra kattintással, akkor másolja ki az URL-t, és illessze be a böngészőbe:',
     'email_rights' => 'Minden jog fenntartva',
 
     // Footer Link Options
@@ -111,5 +113,5 @@
     'terms_of_service' => 'Felhasználási feltételek',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Keresés :appName',
 ];
diff --git a/lang/hu/components.php b/lang/hu/components.php
index 6a54dd1b034..0b111df3844 100644
--- a/lang/hu/components.php
+++ b/lang/hu/components.php
@@ -9,8 +9,8 @@
     'image_list' => 'Képek listája',
     'image_details' => 'A kép részletei',
     'image_upload' => 'Kép feltöltése',
-    'image_intro' => 'Itt választhatsz ki és kezelhetsz olyan képeket, amelyeket korábban feltöltöttek a rendszerbe.',
-    'image_intro_upload' => 'Húzz ide egy új képfájlt az új kép feltöltéséhez, vagy használd a fenti "Kép feltöltése" gombot.',
+    'image_intro' => 'Itt kiválaszthatja és kezelheti a rendszerbe korábban feltöltött képeket.',
+    'image_intro_upload' => 'Húzzon ide egy új képfájlt az új kép feltöltéséhez, vagy használja a fenti "Kép feltöltése" gombot.',
     'image_all' => 'Összes',
     'image_all_title' => 'Összes kép megtekintése',
     'image_book_title' => 'A könyvhöz feltöltött képek megtekintése',
@@ -22,8 +22,8 @@
     'image_updated' => 'Frissítve ekkor: :updateDate',
     'image_load_more' => 'Több betöltése',
     'image_image_name' => 'Kép neve',
-    'image_delete_used' => 'Ez a kép a lenti oldalakon van használatban.',
-    'image_delete_confirm_text' => 'Biztosan törölhető ez a kép?',
+    'image_delete_used' => 'Ez a kép az alábbi oldalakon van használatban.',
+    'image_delete_confirm_text' => 'Biztosan törli ezt a képet?',
     'image_select_image' => 'Kép kiválasztása',
     'image_dropzone' => 'Képek feltöltése ejtéssel vagy kattintással',
     'image_dropzone_drop' => 'Húzza a képeket ide a feltöltéshez',
@@ -34,7 +34,7 @@
     'image_delete_success' => 'Kép sikeresen törölve',
     'image_replace' => 'Kép cseréje',
     'image_replace_success' => 'Képfájl sikeresen frissítve',
-    'image_rebuild_thumbs' => 'Méret variációk újragenerálása',
+    'image_rebuild_thumbs' => 'Méret változatok újragenerálása',
     'image_rebuild_thumbs_success' => 'Kép méret változatok sikeresen újra lettek generálva!',
 
     // Code Editor
diff --git a/lang/hu/editor.php b/lang/hu/editor.php
index 705bc6d54c0..885e6951f8a 100644
--- a/lang/hu/editor.php
+++ b/lang/hu/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Mégsem',
     'save' => 'Mentés',
     'close' => 'Bezárás',
-    'apply' => 'Apply',
+    'apply' => 'Alkalmaz',
     'undo' => 'Visszavonás',
     'redo' => 'Újra',
     'left' => 'Balra',
@@ -48,7 +48,7 @@
     'superscript' => 'Felső index',
     'subscript' => 'Alsó index',
     'text_color' => 'Szöveg szín',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Kiemelő szín',
     'custom_color' => 'Egyéni szín',
     'remove_color' => 'Szín eltávolítása',
     'background_color' => 'Háttérszín',
@@ -65,14 +65,14 @@
     'insert_image' => 'Kép beszúrása',
     'insert_image_title' => 'Kép beszúrása/szerkesztése',
     'insert_link' => 'Hivatkozás beszúrása/szerkesztése',
-    'insert_link_title' => 'Hivatkozás Beszúrása/Szerkesztése',
+    'insert_link_title' => 'Hivatkozás beszúrása/szerkesztése',
     'insert_horizontal_line' => 'Vízszintes vonal beszúrása',
     'insert_code_block' => 'Kódrészlet beszúrása',
-    'edit_code_block' => 'Kódrészlet beszúrása',
+    'edit_code_block' => 'Kódrészlet szerkesztése',
     'insert_drawing' => 'Rajz beszúrása/szerkesztése',
     'drawing_manager' => 'Rajzkezelő',
-    'insert_media' => 'Media beszúrása/szerkesztése',
-    'insert_media_title' => 'Media Beszúrása/Szerkesztése',
+    'insert_media' => 'Média beszúrása/szerkesztése',
+    'insert_media_title' => 'Média beszúrása/szerkesztése',
     'clear_formatting' => 'Formázás törlése',
     'source_code' => 'Forráskód',
     'source_code_title' => 'Forráskód',
@@ -81,11 +81,11 @@
 
     // Tables
     'table_properties' => 'Táblázat tulajdonságai',
-    'table_properties_title' => 'Táblázat Tulajdonságai',
+    'table_properties_title' => 'Táblázat tulajdonságai',
     'delete_table' => 'Táblázat törlése',
-    'table_clear_formatting' => 'Tábla formázás törlése',
+    'table_clear_formatting' => 'Táblázat formázás törlése',
     'resize_to_contents' => 'Átméretezés a tartalomhoz',
-    'row_header' => 'Sorfejléc',
+    'row_header' => 'Fejléc sor',
     'insert_row_before' => 'Sor beszúrása elé',
     'insert_row_after' => 'Sor beszúrása mögé',
     'delete_row' => 'Sor törlése',
@@ -96,7 +96,7 @@
     'table_row' => 'Sor',
     'table_column' => 'Oszlop',
     'cell_properties' => 'Cella tulajdonságai',
-    'cell_properties_title' => 'Cella Tulajdonságai',
+    'cell_properties_title' => 'Cella tulajdonságai',
     'cell_type' => 'Cella típusa',
     'cell_type_cell' => 'Cella',
     'cell_scope' => 'Hatáskör',
@@ -111,7 +111,7 @@
     'border_style' => 'Szegély stílusa',
     'border_color' => 'Szegély színe',
     'row_properties' => 'Sor tulajdonságai',
-    'row_properties_title' => 'Sor Tulajdonságai',
+    'row_properties_title' => 'Sor tulajdonságai',
     'cut_row' => 'Sor kivágása',
     'copy_row' => 'Sor másolása',
     'paste_row_before' => 'Sor beillesztése elé',
@@ -125,10 +125,10 @@
     'copy_column' => 'Oszlop másolása',
     'paste_column_before' => 'Oszlop beszúrása elé',
     'paste_column_after' => 'Oszlop beszúrása utána',
-    'cell_padding' => 'Cellatávolság',
+    'cell_padding' => 'Cellamargó',
     'cell_spacing' => 'Cellatávolság',
     'caption' => 'Felirat',
-    'show_caption' => 'Képaláírás mutatása',
+    'show_caption' => 'Felirat megjelenítése',
     'constrain' => 'Arányok megőrzése',
     'cell_border_solid' => 'Folyamatos',
     'cell_border_dotted' => 'Pontozott',
@@ -145,33 +145,33 @@
     'source' => 'Forrás',
     'alt_desc' => 'Alternatív leírás',
     'embed' => 'Beágyazás',
-    'paste_embed' => 'Illeszd be a beágyazási kódot ide:',
+    'paste_embed' => 'Illessze be a beágyazási kódot ide:',
     'url' => 'URL',
-    'text_to_display' => 'Megjelenő szöveg',
+    'text_to_display' => 'Megjelenítendő szöveg',
     'title' => 'Cím',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Hivatkozások tallózása',
     'open_link' => 'Hivatkozás megnyitása',
     'open_link_in' => 'Hivatkozás megnyitása...',
     'open_link_current' => 'Aktuális ablak',
     'open_link_new' => 'Új ablak',
     'remove_link' => 'Hivatkozás eltávolítása',
-    'insert_collapsible' => 'Illeszd be az összecsukható blokkot',
-    'collapsible_unwrap' => 'Kicsomagol',
+    'insert_collapsible' => 'Összecsukható blokk beszúrása',
+    'collapsible_unwrap' => 'Eltávolítás',
     'edit_label' => 'Címke szerkesztése',
-    'toggle_open_closed' => 'Nyitott/zárt váltása',
+    'toggle_open_closed' => 'Nyitott/zárt állapot váltása',
     'collapsible_edit' => 'Összecsukható blokk szerkesztése',
-    'toggle_label' => 'Címke ki-be kapcsolása',
+    'toggle_label' => 'Címke ki/be kapcsolása',
 
     // About view
-    'about' => 'A szerkesztőről',
+    'about' => 'A szerkesztő névjegye',
     'about_title' => 'A WYSIWYG szerkesztőről',
-    'editor_license' => 'Szerkesztő Licensz és Copyright információi',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_license' => 'Szerkesztő licenc és jogi információi',
+    'editor_lexical_license' => 'Ez a szerkesztő az MIT licenc alatt szolgáltatott :lexicalLink segítségével készült.',
+    'editor_lexical_license_link' => 'A teljes licenc az itt található.',
     'editor_tiny_license' => 'Ez a szerkesztő az MIT licenc alatt szolgáltatott :tinyLink segítségével készült.',
     'editor_tiny_license_link' => 'A TinyMCE szerzői jogi és licencinformációi itt találhatók.',
-    'save_continue' => 'Mentés és Folytatás',
-    'callouts_cycle' => '(Folyamatos lenyomva tartással válassza ki a típusok közötti váltást)',
+    'save_continue' => 'Oldal mentése és folytatás',
+    'callouts_cycle' => '(Ismételt lenyomással váltogathat a típusok között)',
     'link_selector' => 'Tartalom hivatkozása',
     'shortcuts' => 'Gyorsbillentyűk',
     'shortcut' => 'Gyorsbillentyű',
diff --git a/lang/hu/entities.php b/lang/hu/entities.php
index 570120dfa99..b499a9b6b72 100644
--- a/lang/hu/entities.php
+++ b/lang/hu/entities.php
@@ -44,45 +44,45 @@
     'default_template_explain' => 'Rendeljen hozzá egy oldalsablont, amely alapértelmezett tartalomként lesz használva az ezen az elemen belül létrehozott összes oldalon. Ne feledje, hogy ezt csak akkor használja, ha az oldal készítője megtekintési hozzáféréssel rendelkezik a kiválasztott sablonoldalhoz.',
     'default_template_select' => 'Válasszon ki egy oldalsablont',
     'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'import_validate' => 'Importált adatok ellenőrzése',
+    'import_desc' => 'Importáljon könyveket, fejezeteket és oldalakat egy azonos, vagy egy másik alkalmazásból származó ZIP állományból. A fájl feltöltése és ellenőrzése után beállíthatja és elindíthatja az importálást a következő oldalon.',
+    'import_zip_select' => 'Feltöltendő ZIP fájl kiválasztása',
+    'import_zip_validation_errors' => 'A megadott ZIP fájlban hibák találhatók:',
+    'import_pending' => 'Függő importálások',
+    'import_pending_none' => 'Nincs elindított importálás.',
+    'import_continue' => 'Importálás folytatása',
+    'import_continue_desc' => 'Importálás előtt nézze át a ZIP fájlból betöltendő tartalmakat. Amikor készen áll, futtassa le az importálást, hogy hozzáadja az állományokat a rendszerhez. A feltöltött ZIP fájl az importálás után automatikusan törlésre kerül.',
+    'import_details' => 'Importálás részletei',
+    'import_run' => 'Importálás',
+    'import_size' => ':size méretű ZIP',
+    'import_uploaded_at' => 'Feltöltve:',
+    'import_uploaded_by' => 'Feltöltötte:',
+    'import_location' => 'Importálás helye',
+    'import_location_desc' => 'Válasszon ki egy helyet az importált tartalomnak. Létrehozási jogosultsággal kell rendelkezni a kiválasztott helyen.',
+    'import_delete_confirm' => 'Biztosan törölni akarja ezt az importálást?',
+    'import_delete_desc' => 'Ez véglegesen el fogja távolítani a feltöltött ZIP fájlt.',
+    'import_errors' => 'Importálási hibák',
+    'import_errors_desc' => 'A következő hibák jelentkeztek az importálás során:',
+    'breadcrumb_siblings_for_page' => 'Navigáció az oldal szomszédaihoz',
+    'breadcrumb_siblings_for_chapter' => 'Navigáció a fejezet szomszédaihoz',
+    'breadcrumb_siblings_for_book' => 'Navigáció a könyv szomszédaihoz',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigáció a polc szomszédaihoz',
 
     // Permissions and restrictions
     'permissions' => 'Jogosultságok',
     'permissions_desc' => 'Itt állítsa be az engedélyeket a felhasználói szerepkörök által biztosított alapértelmezett engedélyek felülbírálásához.',
-    'permissions_book_cascade' => 'A könyvekre beállított engedélyek automatikusan az alárendelt fejezetekhez és oldalakhoz kapcsolódnak, kivéve, ha saját engedélyekkel rendelkeznek.',
-    'permissions_chapter_cascade' => 'A fejezetekre beállított engedélyek automatikusan az alárendelt oldalakra lépnek át, hacsak nem rendelkeznek saját engedélyekkel.',
+    'permissions_book_cascade' => 'A könyvekre beállított engedélyek automatikusan az alárendelt fejezetekre és oldalakra is érvényesek, kivéve, ha azok saját engedély beállításokkal rendelkeznek.',
+    'permissions_chapter_cascade' => 'A fejezetekre beállított engedélyek automatikusan az alárendelt oldalakra is érvényesek, kivéve, ha azok saját engedély beállításokkal rendelkeznek.',
     'permissions_save' => 'Jogosultságok mentése',
     'permissions_owner' => 'Tulajdonos',
     'permissions_role_everyone_else' => 'Mindenki más',
-    'permissions_role_everyone_else_desc' => 'Állítson be engedélyeket az összes, kifejezetten nem felülírt szerepkörhöz.',
+    'permissions_role_everyone_else_desc' => 'Állítson be engedélyeket az összes nem felülírt szerepkörhöz.',
     'permissions_role_override' => 'A szerepkör engedélyeinek felülbírálása',
-    'permissions_inherit_defaults' => 'Alapértelmezett értékek öröklése',
+    'permissions_inherit_defaults' => 'Alapértelmezett engedélyek öröklése',
 
     // Search
     'search_results' => 'Keresési eredmények',
-    'search_total_results_found' => ':count találat|összesen :count találat',
+    'search_total_results_found' => ':count találat|Összesen :count találat',
     'search_clear' => 'Keresés törlése',
     'search_no_pages' => 'Nincsenek a keresésnek megfelelő oldalak',
     'search_for_term' => ':term keresése',
@@ -110,7 +110,7 @@
     // Shelves
     'shelf' => 'Polc',
     'shelves' => 'Polcok',
-    'x_shelves' => ':count polc|:count polcok',
+    'x_shelves' => ':count polc|:count polc',
     'shelves_empty' => 'Nincsenek könyvespolcok létrehozva',
     'shelves_create' => 'Új polc létrehozása',
     'shelves_popular' => 'Népszerű polcok',
@@ -121,24 +121,24 @@
     'shelves_save' => 'Polc mentése',
     'shelves_books' => 'Könyvek ezen a polcon',
     'shelves_add_books' => 'Könyvek hozzáadása ehhez a polchoz',
-    'shelves_drag_books' => 'Könyveket áthúzással lehet elhelyezni ezen a polcon',
+    'shelves_drag_books' => 'Húzzon ide könyveket a polchoz hozzáadáshoz',
     'shelves_empty_contents' => 'Ehhez a polchoz nincsenek könyvek rendelve',
     'shelves_edit_and_assign' => 'Polc szerkesztése könyvek hozzárendeléséhez',
     'shelves_edit_named' => ':name polc szerkesztése',
     'shelves_edit' => 'Polc szerkesztése',
     'shelves_delete' => 'Polc törlése',
     'shelves_delete_named' => ':name polc törlése',
-    'shelves_delete_explain' => "':name'. nevű polc ezzel le lesz törölve. A benne található könyvek nem lesznek törölve.",
-    'shelves_delete_confirmation' => 'Biztosan törölhető ez a polc?',
-    'shelves_permissions' => 'Polc jogosultság',
+    'shelves_delete_explain' => "Ez törölni fogja a(z) ':name' nevű polcot. A benne található könyvek nem lesznek törölve.",
+    'shelves_delete_confirmation' => 'Biztosan törli ezt a polcot?',
+    'shelves_permissions' => 'Polc jogosultságok',
     'shelves_permissions_updated' => 'Polc jogosultságok frissítve',
     'shelves_permissions_active' => 'Polc jogosultságok aktívak',
-    'shelves_permissions_cascade_warning' => 'A polcokhoz kapcsolódó jogosultságok nem kapcsolódnak automatikusan a tárolt könyvekhez. Ennek az az oka, hogy egy könyv több polcon is létezhet. Az engedélyek azonban lemásolhatók a gyermekkönyvekbe az alábbi lehetőség segítségével.',
-    'shelves_permissions_create' => 'A polclétrehozási jogosultságok csak az alárendelt könyvekbe való másoláshoz használhatók az alábbi művelettel. Nem szabályozzák a könyvek létrehozásának lehetőségét.',
-    'shelves_copy_permissions_to_books' => 'Jogosultság másolása könyvekre',
-    'shelves_copy_permissions' => 'Jogosultság másolása',
-    'shelves_copy_permissions_explain' => 'Ezzel a polc jelenlegi engedélybeállításait alkalmazza a benne található összes könyvre. Az aktiválás előtt győződjön meg arról, hogy a polc engedélyeinek módosításait elmentette.',
-    'shelves_copy_permission_success' => 'Könyvespolc jogosultságok átmásolva :count könyvre',
+    'shelves_permissions_cascade_warning' => 'A polcokhoz kapcsolódó jogosultságok nem vonatkoznak automatikusan a hozzájuk rendelt könyvekre. Ennek az az oka, hogy egy könyv több polchoz is tartozhat. Az engedélyek azonban lemásolhatók a könyvekre az alábbi opcióval.',
+    'shelves_permissions_create' => 'A polc létrehozási jogosultságok csak a jogosultságok a hozzárendelt könyvekre másolásához vannak használva. Nem szabályozzák a könyvek létrehozásának lehetőségét.',
+    'shelves_copy_permissions_to_books' => 'Jogosultságok másolása könyvekre',
+    'shelves_copy_permissions' => 'Jogosultságok másolása',
+    'shelves_copy_permissions_explain' => 'Ezzel alkalmazza a polc jelenlegi engedély beállításait a benne található összes könyvre. Az aktiválás előtt győződjön meg arról, hogy a polc engedélyeinek módosításait elmentette.',
+    'shelves_copy_permission_success' => 'Polc jogosultságok átmásolva :count könyvre',
 
     // Books
     'book' => 'Könyv',
@@ -154,8 +154,8 @@
     'books_create' => 'Új könyv létrehozása',
     'books_delete' => 'Könyv törlése',
     'books_delete_named' => ':bookName könyv törlése',
-    'books_delete_explain' => '\':bookName\' nevű könyv törölve lesz. Minden oldal és fejezet el lesz távolítva.',
-    'books_delete_confirmation' => 'Biztosan törölhető ez a könyv?',
+    'books_delete_explain' => 'Ez törölni fogja a(z) \':bookName\' nevű könyvet. Minden oldal és fejezet el lesz távolítva.',
+    'books_delete_confirmation' => 'Biztosan törli ezt a könyvet?',
     'books_edit' => 'Könyv szerkesztése',
     'books_edit_named' => ':bookName könyv szerkesztése',
     'books_form_book_name' => 'Könyv neve',
@@ -170,9 +170,10 @@
     'books_search_this' => 'Keresés ebben a könyvben',
     'books_navigation' => 'Könyv navigáció',
     'books_sort' => 'Könyv tartalmak rendezése',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Rendezze át egy könyv tartalmát a fejezetek és oldalak mozgatásával. Más könyvek is hozzáadhatók, így könnyű az átmozgatás könyvek között is. Opcionálisan egy rendezési szabály is megadható, hogy minden változtatáskor automatikusan rendezze a könyv tartalmát.',
+    'books_sort_auto_sort' => 'Automatikus rendezés opció',
+    'books_sort_auto_sort_active' => 'Aktív automatikus rendezés: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Automatikus rendezési szabályok a "Listák és rendezés" beállításoknál hozhatók létre egy megfelelő jogosultságokkal rendelkező felhasználó által.',
     'books_sort_named' => ':bookName könyv rendezése',
     'books_sort_name' => 'Rendezés név szerint',
     'books_sort_created' => 'Rendezés létrehozás dátuma szerint',
@@ -180,7 +181,7 @@
     'books_sort_chapters_first' => 'Fejezetek elől',
     'books_sort_chapters_last' => 'Fejezetek hátul',
     'books_sort_show_other' => 'Egyéb könyvek mutatása',
-    'books_sort_save' => 'Új elrendezés mentése',
+    'books_sort_save' => 'Új sorrend mentése',
     'books_sort_show_other_desc' => 'Adjon hozzá más könyveket, hogy bevonja őket a rendezési műveletbe, és lehetővé tegye a könyvek közötti egyszerű átszervezést.',
     'books_sort_move_up' => 'Mozgatás fel',
     'books_sort_move_down' => 'Mozgatás le',
@@ -190,7 +191,7 @@
     'books_sort_move_next_chapter' => 'Mozgatás a következő fejezetbe',
     'books_sort_move_book_start' => 'Mozgatás a könyv elejére',
     'books_sort_move_book_end' => 'Mozgatás a könyv végére',
-    'books_sort_move_before_chapter' => 'Morgazás a fejezet elé',
+    'books_sort_move_before_chapter' => 'Mozgatás a fejezet elé',
     'books_sort_move_after_chapter' => 'Mozgatás a fejezet után',
     'books_copy' => 'Könyv másolása',
     'books_copy_success' => 'Könyv sikeresen lemásolva',
@@ -198,14 +199,14 @@
     // Chapters
     'chapter' => 'Fejezet',
     'chapters' => 'Fejezetek',
-    'x_chapters' => ':count fejezet|:count fejezetek',
+    'x_chapters' => ':count fejezet|:count fejezet',
     'chapters_popular' => 'Népszerű fejezetek',
     'chapters_new' => 'Új fejezet',
     'chapters_create' => 'Új fejezet létrehozása',
     'chapters_delete' => 'Fejezet törlése',
     'chapters_delete_named' => ':chapterName fejezet törlése',
-    'chapters_delete_explain' => 'A(z) \':chapterName\' törlésére készül. A fejezethez tartozó minden oldal is törlésre fog kerülni.',
-    'chapters_delete_confirm' => 'Biztosan törölhető ez a fejezet?',
+    'chapters_delete_explain' => 'Ez törölni fogja a(z) \':chapterName\' fejezetet. A fejezethez tartozó minden oldal is törlésre fog kerülni.',
+    'chapters_delete_confirm' => 'Biztosan törli ezt a fejezetet?',
     'chapters_edit' => 'Fejezet szerkesztése',
     'chapters_edit_named' => ':chapterName fejezet szerkesztése',
     'chapters_save' => 'Fejezet mentése',
@@ -234,32 +235,32 @@
     'pages_delete_draft' => 'Vázlat oldal törlése',
     'pages_delete_success' => 'Oldal törölve',
     'pages_delete_draft_success' => 'Vázlat oldal törölve',
-    'pages_delete_warning_template' => 'Ez az oldal aktívan használatban van könyv vagy fejezet alapértelmezett oldalsablonjaként. Ezekhez a könyvekhez vagy fejezetekhez a továbbiakban nem lesz alapértelmezett oldalsablon hozzárendelve az oldal törlése után.',
-    'pages_delete_confirm' => 'Biztosan törölhető ez az oldal?',
-    'pages_delete_draft_confirm' => 'Biztosan törölhető ez a vázlatoldal?',
+    'pages_delete_warning_template' => 'Ez az oldal aktívan használatban van egy könyv vagy egy fejezet alapértelmezett oldalsablonjaként. Ezekhez a könyvekhez vagy fejezetekhez nem lesz alapértelmezett oldalsablon hozzárendelve az oldal törlése után.',
+    'pages_delete_confirm' => 'Biztosan törli ezt az oldalt?',
+    'pages_delete_draft_confirm' => 'Biztosan törli ezt az vázlat oldalt?',
     'pages_editing_named' => ':pageName oldal szerkesztése',
-    'pages_edit_draft_options' => 'Vázlatbeállítások',
+    'pages_edit_draft_options' => 'Vázlat beállítások',
     'pages_edit_save_draft' => 'Vázlat mentése',
     'pages_edit_draft' => 'Oldal vázlat szerkesztése',
     'pages_editing_draft' => 'Vázlat szerkesztése',
     'pages_editing_page' => 'Oldal szerkesztése',
-    'pages_edit_draft_save_at' => 'Vázlat elmentve:',
+    'pages_edit_draft_save_at' => 'Vázlat elmentve: ',
     'pages_edit_delete_draft' => 'Vázlat törlése',
-    'pages_edit_delete_draft_confirm' => 'Biztos benne, hogy törölni kívánja az oldalmódosítások piszkozatát? Az utolsó teljes mentés óta végrehajtott összes módosítása elvész, és a szerkesztő frissül a legfrissebb, nem vázlatos mentési állapottal.',
+    'pages_edit_delete_draft_confirm' => 'Biztos benne, hogy törli az oldalmódosítások vázlatát? Az utolsó teljes mentés óta végrehajtott összes módosítása elvész, és a szerkesztő frissül a legfrissebb, nem vázlatos mentési állapottal.',
     'pages_edit_discard_draft' => 'Vázlat elvetése',
     'pages_edit_switch_to_markdown' => 'Váltás Markdown szerkesztőre',
-    'pages_edit_switch_to_markdown_clean' => '(Tisztított tartalom)',
+    'pages_edit_switch_to_markdown_clean' => '(Tiszta tartalom)',
     'pages_edit_switch_to_markdown_stable' => '(Stabil tartalom)',
     'pages_edit_switch_to_wysiwyg' => 'Váltás a WYSIWYG szerkesztőre',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Váltás az új WYSIWYG szerkeztőre',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Béta tesztelés alatt)',
     'pages_edit_set_changelog' => 'Változásnapló beállítása',
     'pages_edit_enter_changelog_desc' => 'A végrehajtott módosítások rövid leírása',
     'pages_edit_enter_changelog' => 'Változásnapló megadása',
     'pages_editor_switch_title' => 'Szerkesztőváltás',
     'pages_editor_switch_are_you_sure' => 'Biztosan módosítani szeretné ennek az oldalnak a szerkesztőjét?',
-    'pages_editor_switch_consider_following' => 'A szerkesztők módosításakor vegye figyelembe a következőket:',
-    'pages_editor_switch_consideration_a' => 'Mentés után az új szerkesztő opciót minden jövőbeli szerkesztő használni fogja, beleértve azokat is, amelyek esetleg nem tudják maguk módosítani a szerkesztő típusát.',
+    'pages_editor_switch_consider_following' => 'A szerkesztők váltásakor vegye figyelembe a következőket:',
+    'pages_editor_switch_consideration_a' => 'Mentés után az új szerkesztő opciót fogja minden jövőbeli szerkesztő használni, beleértve azokat is, akik esetleg nem tudják maguk módosítani a szerkesztő típusát.',
     'pages_editor_switch_consideration_b' => 'Ez bizonyos körülmények között a részletek és a szintaxis elvesztéséhez vezethet.',
     'pages_editor_switch_consideration_c' => 'A legutóbbi mentés óta végrehajtott címke- vagy változásnapló-módosítások nem maradnak fenn a módosítás során.',
     'pages_save' => 'Oldal mentése',
@@ -268,11 +269,11 @@
     'pages_md_editor' => 'Szerkesztő',
     'pages_md_preview' => 'Előnézet',
     'pages_md_insert_image' => 'Kép beillesztése',
-    'pages_md_insert_link' => 'Entitás hivatkozás beillesztése',
+    'pages_md_insert_link' => 'Belső hivatkozás beillesztése',
     'pages_md_insert_drawing' => 'Rajz beillesztése',
     'pages_md_show_preview' => 'Előnézet megjelenítése',
     'pages_md_sync_scroll' => 'Előnézet pozíció szinkronizálása',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Sima szöveg szerkesztő',
     'pages_drawing_unsaved' => 'Nem mentett rajz található',
     'pages_drawing_unsaved_confirm' => 'A rendszer nem mentett rajzadatokat talált egy korábbi sikertelen rajzmentési kísérletből. Szeretné visszaállítani és folytatni a nem mentett rajz szerkesztését?',
     'pages_not_in_chapter' => 'Az oldal nincs fejezetben',
@@ -284,7 +285,7 @@
     'pages_permissions_success' => 'Oldal jogosultságok frissítve',
     'pages_revision' => 'Változat',
     'pages_revisions' => 'Oldal változatai',
-    'pages_revisions_desc' => 'Az alábbiakban az oldal összes korábbi verziója látható. Visszatekinthet, összehasonlíthatja és visszaállíthatja a régi oldalverziókat, ha az engedélyek lehetővé teszik. Előfordulhat, hogy az oldal teljes előzménye itt nem jelenik meg teljes mértékben, mivel a rendszerkonfigurációtól függően a régi változatok automatikusan törlődnek.',
+    'pages_revisions_desc' => 'Az alábbiakban az oldal összes korábbi verziója látható. Visszanézheti, összehasonlíthatja és visszaállíthatja a régi verziókat, ha az engedélyek lehetővé teszik. Előfordulhat, hogy az oldal teljes előzménye itt nem jelenik meg, mivel a beállításoktól függően a régi változatok automatikusan törlődhetnek.',
     'pages_revisions_named' => ':pageName oldal változatai',
     'pages_revision_named' => ':pageName oldal változata',
     'pages_revision_restored_from' => 'Visszaállítva innen: #:id; :summary',
@@ -292,8 +293,8 @@
     'pages_revisions_date' => 'Változat dátuma',
     'pages_revisions_number' => '#',
     'pages_revisions_sort_number' => 'Változat száma',
-    'pages_revisions_numbered' => 'Változat #:id',
-    'pages_revisions_numbered_changes' => '#:id változat módosításai',
+    'pages_revisions_numbered' => '#:id. változat',
+    'pages_revisions_numbered_changes' => '#:id. változat módosításai',
     'pages_revisions_editor' => 'Szerkesztő típusa',
     'pages_revisions_changelog' => 'Változásnapló',
     'pages_revisions_changes' => 'Módosítások',
@@ -303,12 +304,12 @@
     'pages_revisions_none' => 'Ennek az oldalnak nincsenek változatai',
     'pages_copy_link' => 'Hivatkozás másolása',
     'pages_edit_content_link' => 'Ugrás a szakaszhoz a szerkesztőben',
-    'pages_pointer_enter_mode' => 'Lépjen be a szakaszválasztó módba',
+    'pages_pointer_enter_mode' => 'Belépés szakaszválasztó módba',
     'pages_pointer_label' => 'Oldalszakasz beállításai',
     'pages_pointer_permalink' => 'Oldalszakasz állandó hivatkozás',
     'pages_pointer_include_tag' => 'Oldalszakasz tartalmazza a címkét',
-    'pages_pointer_toggle_link' => 'Permalink mód, Nyomja meg az include tag megjelenítéséhez',
-    'pages_pointer_toggle_include' => 'Include tag mód, Nyomja meg az permalink megjelenítéséhez',
+    'pages_pointer_toggle_link' => 'Állandó hivatkozás mód. Nyomja meg az beágyazó címke megjelenítéséhez!',
+    'pages_pointer_toggle_include' => 'Beágyazó címke mód. Nyomja meg az állandó hivatkozás megjelenítéséhez!',
     'pages_permissions_active' => 'Oldal jogosultságok aktívak',
     'pages_initial_revision' => 'Kezdeti közzététel',
     'pages_references_update_revision' => 'A belső hivatkozások automatikus frissítése',
@@ -317,36 +318,39 @@
     'pages_draft_edited_notification' => 'Ezt az oldalt azóta már frissítették. Javasolt ennek a vázlatnak az elvetése.',
     'pages_draft_page_changed_since_creation' => 'Ez az oldal a vázlat létrehozása óta frissült. Javasoljuk, hogy dobja el ezt a piszkozatot, vagy ügyeljen arra, hogy ne írja felül az oldal módosításait.',
     'pages_draft_edit_active' => [
-        'start_a' => ':count felhasználók kezdte el szerkeszteni ezt az oldalt',
+        'start_a' => ':count felhasználó kezdte el szerkeszteni ezt az oldalt',
         'start_b' => ':userName elkezdte szerkeszteni ezt az oldalt',
         'time_a' => 'mióta az oldal utoljára frissítve volt',
         'time_b' => 'az utolsó :minCount percben',
-        'message' => ':start :time. Ügyeljen arra, hogy ne írjuk felül egymás frissítéseit!',
+        'message' => ':start :time. Ügyeljen arra, hogy ne írja felül mások frissítéseit!',
     ],
-    'pages_draft_discarded' => 'Vázlat elvetve! A szerkesztő frissítve lesz az oldal aktuális tartalmával',
-    'pages_draft_deleted' => 'Vázlat elvetve! A szerkesztő frissítve lesz az oldal aktuális tartalmával',
+    'pages_draft_discarded' => 'Vázlat elvetve! A szerkesztő frissítve lett az oldal aktuális tartalmával',
+    'pages_draft_deleted' => 'Vázlat törölve! A szerkesztő frissítve lett az oldal aktuális tartalmával',
     'pages_specific' => 'Egy bizonyos oldal',
     'pages_is_template' => 'Oldalsablon',
 
     // Editor Sidebar
     'toggle_sidebar' => 'Oldalsáv ki/be',
+    'page_contents' => 'Oldal tartalma',
+    'page_contents_none' => 'Nincsen egy címsor sem az oldalon.',
+    'page_contents_info' => 'A tartalom menü automatikusan generálódik az oldalon használt címsorokból.',
     'page_tags' => 'Oldal címkék',
     'chapter_tags' => 'Fejezet címkék',
     'book_tags' => 'Könyv címkék',
     'shelf_tags' => 'Polc címkék',
     'tag' => 'Címke',
     'tags' =>  'Címkék',
-    'tags_index_desc' => 'A címkék a rendszeren belüli tartalomra alkalmazhatók a kategorizálás rugalmas formája alkalmazása érdekében. A címkéknek kulcsuk és értékük is lehetnek, de az érték nem kötelező. Alkalmazása után a tartalom lekérdezhető a címkenév és érték használatával.',
+    'tags_index_desc' => 'A rendszeren belül a tartalomra címkék helyezhetők a rugalmasan rendezhetőség érdekében. A címkéknek neve és értéke is lehet, de az érték nem kötelező. Beállítás után a tartalom lekérdezhető a címkenév és érték használatával.',
     'tag_name' =>  'Címkenév',
     'tag_value' => 'Címke érték (nem kötelező)',
     'tags_explain' => "Címkék hozzáadása a tartalom jobb kategorizálásához.\nA mélyebb szervezettség megvalósításához hozzá lehet rendelni egy értéket a címkéhez.",
     'tags_add' => 'Másik címke hozzáadása',
     'tags_remove' => 'Címke eltávolítása',
-    'tags_usages' => 'Összes címkehasználat',
-    'tags_assigned_pages' => 'Oldalakhoz Rendelt',
+    'tags_usages' => 'Összes címke használat',
+    'tags_assigned_pages' => 'Oldalakhoz rendelt',
     'tags_assigned_chapters' => 'Fejezetekhez rendelt',
-    'tags_assigned_books' => 'Könyvekhez Rendelt',
-    'tags_assigned_shelves' => 'Polcokhoz Rendelt',
+    'tags_assigned_books' => 'Könyvekhez rendelt',
+    'tags_assigned_shelves' => 'Polcokhoz rendelt',
     'tags_x_unique_values' => ':count egyedi érték',
     'tags_all_values' => 'Összes érték',
     'tags_view_tags' => 'Címkék megtekintése',
@@ -355,12 +359,12 @@
     'attachments' => 'Csatolmányok',
     'attachments_explain' => 'Az oldalon megjelenő fájlok feltöltése vagy hivatkozások csatolása. Az oldal oldalsávjában fognak megjelenni.',
     'attachments_explain_instant_save' => 'Az itt történt módosítások azonnal el lesznek mentve.',
-    'attachments_upload' => 'Fájlfeltöltés',
+    'attachments_upload' => 'Fáj lfeltöltése',
     'attachments_link' => 'Hivatkozás csatolása',
     'attachments_upload_drop' => 'Alternatív megoldásként a fájlt ide húzva is fel lehet tölteni mellékletként.',
     'attachments_set_link' => 'Hivatkozás beállítása',
-    'attachments_delete' => 'Biztosan törölhető ez a melléklet?',
-    'attachments_dropzone' => 'Húzza a file(oka)t ide a feltöltéshez',
+    'attachments_delete' => 'Biztosan törli a mellékletet?',
+    'attachments_dropzone' => 'Húzza ide a fájlokat a feltöltéshez',
     'attachments_no_files' => 'Nincsenek fájlok feltöltve',
     'attachments_explain_link' => 'Fájl feltöltése helyett hozzá lehet kapcsolni egy hivatkozást. Ez egy hivatkozás lesz egy másik oldalra vagy egy fájlra a felhőben.',
     'attachments_link_name' => 'Hivatkozás neve',
@@ -368,12 +372,12 @@
     'attachments_link_url' => 'Hivatkozás fájlra',
     'attachments_link_url_hint' => 'Weboldal vagy fájl webcíme',
     'attach' => 'Csatolás',
-    'attachments_insert_link' => 'Melléklet hivatkozás hozzáadása oldalhoz',
+    'attachments_insert_link' => 'Melléklet hivatkozás hozzáadása az oldalhoz',
     'attachments_edit_file' => 'Fájl szerkesztése',
     'attachments_edit_file_name' => 'Fájl neve',
     'attachments_edit_drop_upload' => 'Feltöltés és felülírás ejtéssel vagy kattintással',
     'attachments_order_updated' => 'Csatolmány sorrend frissítve',
-    'attachments_updated_success' => 'Csatolmány részletei frissítve',
+    'attachments_updated_success' => 'Csatolmány részletek frissítve',
     'attachments_deleted' => 'Csatolmány törölve',
     'attachments_file_uploaded' => 'Fájl sikeresen feltöltve',
     'attachments_file_updated' => 'Fájl sikeresen frissítve',
@@ -386,7 +390,7 @@
     'templates_prepend_content' => 'Hozzáadás az oldal tartalmának elejéhez',
 
     // Profile View
-    'profile_user_for_x' => 'Felhasználó ez óta: :time',
+    'profile_user_for_x' => 'Felhasználó ennyi ideje: :time',
     'profile_created_content' => 'Létrehozott tartalom',
     'profile_not_created_pages' => ':userName még nem hozott létre oldalt',
     'profile_not_created_chapters' => ':userName még nem hozott létre fejezetet',
@@ -394,61 +398,61 @@
     'profile_not_created_shelves' => ':userName még nem hozott létre polcot',
 
     // Comments
-    'comment' => 'Megjegyzés',
-    'comments' => 'Megjegyzések',
-    'comment_add' => 'Megjegyzés hozzáadása',
-    'comment_none' => 'No comments to display',
-    'comment_placeholder' => 'Megjegyzés írása',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
-    'comment_save' => 'Megjegyzés mentése',
-    'comment_new' => 'Új megjegyzés',
-    'comment_created' => 'megjegyzést fűzött hozzá :createDiff',
+    'comment' => 'Hozzászólás',
+    'comments' => 'Hozzászólások',
+    'comment_add' => 'Hozzászólás hozzáadása',
+    'comment_none' => 'Nincs megjeleníthető hozzászólás',
+    'comment_placeholder' => 'Hozzászólás írása',
+    'comment_thread_count' => ':count hozzászóláslánc|:count hozzászóláslánc',
+    'comment_archived_count' => ':count archivált',
+    'comment_archived_threads' => 'Archivált hozzászólásláncok',
+    'comment_save' => 'Hozzászólás mentése',
+    'comment_new' => 'Új hozzászólás',
+    'comment_created' => 'hozzászólt :createDiff',
     'comment_updated' => 'Frissítve :updateDiff :username által',
     'comment_updated_indicator' => 'Frissített',
-    'comment_deleted_success' => 'Megjegyzés törölve',
-    'comment_created_success' => 'Megjegyzés hozzáadva',
-    'comment_updated_success' => 'Megjegyzés frissítve',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
-    'comment_delete_confirm' => 'Biztosan törölhető ez a megjegyzés?',
-    'comment_in_reply_to' => 'Válasz erre: :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
-    'comment_editor_explain' => 'Itt vannak az ezen az oldalon lévő megjegyzések. Megjegyzések hozzáadhatók és kezelhetők a mentett oldal megtekintésekor.',
+    'comment_deleted_success' => 'Hozzászólás törölve',
+    'comment_created_success' => 'Hozzászólás hozzáadva',
+    'comment_updated_success' => 'Hozzászólás frissítve',
+    'comment_archive_success' => 'Hozzászólás archiválva',
+    'comment_unarchive_success' => 'Hozzászólás visszaállítva',
+    'comment_view' => 'Hozzászólás megjelenítése',
+    'comment_jump_to_thread' => 'Ugrás hozzászóláslánchoz',
+    'comment_delete_confirm' => 'Biztosan törli a megjegyzést?',
+    'comment_in_reply_to' => 'Válaszolva erre: :commentId',
+    'comment_reference' => 'Hivatkozás',
+    'comment_reference_outdated' => '(Elavult)',
+    'comment_editor_explain' => 'Itt vannak az ezen az oldalon lévő hozzászólások. Hozzászólás hozzáadhatók és kezelhetők a mentett oldal megtekintésekor.',
 
     // Revision
-    'revision_delete_confirm' => 'Biztosan törölhető ez a változat?',
-    'revision_restore_confirm' => 'Biztosan visszaállítható ez a változat? A oldal jelenlegi tartalma le lesz cserélve.',
-    'revision_cannot_delete_latest' => 'A legutolsó változat nem törölhető.',
+    'revision_delete_confirm' => 'Biztosan törli ezt a változatot?',
+    'revision_restore_confirm' => 'Biztosan visszaállítja ezt a változatot? A oldal jelenlegi tartalma le lesz cserélve.',
+    'revision_cannot_delete_latest' => 'A legutóbbi változat nem törölhető.',
 
     // Copy view
     'copy_consider' => 'Kérem, fontolja meg az alábbiakat, amikor tartalmat kíván másolni.',
-    'copy_consider_permissions' => 'Az egyéni engedélybeállítások nem kerülnek másolásra.',
+    'copy_consider_permissions' => 'Az egyedi engedély beállítások nem kerülnek másolásra.',
     'copy_consider_owner' => 'Minden lemásolt tartalomnak Ön lesz a tulajdonosa.',
-    'copy_consider_images' => 'Az oldalképfájlok nem duplikálódnak, és az eredeti képek megőrzik kapcsolatukat az eredetileg feltöltött oldallal.',
-    'copy_consider_attachments' => 'Az oldal mellékletei nem kerülnek másolásra.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider_images' => 'Az kép fájlok nem duplikálódnak, és az eredeti képek megőrzik kapcsolatukat az oldallal, ahova eredetileg fel lettek töltve.',
+    'copy_consider_attachments' => 'Az oldal mellékletei nem lesznek lemásolva.',
+    'copy_consider_access' => 'A hely, tulajdonos vagy jogosultságok megváltoztatása olyanoknak is hozzáférést adhat a tartalomhoz, akik korábban nem érhették el.',
 
     // Conversions
     'convert_to_shelf' => 'Átalakítás polccá',
-    'convert_to_shelf_contents_desc' => 'Ezt a könyvet új polccá alakíthatja, azonos tartalommal. A könyvben található fejezetek új könyvekké lesznek átalakítva. Ha ez a könyv tartalmaz olyan oldalakat, amelyek nem szerepelnek egy fejezetben, akkor a könyv átnevezzük és tartalmaz ilyen oldalakat, és ez a könyv az új polc részévé válik.',
-    'convert_to_shelf_permissions_desc' => 'A könyvhöz beállított engedélyek át lesznek másolva az új polcra és az összes olyan új alárendelt könyvre, amelyek nem rendelkeznek saját engedélyekkel. Vegye figyelembe, hogy a polcokon lévő engedélyek nem kapcsolódnak automatikusan a tartalomhoz, ahogy a könyvek esetében.',
+    'convert_to_shelf_contents_desc' => 'Ezt a könyvet új polccá alakíthatja, azonos tartalommal. A könyvben található fejezetek új könyvekké lesznek átalakítva. Ha ez a könyv tartalmaz olyan oldalakat, amelyek nem szerepelnek egy fejezetben, akkor a könyv át lesz nevezve, az oldalak hozzárendelve és ez a könyv az új polc részévé válik.',
+    'convert_to_shelf_permissions_desc' => 'A könyvhöz beállított engedélyek át lesznek másolva az új polcra és az összes olyan új alárendelt könyvre, amelyek nem rendelkeznek saját engedélyekkel. Vegye figyelembe, hogy a polcokon lévő engedélyek nem vonatkoznak automatikusan az alárendelt tartalomra, ahogy a könyvek esetében.',
     'convert_book' => 'Könyv átalakítása',
-    'convert_book_confirm' => 'Biztosan konvertálni szeretné ezt a könyvet?',
+    'convert_book_confirm' => 'Biztosan át szeretné alakítani ezt a könyvet?',
     'convert_undo_warning' => 'Ezt nem lehet olyan könnyen visszavonni.',
     'convert_to_book' => 'Átalakítás könyvvé',
     'convert_to_book_desc' => 'Ezt a fejezetet új, azonos tartalmú könyvvé alakíthatja. Az ebben a fejezetben beállított engedélyek átmásolódnak az új könyvbe, de a szülőkönyvből származó örökölt engedélyek nem kerülnek másolásra, ami a hozzáférés-szabályozás megváltozásához vezethet.',
     'convert_chapter' => 'Fejezet átalakítása',
-    'convert_chapter_confirm' => 'Biztosan át szeretnéd alakítani ezt a fejezetet?',
+    'convert_chapter_confirm' => 'Biztosan át szeretné alakítani ezt a fejezetet?',
 
     // References
-    'references' => 'Értékelések',
+    'references' => 'Hivatkozások',
     'references_none' => 'Nincsenek nyomon követett hivatkozások erre az elemre.',
-    'references_to_desc' => 'Az alábbiakban felsoroljuk az összes ismert tartalmat a rendszerben, amely erre az elemre hivatkozik.',
+    'references_to_desc' => 'Alább fel van sorolva az összes ismert tartalom a rendszerben, amely erre az elemre hivatkozik.',
 
     // Watch Options
     'watch' => 'Megfigyelés',
@@ -458,19 +462,19 @@
     'watch_desc_ignore' => 'Figyelmen kívül hagyja az összes értesítést, beleértve a felhasználói szintű beállításokból származó értesítéseket is.',
     'watch_title_new' => 'Új oldalak',
     'watch_desc_new' => 'Értesítés, ha új oldal jön létre ezen az elemen belül.',
-    'watch_title_updates' => 'Minden oldal frissítése',
-    'watch_desc_updates' => 'Értesítés minden új oldalról és oldalváltozásról.',
-    'watch_desc_updates_page' => 'Értesítsen minden oldalváltozásról.',
-    'watch_title_comments' => 'Az oldal összes frissítése és megjegyzése',
-    'watch_desc_comments' => 'Értesítés minden új oldalról, oldalváltozásról és új megjegyzésről.',
-    'watch_desc_comments_page' => 'Értesítés az oldal változásairól és az új megjegyzésekről.',
+    'watch_title_updates' => 'Minden oldal változás',
+    'watch_desc_updates' => 'Értesítés minden új oldalról és oldal változásról.',
+    'watch_desc_updates_page' => 'Értesítsen minden oldal változásról.',
+    'watch_title_comments' => 'Minden oldal változás és hozzászólás',
+    'watch_desc_comments' => 'Értesítés minden új oldalról, oldal változásról és új hozzászólásról.',
+    'watch_desc_comments_page' => 'Értesítés az oldal változásairól és az új hozzászólásokról.',
     'watch_change_default' => 'Az alapértelmezett értesítési beállítások módosítása',
     'watch_detail_ignore' => 'Az értesítések figyelmen kívül hagyása',
     'watch_detail_new' => 'Új oldalak figyelése',
-    'watch_detail_updates' => 'Új oldalak és frissítések figyelése',
-    'watch_detail_comments' => 'Új oldalak, frissítések és megjegyzések figyelése',
-    'watch_detail_parent_book' => 'Megfigyelés szülőkönyvből',
-    'watch_detail_parent_book_ignore' => 'Figyelmen kívül hagyás a szülőkönyvön keresztül',
-    'watch_detail_parent_chapter' => 'Megfigyelés szülő fejezetből',
-    'watch_detail_parent_chapter_ignore' => 'Figyelmen kívül hagyás a szülő fejezeten keresztül',
+    'watch_detail_updates' => 'Új oldalak és változások figyelése',
+    'watch_detail_comments' => 'Új oldalak, változások és hozzászólások figyelése',
+    'watch_detail_parent_book' => 'Megfigyelés tartalmazó könyvön keresztül',
+    'watch_detail_parent_book_ignore' => 'Figyelmen kívül hagyás tartalmazó könyvön keresztül',
+    'watch_detail_parent_chapter' => 'Megfigyelés tartalmazó fejezetten keresztül',
+    'watch_detail_parent_chapter_ignore' => 'Figyelmen kívül hagyás tartalmazó fejezetten keresztül',
 ];
diff --git a/lang/hu/errors.php b/lang/hu/errors.php
index 8ee055e29f7..c3b1a4d6d53 100644
--- a/lang/hu/errors.php
+++ b/lang/hu/errors.php
@@ -6,46 +6,46 @@
 
     // Permissions
     'permission' => 'Nincs jogosultság a kért oldal eléréséhez.',
-    'permissionJson' => 'Nincs jogosultság a kért művelet végrehajtásához.',
+    'permissionJson' => 'Nincs jogosultsága a kért művelet végrehajtásához.',
 
     // Auth
     'error_user_exists_different_creds' => ':email címmel már létezik felhasználó, de más hitelesítő adatokkal.',
     'auth_pre_register_theme_prevention' => 'A felhasználói fiók nem regisztrálható a megadott adatokkal',
-    'email_already_confirmed' => 'Az email cím már meg van erősítve, meg lehet próbálni a bejelentkezést.',
-    'email_confirmation_invalid' => 'A megerősítő vezérjel nem érvényes vagy használva volt. Meg kell próbálni újraregisztrálni.',
-    'email_confirmation_expired' => 'A megerősítő vezérjel lejárt. Egy új megerősítő email lett elküldve.',
+    'email_already_confirmed' => 'Az email cím már meg van erősítve. Próbáljon meg bejelentkezni!',
+    'email_confirmation_invalid' => 'Ez a megerősítő kulcs nem érvényes vagy használva már volt. Próbáljon meg újra regisztrálni!',
+    'email_confirmation_expired' => 'Ez a megerősítő kulcs már lejárt. Egy új megerősítő email lett küldve.',
     'email_confirmation_awaiting' => 'A használatban lévő fiók email címét meg kell erősíteni',
     'ldap_fail_anonymous' => 'Nem sikerült az LDAP elérése névtelen csatlakozással',
-    'ldap_fail_authed' => 'Az LDAP hozzáférés nem sikerült a megadott DN és jelszó beállításokkal',
-    'ldap_extension_not_installed' => 'LDAP PHP kiterjesztés nincs telepítve',
-    'ldap_cannot_connect' => 'Nem lehet kapcsolódni az LDAP kiszolgálóhoz, a kezdeti kapcsolatfelvétel nem sikerült',
-    'saml_already_logged_in' => 'Már bejelentkezett',
+    'ldap_fail_authed' => 'Nem sikerült az LDAP elérése a megadott DN és jelszó adatokkal',
+    'ldap_extension_not_installed' => 'Az LDAP PHP kiterjesztés nincsen telepítve',
+    'ldap_cannot_connect' => 'Nem lehet kapcsolódni az LDAP szerverhez, a kezdeti kapcsolatfelvétel nem sikerült',
+    'saml_already_logged_in' => 'Már be van jelentkezve',
     'saml_no_email_address' => 'Ehhez a felhasználóhoz nem található email cím a külső hitelesítő rendszer által átadott adatokban',
-    'saml_invalid_response_id' => 'A külső hitelesítő rendszerből érkező kérést nem ismerte fel az alkalmazás által indított folyamat. Bejelentkezés után az előző oldalra történő visszalépés okozhatja ezt a hibát.',
-    'saml_fail_authed' => 'Bejelentkezés :system használatával sikertelen, a rendszer nem biztosított sikeres hitelesítést',
-    'oidc_already_logged_in' => 'Már bejelentkezett',
+    'saml_invalid_response_id' => 'A külső hitelesítő rendszerből érkező kérést nem ismerte fel egy az alkalmazás által indított folyamat sem. Bejelentkezés után az előző oldalra történő visszalépés okozhatja ezt a hibát.',
+    'saml_fail_authed' => 'A bejelentkezés a(z) :system használatával sikertelen volt, a rendszer nem biztosított sikeres hitelesítést',
+    'oidc_already_logged_in' => 'Már be van jelentkezve',
     'oidc_no_email_address' => 'Ehhez a felhasználóhoz nem található email cím a külső hitelesítő rendszer által átadott adatokban',
-    'oidc_fail_authed' => 'Bejelentkezés :system használatával sikertelen, a rendszer nem biztosított sikeres hitelesítést',
-    'social_no_action_defined' => 'Nincs művelet meghatározva',
-    'social_login_bad_response' => "Hiba történt :socialAccount bejelentkezés közben:\n:error",
-    'social_account_in_use' => ':socialAccount fiók már használatban van. :socialAccount opción keresztül érdemes megpróbálni a bejelentkezést.',
-    'social_account_email_in_use' => ':email email cím már használatban van. Ha már van fiók létrehozva, :egy socialAccount fiókot hozzá lehet csatolni a profil beállításainál.',
-    'social_account_existing' => ':socialAccount már hozzá van kapcsolva a fiókhoz.',
-    'social_account_already_used_existing' => ':socialAccount fiókot már egy másik felhasználó használja.',
-    'social_account_not_used' => ':socialAccount fiók nincs felhasználóhoz kapcsolva. A hozzákapcsolást a profil oldalon lehet elvégezni. ',
-    'social_account_register_instructions' => ':socialAccount beállítása használatával is lehet fiókot regisztrálni, ha még nem volt fiók létrehozva.',
-    'social_driver_not_found' => 'Közösségi meghajtó nem található',
-    'social_driver_not_configured' => ':socialAccount közösségi beállítások nem megfelelőek.',
-    'invite_token_expired' => 'Ez a meghívó hivatkozás lejárt. Helyette meg lehet próbálni új jelszót megadni a fiókhoz.',
+    'oidc_fail_authed' => 'A bejelentkezés a(z) :system használatával sikertelen volt, a rendszer nem biztosított sikeres hitelesítést',
+    'social_no_action_defined' => 'Nincs meghatározott művelet',
+    'social_login_bad_response' => "Hiba történt a(z) :socialAccount bejelentkezés közben:\n:error",
+    'social_account_in_use' => 'Ez a(z) :socialAccount fiók már használatban van. Próbáljon meg bejelentkezni a(z) :socialAccount opción keresztül!',
+    'social_account_email_in_use' => 'A(z) :email email cím már használatban van. Ha már van fiókja, hozzá tudja kapcsolni a(z) :socialAccount fiókját a profil beállításainál.',
+    'social_account_existing' => 'Ez a(z) :socialAccount már hozzá van kapcsolva a fiókjához.',
+    'social_account_already_used_existing' => 'Ezt a(z) :socialAccount fiókot egy másik felhasználó már használja.',
+    'social_account_not_used' => 'Ez a(z) :socialAccount fiók nincs egy felhasználóhoz sem kapcsolva. Kapcsolja hozzá a profil beállításoknál. ',
+    'social_account_register_instructions' => 'Ha még nincsen fiókja, regisztrálhat egyet a(z) :socialAccount opció használatával.',
+    'social_driver_not_found' => 'Nem található közösségi média illesztőprogram',
+    'social_driver_not_configured' => 'A(z) :socialAccount fiók összekapcsolás beállításai nem megfelelőek.',
+    'invite_token_expired' => 'Ez a meghívó már lejárt. Helyette megpróbálhatja a fiók jelszavát visszaállítani.',
     'login_user_not_found' => 'A művelethez nem található felhasználó.',
 
     // System
-    'path_not_writable' => ':filePath elérési út nem tölthető fel. Ellenőrizni kell, hogy az útvonal a kiszolgáló számára írható.',
-    'cannot_get_image_from_url' => 'Nem lehet lekérni a képet innen: :url',
-    'cannot_create_thumbs' => 'A kiszolgáló nem tud létrehozni bélyegképeket. Ellenőrizni kell, hogy telepítve van-a a GD PHP kiterjesztés.',
-    'server_upload_limit' => 'A kiszolgáló nem engedélyez ilyen méretű feltöltéseket. Kisebb fájlmérettel kell próbálkozni.',
-    'server_post_limit' => 'A szerver nem tudja fogadni a megadott adatmennyiséget. Próbálkozz újra kevesebb adattal vagy egy kisebb fájllal.',
-    'uploaded'  => 'A kiszolgáló nem engedélyez ilyen méretű feltöltéseket. Kisebb fájlmérettel kell próbálkozni.',
+    'path_not_writable' => 'Nem sikerült feltölteni a :filePath elérési útra. Ellenőrizze, hogy az útvonal írható a szerveren!',
+    'cannot_get_image_from_url' => 'Nem lehet lekérni a képet a(z) :url címről',
+    'cannot_create_thumbs' => 'A szerver nem tud létrehozni bélyegképeket. Ellenőrizze, hogy telepítve van a GD PHP kiterjesztés!',
+    'server_upload_limit' => 'A szerver nem engedélyez ekkora méretű feltöltéseket. Kérjük próbálkozzon kisebb fájl mérettel.',
+    'server_post_limit' => 'A szerver nem tudja fogadni a megadott adatmennyiséget. Próbálkozzon újra kevesebb adattal vagy egy kisebb fájllal!',
+    'uploaded'  => 'A szerver nem engedélyez ekkora méretű feltöltéseket. Kérjük próbálkozzon kisebb fájl mérettel.',
 
     // Drawing & Images
     'image_upload_error' => 'Hiba történt a kép feltöltése közben',
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Nem lehet törölni az egyetlen adminisztrátort',
     'users_cannot_delete_guest' => 'A vendég felhasználót nem lehet törölni',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Nem lehetett létrehozni a felhasználót, mivel a meghívó levelet nem sikerült elküldeni',
 
     // Roles
     'role_cannot_be_edited' => 'Ezt a szerepkört nem lehet szerkeszteni',
@@ -87,16 +87,16 @@
     'role_cannot_remove_only_admin' => 'Ez a felhasználó az egyetlen, az adminisztrátor szerepkörhöz rendelt felhasználó. Eltávolítása előtt az adminisztrátor szerepkört át kell ruházni egy másik felhasználóra.',
 
     // Comments
-    'comment_list' => 'Hiba történt a megjegyzések lekérése közben.',
-    'cannot_add_comment_to_draft' => 'Vázlathoz nem lehet megjegyzéseket fűzni.',
-    'comment_add' => 'Hiba történt a megjegyzés hozzáadása / frissítése közben.',
-    'comment_delete' => 'Hiba történt a megjegyzés törlése közben.',
-    'empty_comment' => 'Üres megjegyzést nem lehet hozzáadni.',
+    'comment_list' => 'Hiba történt a hozzászólások lekérése közben.',
+    'cannot_add_comment_to_draft' => 'Vázlathoz nem lehet hozzászólni.',
+    'comment_add' => 'Hiba történt a hozzászólás hozzáadása/frissítése közben.',
+    'comment_delete' => 'Hiba történt a hozzászólás törlése közben.',
+    'empty_comment' => 'Üres hozzászólást nem lehet hozzáadni.',
 
     // Error pages
-    '404_page_not_found' => 'Oldal nem található',
+    '404_page_not_found' => 'Az oldal nem található',
     'sorry_page_not_found' => 'Sajnáljuk, a keresett oldal nem található.',
-    'sorry_page_not_found_permission_warning' => 'Ha arra számított, hogy ez az oldal létezik, előfordulhat, hogy nincs engedélye a megtekintésére.',
+    'sorry_page_not_found_permission_warning' => 'Ha arra számított, hogy ez az oldal létezik, előfordulhat, hogy nincs jogosultsága a megtekintésére.',
     'image_not_found' => 'A kép nem található',
     'image_not_found_subtitle' => 'Sajnáljuk, a keresett kép nem található.',
     'image_not_found_details' => 'Ha arra számított, hogy ez a kép létezik, akkor előfordulhat, hogy törölték.',
@@ -106,24 +106,26 @@
     'back_soon' => 'Hamarosan újra elérhető lesz.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Nem sikerült a ZIP fájlt olvasni.',
+    'import_zip_cant_decode_data' => 'Nem sikerült megtalálni és dekódolni a data.json tartalmát a ZIP fájlban.',
+    'import_zip_no_data' => 'A ZIP fájlban nincsen könyv, fejezet vagy oldal tartalom.',
+    'import_zip_data_too_large' => 'A ZIP fájlban lévő data.json tartalma meghaladja a beállított feltöltési méret limitet.',
+    'import_validation_failed' => 'A ZIP fájl importálásának ellenőrzése sikertelen volt a következő hibák miatt:',
+    'import_zip_failed_notification' => 'Nem sikerült a ZIP fájlt importálni.',
+    'import_perms_books' => 'Nem rendelkezik a könyvek létrehozásához szükséges jogosultságokkal.',
+    'import_perms_chapters' => 'Nem rendelkezik a fejezetek létrehozásához szükséges jogosultságokkal.',
+    'import_perms_pages' => 'Nem rendelkezik az oldalak létrehozásához szükséges jogosultságokkal.',
+    'import_perms_images' => 'Nem rendelkezik a képek létrehozásához szükséges jogosultságokkal.',
+    'import_perms_attachments' => 'Nem rendelkezik a csatolmányok létrehozásához szükséges jogosultságokkal.',
 
     // API errors
-    'api_no_authorization_found' => 'A kérésben nem található hitelesítési vezérjel',
-    'api_bad_authorization_format' => 'A kérésben hitelesítési vezérjel található de a formátuma érvénytelennek tűnik',
-    'api_user_token_not_found' => 'A megadott hitelesítési vezérjelhez nem található egyező API vezérjel',
-    'api_incorrect_token_secret' => 'Az API tokenhez használt secret helytelen',
-    'api_user_no_api_permission' => 'A használt API vezérjel tulajdonosának nincs jogosultsága API hívások végrehajtásához',
-    'api_user_token_expired' => 'A használt hitelesítési vezérjel lejárt',
+    'api_no_authorization_found' => 'A kérésben nem található hitelesítési kulcs',
+    'api_bad_authorization_format' => 'A kérésben hitelesítési kulcs található de a formátuma érvénytelennek tűnik',
+    'api_user_token_not_found' => 'A megadott hitelesítési kulcshoz nem található egyező API kulcs',
+    'api_incorrect_token_secret' => 'Az API kulcshoz megadott jelkulcs helytelen',
+    'api_user_no_api_permission' => 'A használt API kulcs tulajdonosának nincs jogosultsága API hívások végrehajtásához',
+    'api_user_token_expired' => 'A használt hitelesítési kulcs lejárt',
+    'api_cookie_auth_only_get' => 'Kizárólag GET kérések engedélyezettek az API-n keresztül süti alapú authentikáció használatkor',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Hiba történt egy teszt email küldésekor:',
diff --git a/lang/hu/notifications.php b/lang/hu/notifications.php
index c8cae9143c3..e7073a4967b 100644
--- a/lang/hu/notifications.php
+++ b/lang/hu/notifications.php
@@ -4,24 +4,26 @@
  */
 return [
 
-    'new_comment_subject' => 'Új megjegyzés ezen az oldalon: :pageName',
-    'new_comment_intro' => 'Egy felhasználó hozzászólt egy oldalon itt: :appName:',
+    'new_comment_subject' => 'Új megjegyzés a(z) :pageName oldalon',
+    'new_comment_intro' => 'Egy felhasználó hozzászólt egy oldalon a(z) :appName: alkalmazásban',
     'new_page_subject' => 'Új oldal: :pageName',
-    'new_page_intro' => 'Az új oldal létrehozása sikeres volt itt: :appName:',
+    'new_page_intro' => 'Egy új oldal lett létrehozva a(z) :appName: alkalmazásban',
     'updated_page_subject' => 'Frissített oldal: :pageName',
     'updated_page_intro' => 'Az oldal frissítése sikeres volt itt: :appName:',
-    'updated_page_debounce' => 'Az értesítések tömegének elkerülése érdekében egy ideig nem kap értesítést az oldal további szerkesztéseiről ugyanaz a szerkesztő.',
+    'updated_page_debounce' => 'Az értesítések tömegének elkerülése érdekében egy ideig nem kap értesítést az oldal további szerkesztéseiről ugyanattól a szerkesztőtől.',
+    'comment_mention_subject' => 'Ön meg lett említve a(z) :pageName oldalon',
+    'comment_mention_intro' => 'Ön meg lett említve egy hozzászólásban a(z) :appName: alkalmazásban',
 
     'detail_page_name' => 'Oldal neve:',
     'detail_page_path' => 'Oldal helye:',
     'detail_commenter' => 'Hozzászóló:',
-    'detail_comment' => 'Megjegyzés:',
+    'detail_comment' => 'Hozzászólás:',
     'detail_created_by' => 'Készítette:',
     'detail_updated_by' => 'Frissítette:',
 
     'action_view_comment' => 'Hozzászólás megtekintése',
     'action_view_page' => 'Oldal megtekintése',
 
-    'footer_reason' => 'Ezt az értesítést azért küldtük, mert a :link lefedi ezt a tevékenységtípust ehhez az elemhez.',
-    'footer_reason_link' => 'értesítési beállításait',
+    'footer_reason' => 'Ezt az értesítést azért küldtük, mert a :link lefedi ezt a tevékenység típust ehhez az elemhez.',
+    'footer_reason_link' => 'az Ön értesítési beállításai',
 ];
diff --git a/lang/hu/passwords.php b/lang/hu/passwords.php
index 03a37684ec6..90b13c30f7f 100644
--- a/lang/hu/passwords.php
+++ b/lang/hu/passwords.php
@@ -7,9 +7,9 @@
 return [
 
     'password' => 'A jelszónak legalább hat karakterből kell állnia, és egyeznie kell a megerősítéssel.',
-    'user' => "Nem található felhasználó ezzel az e-mail címmel.",
-    'token' => 'A jelszó visszaállító biztonsági kód nem érvényes ehhez az e-mail címhez.',
-    'sent' => 'E-mailben elküldtük a jelszó visszaállító hivatkozást!',
+    'user' => "Nem található felhasználó ezzel az email címmel.",
+    'token' => 'A jelszó visszaállító kulcs nem érvényes ehhez az email címhez.',
+    'sent' => 'Emailben elküldtük a jelszó visszaállító hivatkozást!',
     'reset' => 'A jelszó visszaállítva!',
 
 ];
diff --git a/lang/hu/preferences.php b/lang/hu/preferences.php
index 4251a28fbc7..d01e3396bce 100644
--- a/lang/hu/preferences.php
+++ b/lang/hu/preferences.php
@@ -15,37 +15,59 @@
     'shortcuts_section_navigation' => 'Navigáció',
     'shortcuts_section_actions' => 'Gyakori műveletek',
     'shortcuts_save' => 'Billentyűparancsok mentése',
-    'shortcuts_overlay_desc' => 'Megjegyzés: Amikor a gyorsbillentyűk engedélyezve vannak, egy segítő átfedés érhető el azzal, hogy a "?" billentyűt megnyomva kiemeli az aktuálisan látható képernyőn elérhető gyorsbillentyűket a műveletekhez.',
-    'shortcuts_update_success' => 'A gyorsbillentyű-beállítások frissítve lettek!',
-    'shortcuts_overview_desc' => 'A rendszerfelhasználói felületen történő navigálásához használható billentyűparancsok kezelése.',
+    'shortcuts_overlay_desc' => 'Megjegyzés: Amikor a gyorsbillentyűk engedélyezve vannak, a súgó ablak elérhető azzal, hogy a "?" billentyűt megnyomva kiemeli az aktuálisan látható képernyőn elérhető gyorsbillentyűket a műveletekhez.',
+    'shortcuts_update_success' => 'A gyorsbillentyű beállítások frissítve lettek!',
+    'shortcuts_overview_desc' => 'A felhasználói felületen történő navigálásához használható billentyűparancsok kezelése.',
+
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
 
     'notifications' => 'Értesítési beállítások',
-    'notifications_desc' => 'Állítsd be az e-mail értesítéseket, amelyeket akkor kapsz, ha bizonyos tevékenység történik a rendszeren belül.',
-    'notifications_opt_own_page_changes' => 'Értesítsen változásokról az általam tulajdonolt oldalakon',
-    'notifications_opt_own_page_comments' => 'Értesítés a hozzászólásokról az általam tulajdonolt oldalakon',
+    'notifications_desc' => 'A rendszerben folytatott tevékenységekről kapott értesítések beállítása.',
+    'notifications_opt_own_page_changes' => 'Értesítsen változásokról az általam birtokolt oldalakon',
+    'notifications_opt_own_page_comments' => 'Értesítés a hozzászólásokról az általam birtokolt oldalakon',
+    'notifications_opt_comment_mentions' => 'Értesítsen, amikor megemlítenek egy hozzászólásban',
     'notifications_opt_comment_replies' => 'Értesítsen válaszokról a hozzászólásaimra',
     'notifications_save' => 'Beállítások mentése',
     'notifications_update_success' => 'Az értesítési beállítások frissítve lettek!',
     'notifications_watched' => 'Megfigyelt és figyelmen kívül hagyott elemek',
     'notifications_watched_desc' => 'Az alábbi elemekre egyedi figyelési beállítások vannak alkalmazva. A beállítások frissítéséhez tekintsd meg az elemet, majd keresd a figyelési lehetőségeket az oldalsávban.',
 
-    'auth' => 'Hozzáférés és Biztonság',
+    'auth' => 'Hozzáférés és biztonság',
     'auth_change_password' => 'Jelszó módosítása',
-    'auth_change_password_desc' => 'Változtasd meg az alkalmazásba történő bejelentkezéshez használt jelszavadat. Ennek legalább 8 karakter hosszúnak kell lennie.',
+    'auth_change_password_desc' => 'A bejelentkezéshez használt jelszó módosítása. Legalább 8 karakter hosszúnak kell lennie.',
     'auth_change_password_success' => 'A jelszó frissítve lett!',
 
     'profile' => 'Felhasználó részletei',
     'profile_desc' => 'A kommunikációhoz és a rendszer személyre szabásához használt adatokon kívül kezelheti fiókja adatait, amelyek más felhasználók számára jelennek meg.',
     'profile_view_public' => 'Nyilvános profil megtekintése',
-    'profile_name_desc' => 'Állítsd be a megjelenített nevedet, amely látható lesz a rendszer többi felhasználója számára az általad végzett tevékenység és a saját tartalom révén.',
-    'profile_email_desc' => 'Ezt az e-mail címet értesítésekre fogjuk használni, valamint az érvényben lévő beállítások függvényében hitelesítéshez is.',
-    'profile_email_no_permission' => 'Sajnos nincs jogosultságod az e-mail cím megváltoztatására. Ha szeretnéd ezt megváltoztatni, kérj meg egy adminisztrátort, hogy ezt megtegye helyetted.',
-    'profile_avatar_desc' => 'Válassz egy képet, amelyet a rendszerben használnál a neved mellett. A kép lehetőleg négyzet alakú és körülbelül 256px szélességű és magasságú legyen.',
+    'profile_name_desc' => 'Állítsa be a megjelenített nevét amely látható lesz a rendszer többi felhasználója számára az Ön által végzett tevékenység és a saját tartalom révén.',
+    'profile_email_desc' => 'Ezt az email címet értesítésekre fogjuk használni, valamint az érvényben lévő beállítások függvényében hitelesítéshez is.',
+    'profile_email_no_permission' => 'Sajnos nincs jogosultsága az email cím megváltoztatására. Ha szeretné ezt megváltoztatni, kérjen meg egy adminisztrátort, hogy ezt megtegye helyette.',
+    'profile_avatar_desc' => 'Válasszon egy képet, amelyet a rendszerben használni szeretne a neve mellett. A kép lehetőleg négyzet alakú és körülbelül 256 pixel szélességű és magasságú legyen.',
     'profile_admin_options' => 'Adminisztrátori beállítások',
-    'profile_admin_options_desc' => 'További adminisztrátori szintű lehetőségek, például a szerepkörök hozzárendelésének kezelése, megtalálhatóak a felhasználói fiókod beállításai között az "Beállítások > Felhasználók" területen az alkalmazásban.',
+    'profile_admin_options_desc' => 'További adminisztrátori szintű lehetőségek, például a szerepkörök hozzárendelésének kezelése, megtalálhatók a felhasználói fiókod beállításai között az "Beállítások > Felhasználók" területen az alkalmazásban.',
 
     'delete_account' => 'Felhasználói fiók törlése',
-    'delete_my_account' => 'Törlöm a felhasználói fiókomat',
-    'delete_my_account_desc' => 'Ez véglegesen törölni fogja a felhasználói fiókodat a rendszerből. Nem lesz lehetőséged visszaállítani ezt a fiókot, vagy visszavonni ezt a műveletet. A létrehozott tartalmak, például az oldalak és feltöltött képek megmaradnak.',
-    'delete_my_account_warning' => 'Biztosan törölni szeretnéd a fiókodat?',
+    'delete_my_account' => 'Saját felhasználói fiók törlése',
+    'delete_my_account_desc' => 'Ez véglegesen törölni fogja a felhasználói fiókját a rendszerből. Nem lesz lehetősége visszaállítani ezt a fiókot, vagy visszavonni ezt a műveletet. A létrehozott tartalmak, például az oldalak és feltöltött képek megmaradnak.',
+    'delete_my_account_warning' => 'Biztosan törölni szeretné a fiókját?',
 ];
diff --git a/lang/hu/settings.php b/lang/hu/settings.php
index 813fee7b054..1d98f4ade28 100644
--- a/lang/hu/settings.php
+++ b/lang/hu/settings.php
@@ -14,46 +14,46 @@
 
     // App Settings
     'app_customization' => 'Személyre szabás',
-    'app_features_security' => 'Jellemzők és biztonság',
+    'app_features_security' => 'Funkciók és biztonság',
     'app_name' => 'Alkalmazás neve',
     'app_name_desc' => 'Ez a név meg fog jelenni a fejlécben és minden a rendszer által küldött emailben.',
     'app_name_header' => 'Név mutatása a fejlécben',
     'app_public_access' => 'Nyilvános hozzáférés',
-    'app_public_access_desc' => 'Ha engedélyezett, a nem bejelentkezett felhasználók is hozzá tudnak férni a BookStack példány tartalmaihoz.',
+    'app_public_access_desc' => 'Az opció engedélyezése lehetővé teszi látogatóknak, hogy bejelentkezés nélkül hozzáférjenek az alkalmazásban tárolt bizonyos tartalmakhoz.',
     'app_public_access_desc_guest' => 'A nyilvános látogatók hozzáférése a "Guest" felhasználón keresztül irányítható.',
     'app_public_access_toggle' => 'Nyilvános hozzáférés engedélyezése',
-    'app_public_viewing' => 'Nyilvános megtekintés engedélyezve?',
+    'app_public_viewing' => 'Engedélyezi a nyilvános elérést?',
     'app_secure_images' => 'Magasabb biztonságú képfeltöltés',
     'app_secure_images_toggle' => 'Magasabb biztonságú képfeltöltés engedélyezése',
-    'app_secure_images_desc' => 'Teljesítmény optimalizálási okokból minden kép nyilvános. Ez a beállítás egy véletlenszerű, nehezen kitalálható karakterláncot illeszt a képek útvonalának elejére. Meg kell győződni róla, hogy a könnyű hozzáférés megakadályozása érdekében a könyvtár indexek nincsenek engedélyezve.',
+    'app_secure_images_desc' => 'Teljesítmény optimalizálási okokból minden kép nyilvános. Ez a beállítás egy véletlenszerű, nehezen kitalálható karakterláncot illeszt a kép URL-ek elejére. Győződjön meg róla, hogy a könyvtárak indexelése nincsen engedélyezve!',
     'app_default_editor' => 'Alapértelmezett  oldal szerkesztő',
-    'app_default_editor_desc' => 'Válassza ki, hogy alapértelmezés szerint melyik szerkesztőt szeretné használni az új oldalak szerkesztésekor. Ezt felülírhatja oldalszintű szinten, amennyiben az engedélyek lehetővé teszik.',
+    'app_default_editor_desc' => 'Válassza ki, hogy alapértelmezés szerint melyik szerkesztőt szeretné használni az új oldalak szerkesztésekor. Ezt felülírhatja az egyes oldalak szintjén, amennyiben az engedélyek lehetővé teszik.',
     'app_custom_html' => 'Egyéni HTML fejléc tartalom',
     'app_custom_html_desc' => 'Az itt hozzáadott bármilyen tartalom be lesz illesztve minden oldal <head> szekciójának aljára. Ez hasznos a stílusok felülírásához van analitikai kódok hozzáadásához.',
-    'app_custom_html_disabled_notice' => 'Az egyéni HTML fejléc tartalom le van tiltva ezen a beállítási oldalon, hogy az esetleg hibásan megadott módosításokat vissza lehessen állítani.',
+    'app_custom_html_disabled_notice' => 'Az egyéni HTML fejléc tartalom le van tiltva ezen a beállítási oldalon, hogy az esetleg hibásan megadott módosításokat vissza lehessen vonni.',
     'app_logo' => 'Alkalmazás logó',
-    'app_logo_desc' => 'Ez az alkalmazás fejléc sávjában van használva többek között. Ennek a képnek 86 képpont magasnak kell lennie. A nagy képek át lesznek méretezve.',
+    'app_logo_desc' => 'Ez többek között az alkalmazás fejléc sávjában van használva. A képnek 86 pixel magasnak kell lennie. A nagy képek átméretezésre kerülnek.',
     'app_icon' => 'Alkalmazás ikon',
-    'app_icon_desc' => 'Ez az ikon a böngésző fülekhez és a gyorsikonokhoz használatos. Ez egy 256 képpont négyzet alakú PNG képnek kell lennie.',
+    'app_icon_desc' => 'Ez az ikon a böngésző fülekhez és parancsikonokhoz használatos. Az ikonnak egy 256 pixeles, négyzetes PNG képnek kell lennie.',
     'app_homepage' => 'Alkalmazás kezdőlapja',
-    'app_homepage_desc' => 'A kezdőlapon az alapértelmezés szerinti nézet helyett megjelenő nézet kiválasztása. A kiválasztott oldalakon figyelmen kívül lesznek hagyva az oldal engedélyek.',
+    'app_homepage_desc' => 'Válassza ki a kezdőlapon az alapértelmezett nézet helyett megjelenő oldalt!. A kiválasztott oldalon figyelmen kívül lesznek hagyva a hozzáférési jogosultságok.',
     'app_homepage_select' => 'Egy oldal kiválasztása',
     'app_footer_links' => 'Lábléc linkek',
-    'app_footer_links_desc' => 'Adj hozzá linkeket a weboldal láblécéhez. Ezek a legtöbb oldalon megjelennek, beleértve azokat is, amelyekhez nincs szükség bejelentkezésre. Használhatsz egy "trans::<key>" címkét a rendszer által definiált fordítások használatához. Például: A "trans::common.privacy_policy" használata a lefordított szöveget ("Adatvédelmi Irányelvek") adja vissza, és a "trans::common.terms_of_service" a "Szolgáltatási feltételek" lefordított szöveget adja eredményül.',
+    'app_footer_links_desc' => 'Adjon hozzá linkeket a weboldal láblécéhez. Ezek a legtöbb oldalon megjelennek, beleértve azokat is, amelyekhez nincs szükség bejelentkezésre. Használhat egy "trans::<key>" címkét a rendszer által definiált fordítások használatához. Például: A "trans::common.privacy_policy" használata a "Adatvédelmi Irányelvek" lefordított szöveget adja vissza, és a "trans::common.terms_of_service" a "Szolgáltatási feltételek" lefordított szöveget adja eredményül.',
     'app_footer_links_label' => 'Link címke',
     'app_footer_links_url' => 'Link URL',
     'app_footer_links_add' => 'Lábléc hivatkozás hozzáadása',
-    'app_disable_comments' => 'Megjegyzések letiltása',
-    'app_disable_comments_toggle' => 'Megjegyzések letiltása',
-    'app_disable_comments_desc' => 'Megjegyzések letiltása az alkalmazás összes oldalán.<br>A már létező megjegyzések el lesznek rejtve.',
+    'app_disable_comments' => 'Hozzászólások letiltása',
+    'app_disable_comments_toggle' => 'Hozzászólások letiltása',
+    'app_disable_comments_desc' => 'Hozzászólások letiltása az alkalmazás összes oldalán.<br>A már létező hozzászólások el lesznek rejtve.',
 
     // Color settings
     'color_scheme' => 'Alkalmazás színséma',
-    'color_scheme_desc' => 'Állítsd be a színeket az alkalmazás felhasználói felületén. A színeket külön-külön lehet konfigurálni a sötét és a világos módokhoz, hogy a legjobban illeszkedjenek a témához, és biztosítsák az olvashatóságot.',
-    'ui_colors_desc' => 'Állítsa be az alkalmazás elsődleges színét és alapértelmezett hivatkozási színét. Az elsődleges színt főként a fejléc szalaghirdetéséhez, a gombokhoz és a felület díszítéséhez használják. Az alapértelmezett hivatkozásszín a szöveges hivatkozásokhoz és műveletekhez használatos, mind az írott tartalomban, mind az alkalmazás felületén.',
+    'color_scheme_desc' => 'Állítsa be az alkalmazás felhasználói felületének színeit. A színeket külön-külön lehet konfigurálni a sötét és a világos módokhoz, hogy a legjobban illeszkedjenek a témához, és biztosítsák az olvashatóságot.',
+    'ui_colors_desc' => 'Állítsa be az alkalmazás elsődleges színét és az alapértelmezett hivatkozási színt. Az elsődleges színt főként a fejléc szalag, a gombok és egyéb díszítőelemek használják. Az alapértelmezett hivatkozás szín a szöveges hivatkozásokhoz és műveletekhez használatos, mind az írott tartalomban, mind az alkalmazás felhasználói felületén.',
     'app_color' => 'Elsődleges szín',
     'link_color' => 'Alapértelmezett link szín',
-    'content_colors_desc' => 'Beállítja az elemek színét az oldalszervezési hierarchiában. Az olvashatóság szempontjából javasolt az alapértelmezés szerinti színhez hasonló fényerősséget választani.',
+    'content_colors_desc' => 'Állítsa be az elemek színeit az oldal hierarchiában. Az olvashatóság érdekében javasolt az alapértelmezett színekhez hasonló világosságú színeket választani.',
     'bookshelf_color' => 'Polc színe',
     'book_color' => 'Könyv színe',
     'chapter_color' => 'Fejezet színe',
@@ -64,63 +64,65 @@
     'reg_settings' => 'Regisztráció',
     'reg_enable' => 'Regisztráció engedélyezése',
     'reg_enable_toggle' => 'Regisztráció engedélyezése',
-    'reg_enable_desc' => 'Ha a regisztráció engedélyezett, akkor a felhasználó képes lesz bejelentkezni mint az alkalmazás egy felhasználója. Regisztráció után egy egyszerű, alapértelmezés szerinti felhasználói szerepkör lesz hozzárendelve.',
+    'reg_enable_desc' => 'Ha a regisztráció engedélyezve van, akkor látogatók regisztrálhatják saját magukat az alkalmazásba. Az új felhasználókhoz az alapértelmezett felhasználói szerepkör kerül hozzárendelésre.',
     'reg_default_role' => 'Regisztráció utáni alapértelmezett felhasználói szerepkör',
-    'reg_enable_external_warning' => 'A fenti beállítási lehetőség nincs használatban, ha külső LDAP vagy SAML hitelesítés aktív. A nem létező tagok felhasználói fiókjai automatikusan létrejönnek ha a használatban lévő külső rendszeren sikeres a hitelesítés.',
-    'reg_email_confirmation' => 'Email megerősítés',
-    'reg_email_confirmation_toggle' => 'Email megerősítés szükséges',
-    'reg_confirm_email_desc' => 'Ha a tartomány korlátozás be van állítva, akkor email megerősítés szükséges és ez a beállítás figyelmen kívül lesz hagyva.',
-    'reg_confirm_restrict_domain' => 'Tartomány korlátozás',
-    'reg_confirm_restrict_domain_desc' => 'Azoknak az email tartományoknak a vesszővel elválasztott listája, melyekre a regisztráció korlátozva lesz. A felhasználók egy emailt fognak kapni, hogy megerősítsék az email címüket mielőtt használni kezdhetnék az alkalmazást.<br>Fontos tudni, hogy a felhasználók a sikeres regisztráció után megváltoztathatják az email címüket.',
+    'reg_enable_external_warning' => 'A fenti beállítási lehetőség figyelmen kívül van hagyva, ha külső LDAP vagy SAML hitelesítés aktív. A nem létező tagok felhasználói fiókjai automatikusan létrejönnek ha a használatban lévő külső rendszeren sikeres a hitelesítés.',
+    'reg_email_confirmation' => 'Email megerősítése',
+    'reg_email_confirmation_toggle' => 'Email megerősítése szükséges',
+    'reg_confirm_email_desc' => 'Ha a domain korlátozás be van állítva, akkor az email megerősítése kötelező, és ez a beállítás figyelmen kívül van hagyva.',
+    'reg_confirm_restrict_domain' => 'Domain korlátozás',
+    'reg_confirm_restrict_domain_desc' => 'Adja meg azon email domain-eket vesszővel tagolt listaként, amikre a regisztrációt korlátozni szeretné. A felhasználók egy emailt fognak kapni, hogy megerősítsék az email címüket mielőtt használni kezdhetnék az alkalmazást.<br>Fontos tudni, hogy a felhasználók a sikeres regisztráció után megváltoztathatják az email címüket.',
     'reg_confirm_restrict_domain_placeholder' => 'Nincs beállítva korlátozás',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Listák és rendezés',
+    'sorting_book_default' => 'Alapértelmezett könyv rendezési szabály',
+    'sorting_book_default_desc' => 'Válassza ki az új könyvekre alkalmazandó alapértelmezett rendezési szabályt. Ez nem fogja befolyásolni a már létező könyveket, és könyvenként felülbírálható.',
+    'sorting_rules' => 'Rendezési szabályok',
+    'sorting_rules_desc' => 'Ezek előre meghatározott rendezési szabályok, amelyek alkalmazhatók a rendszerben található tartalomra.',
+    'sort_rule_assigned_to_x_books' => 'Hozzárendelve :count könyvhöz|Hozzárendelve :count könyvhöz',
+    'sort_rule_create' => 'Rendezési szabály létrehozása',
+    'sort_rule_edit' => 'Rendezési szabály szerkesztése',
+    'sort_rule_delete' => 'Rendezési szabály törlése',
+    'sort_rule_delete_desc' => 'Eltávolítja ezt a rendezési szabályt a rendszerből. A jelenleg ezt használó könyvek vissza lesznek állítva kézi rendezésre.',
+    'sort_rule_delete_warn_books' => 'Ez a rendezési szabály :count könyvön van használva. Biztosan törli?',
+    'sort_rule_delete_warn_default' => 'Ez a rendezési szabály jelenleg az alapértelmezett az új könyvekhez. Biztosan törli?',
+    'sort_rule_details' => 'Rendezési szabály részletei',
+    'sort_rule_details_desc' => 'Állítson be egy nevet a rendezési szabálynak, amely megjelenik majd a rendezési listákban.',
+    'sort_rule_operations' => 'Rendezési műveletek',
+    'sort_rule_operations_desc' => 'Állítsa be rendezési műveleteket az elemek átmozgatásával az elérhető műveletek listájából. A műveletek mindig fentről lefelé haladva kerülnek végrehajtásra. Mentéskor minden itt végzett változtatás az összes hozzárendelt könyvre érvényesítve lesz.',
+    'sort_rule_available_operations' => 'Elérhető műveletek',
+    'sort_rule_available_operations_empty' => 'Nincs több művelet',
+    'sort_rule_configured_operations' => 'Beállított műveletek',
+    'sort_rule_configured_operations_empty' => 'Húzzon/adjon hozzá műveleteket az "Elérhető műveletek" listáról',
+    'sort_rule_op_asc' => '(Növekvő)',
+    'sort_rule_op_desc' => '(Csökkenő)',
+    'sort_rule_op_name' => 'Név - betűrend',
+    'sort_rule_op_name_numeric' => 'Név - számsorrend',
+    'sort_rule_op_created_date' => 'Létrehozás dátuma',
+    'sort_rule_op_updated_date' => 'Frissítés dátuma',
+    'sort_rule_op_chapters_first' => 'Fejezetek elől',
+    'sort_rule_op_chapters_last' => 'Fejezetek hátul',
+    'sorting_page_limits' => 'Oldalankénti megjelenítési limitek',
+    'sorting_page_limits_desc' => 'Állítsa be oldalanként mennyi elem kerüljön megjelenítésre a rendszer külöböző listáiban. Általában a kisebb mennyiség jobb teljesítményhez vezet, nagyobb mennyiségnél nem kell annyi oldalon végigmenni. Ajánlott a 6 egyik többszörösét használni.',
 
     // Maintenance settings
     'maint' => 'Karbantartás',
-    'maint_image_cleanup' => 'Képek tisztítása',
+    'maint_image_cleanup' => 'Képek kitakarítása',
     'maint_image_cleanup_desc' => 'Végigolvassa az oldalakat és a tartalmak változatait, hogy leellenőrizze jelenleg mely képek és rajzok vannak használatban, és mely képek szerepelnek többször. A futtatása előtt feltétlen készíteni kell egy teljes adatbázis és lemezkép mentést.',
     'maint_delete_images_only_in_revisions' => 'Törölje azokat a képeket is, amelyek csak a régi oldalverziókban léteznek',
-    'maint_image_cleanup_run' => 'Tisztítás futtatása',
-    'maint_image_cleanup_warning' => ':count potenciálisan nem használt képet találtam. Biztosan törölhetőek ezek a képek?',
+    'maint_image_cleanup_run' => 'Takarítás futtatása',
+    'maint_image_cleanup_warning' => ':count potenciálisan nem használt kép van. Biztosan törölni szeretné ezeket a képeket?',
     'maint_image_cleanup_success' => ':count potenciálisan nem használt kép megtalálva és törölve!',
     'maint_image_cleanup_nothing_found' => 'Nincsenek nem használt képek, semmi sem lett törölve!',
-    'maint_send_test_email' => 'Teszt e-mail küldése',
+    'maint_send_test_email' => 'Teszt email küldése',
     'maint_send_test_email_desc' => 'Ez elküld egy teszt emailt a profilban megadott email címre.',
-    'maint_send_test_email_run' => 'Teszt e-mail küldése',
-    'maint_send_test_email_success' => 'Email elküldve :address címre',
-    'maint_send_test_email_mail_subject' => 'Teszt e-mail',
+    'maint_send_test_email_run' => 'Teszt email küldése',
+    'maint_send_test_email_success' => 'Email elküldve a(z) :address címre',
+    'maint_send_test_email_mail_subject' => 'Teszt email',
     'maint_send_test_email_mail_greeting' => 'Az email kézbesítés működőképesnek tűnik!',
     'maint_send_test_email_mail_text' => 'Gratulálunk! Mivel ez az email figyelmeztetés megérkezett az email beállítások megfelelőek.',
-    'maint_recycle_bin_desc' => 'A törölt polcok, könyvek, fejezetek és oldalak a lomtárba kerülnek, így visszaállíthatók vagy véglegesen törölhetők. A rendszer konfigurációtól függően egy idő után a lomtárban lévő régebbi elemek automatikusan eltávolíthatók.',
+    'maint_recycle_bin_desc' => 'A törölt polcok, könyvek, fejezetek és oldalak a lomtárba kerülnek, így visszaállíthatók vagy véglegesen törölhetők. A rendszer konfigurációtól függően egy idő után a lomtárban lévő régebbi elemek automatikusan eltávolításra kerülhetnek.',
     'maint_recycle_bin_open' => 'Lomtár megnyitása',
     'maint_regen_references' => 'Referenciák újragenerálása',
     'maint_regen_references_desc' => 'Ez a művelet újraépíti az adatbázison belüli elemek közötti hivatkozási indexet. Ez általában automatikusan történik, de ez a művelet hasznos lehet régi vagy nem hivatalos módszerekkel hozzáadott tartalom indexeléséhez.',
@@ -142,7 +144,7 @@
     'recycle_bin_destroy_confirm' => 'Ez a művelet véglegesen törli ezt az elemet a rendszerből az alább felsorolt összes alárendelt elemmel együtt, és nem fogja tudni visszaállítani ezt a tartalmat. Biztosan véglegesen törli ezt az elemet?',
     'recycle_bin_destroy_list' => 'Megsemmisítendő elemek',
     'recycle_bin_restore_list' => 'Visszaállítandó elemek',
-    'recycle_bin_restore_confirm' => 'Ez a művelet visszaállítja a törölt elemet, beleértve az utódelemeket is, az eredeti helyükre. Ha az eredeti helyet azóta törölték, és most a lomtárban van, akkor a szülőelemet is vissza kell állítani.',
+    'recycle_bin_restore_confirm' => 'Ez a művelet visszaállítja a törölt elemet, beleértve az alárendelt elemeket is, az eredeti helyükre. Ha az eredeti helyet azóta törölték, és most a lomtárban van, akkor a tartalmazó elemet is vissza kell állítani.',
     'recycle_bin_restore_deleted_parent' => 'Ennek az elemnek a szülője is törölve lett. Ezek mindaddig törölve maradnak, amíg az adott szülőt is vissza nem állítják.',
     'recycle_bin_restore_parent' => 'Szűlő visszaállítása',
     'recycle_bin_destroy_notification' => 'Összesen :count elemet törölt a lomtárból.',
@@ -158,7 +160,7 @@
     'audit_table_user' => 'Felhasználó',
     'audit_table_event' => 'Esemény',
     'audit_table_related' => 'Kapcsolódó elem vagy részlet',
-    'audit_table_ip' => 'IP Cím',
+    'audit_table_ip' => 'IP cím',
     'audit_table_date' => 'Tevékenység időpontja',
     'audit_date_from' => 'Kezdő dátum',
     'audit_date_to' => 'Végdátum',
@@ -166,43 +168,47 @@
     // Role Settings
     'roles' => 'Szerepkörök',
     'role_user_roles' => 'Felhasználói szerepkörök',
-    'roles_index_desc' => 'A szerepkörök a felhasználók csoportosítására és rendszerengedélyek biztosítására szolgálnak tagjaiknak. Ha egy felhasználó több szerepkör tagja, a megadott jogosultságok halmozódnak, és a felhasználó örökli az összes képességet.',
+    'roles_index_desc' => 'A szerepkörök a felhasználók csoportosítására és rendszerengedélyek biztosítására szolgálnak. Ha egy felhasználó több szerepkör tagja, a megadott jogosultságok halmozódnak, és a felhasználó örökli az összes képességet.',
     'roles_x_users_assigned' => ':count hozzárendelt felhasználó|:count hozzárendelt felhasználó',
     'roles_x_permissions_provided' => ':count jogosultság|:count jogosultság',
     'roles_assigned_users' => 'Hozzárendelt felhasználók',
     'roles_permissions_provided' => 'Megadott jogosultságok',
     'role_create' => 'Új szerepkör létrehozása',
     'role_delete' => 'Szerepkör törlése',
-    'role_delete_confirm' => 'Ez törölni fogja \':roleName\' szerepkört.',
-    'role_delete_users_assigned' => 'Ehhez a szerepkörhöz :userCount felhasználó van hozzárendelve. Ha a felhasználókat át kell helyezni ebből a szerepkörből, akkor ki kell választani egy új szerepkört.',
-    'role_delete_no_migration' => "Nincs felhasználó áthelyezés",
-    'role_delete_sure' => 'Biztosan törölhető ez a szerepkör?',
+    'role_delete_confirm' => 'Ez törölni fogja a(z) \':roleName\' szerepkört.',
+    'role_delete_users_assigned' => 'Ehhez a szerepkörhöz :userCount felhasználó van hozzárendelve. Ha át szeretné helyezni a felhasználókat egy másik szerepkörbe, akkor válasszon egy új szerepkört az alábbi listából.',
+    'role_delete_no_migration' => "Ne helyezze át a felhasználókat",
+    'role_delete_sure' => 'Biztosan törli ezt a szerepkört?',
     'role_edit' => 'Szerepkör szerkesztése',
     'role_details' => 'Szerepkör részletei',
     'role_name' => 'Szerepkör neve',
     'role_desc' => 'Szerepkör rövid leírása',
-    'role_mfa_enforced' => 'Kétlépcsős hitelesítés megkövetelése',
+    'role_mfa_enforced' => 'Többlépcsős hitelesítés megkövetelése',
     'role_external_auth_id' => 'Külső hitelesítés azonosítók',
     'role_system' => 'Rendszer jogosultságok',
     'role_manage_users' => 'Felhasználók kezelése',
-    'role_manage_roles' => 'Szerepkörök és szerepkör engedélyek kezelése',
+    'role_manage_roles' => 'Szerepkörök és jogosultságok kezelése',
     'role_manage_entity_permissions' => 'Minden könyv, fejezet és oldalengedély kezelése',
     'role_manage_own_entity_permissions' => 'Saját könyv, fejezet és oldalak engedélyeinek kezelése',
     'role_manage_page_templates' => 'Oldalsablonok kezelése',
     'role_access_api' => 'Hozzáférés a rendszer API-hoz',
     'role_manage_settings' => 'Alkalmazás beállításainak kezelése',
     'role_export_content' => 'Tartalom exportálása',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Tartalom importálása',
     'role_editor_change' => 'Oldalszerkesztő módosítása',
     'role_notifications' => 'Értesítések fogadása és kezelése',
-    'role_asset' => 'Eszköz jogosultságok',
+    'role_permission_note_users_and_roles' => 'Ezek a jogosultságok gyakorlatilag megtekintést és felhasználó/szerepkör keresést is lehetővé fognak tenni.',
+    'role_asset' => 'Tartalom jogosultságok',
     'roles_system_warning' => 'Ne feledje, hogy a fenti három engedély bármelyikéhez való hozzáférés lehetővé teszi a felhasználó számára, hogy módosítsa saját vagy a rendszerben mások jogosultságait. Csak megbízható felhasználókhoz rendeljen szerepeket ezekkel az engedélyekkel.',
-    'role_asset_desc' => 'Ezek a jogosultságok vezérlik az alapértelmezés szerinti hozzáférést a rendszerben található eszközökhöz. A könyvek, fejezetek és oldalak jogosultságai felülírják ezeket a jogosultságokat.',
-    'role_asset_admins' => 'Az adminisztrátorok automatikusan hozzáférést kapnak minden tartalomhoz, de ezek a beállítások megjeleníthetnek vagy elrejthetnek felhasználói felület beállításokat.',
+    'role_asset_desc' => 'Ezek a jogosultságok vezérlik az alapértelmezés szerinti hozzáférést a rendszerben található tartalomhoz. A könyvek, fejezetek és oldalak jogosultságai felülírják ezeket a jogosultságokat.',
+    'role_asset_admins' => 'Az adminisztrátorok automatikusan hozzáférést kapnak minden tartalomhoz, de ezek a beállítások megjeleníthetnek vagy elrejthetnek beállításokat a felhasználói felületen.',
     'role_asset_image_view_note' => 'Ez a képkezelőn belüli láthatóságra vonatkozik. A feltöltött képfájlok tényleges elérése a rendszerkép tárolási beállításától függ.',
+    'role_asset_users_note' => 'Ezek a jogosultságok gyakorlatilag megtekintést és felhasználó keresést is lehetővé fognak tenni.',
     'role_all' => 'Összes',
     'role_own' => 'Saját',
-    'role_controlled_by_asset' => 'Az általuk feltöltött eszköz által ellenőrzött',
+    'role_permission_aria' => ':action :resource: :value',
+    'role_controlled_by_asset' => 'A feltöltött tartalom beállításaitól függ',
+    'role_controlled_by_page_delete' => 'Az oldal törlési jogosultságoktól függ',
     'role_save' => 'Szerepkör mentése',
     'role_users' => 'Felhasználók ebben a szerepkörben',
     'role_users_none' => 'Jelenleg nincsenek felhasználók hozzárendelve ehhez a szerepkörhöz',
@@ -215,72 +221,75 @@
     'users_search' => 'Felhasználók keresése',
     'users_latest_activity' => 'Legújabb tevékenység',
     'users_details' => 'Felhasználó részletei',
-    'users_details_desc' => 'Egy megjelenítendő név és email cím beállítása ennek a felhasználónak. Az email cím az alkalmazásba történő bejelentkezéshez lesz használva.',
-    'users_details_desc_no_email' => 'Egy megjelenítendő név beállítása ennek a felhasználónak amiről mások felismerik.',
+    'users_details_desc' => 'Megjelenítendő név és email cím beállítása ennek a felhasználónak. Az email cím az alkalmazásba történő bejelentkezéshez lesz használva.',
+    'users_details_desc_no_email' => 'Megjelenítendő név beállítása ennek a felhasználónak, amiről mások felismerik.',
     'users_role' => 'Felhasználói szerepkörök',
-    'users_role_desc' => 'A felhasználó melyik szerepkörhöz lesz rendelve. Ha a felhasználó több szerepkörhöz van rendelve, akkor ezeknek a szerepköröknek a jogosultságai összeadódnak, és a a felhasználó a hozzárendelt szerepkörök minden képességét megkapja.',
+    'users_role_desc' => 'Felhasználó szerepköreinek kiválasztása. Ha a felhasználó több szerepkörhöz van rendelve, akkor ezeknek a szerepköröknek a jogosultságai összeadódnak, és a a felhasználó a hozzárendelt szerepkörök minden képességét megkapja.',
     'users_password' => 'Felhasználó jelszava',
     'users_password_desc' => 'Az alkalmazásba bejelentkezéshez használható jelszó beállítása. Legalább 8 karakter hosszúnak kell lennie.',
-    'users_send_invite_text' => 'Lehetséges egy meghívó emailt küldeni ennek a felhasználónak ami lehetővé teszi, hogy beállíthassa a saját jelszavát. Máskülönben a jelszót az erre jogosult felhasználónak kell beállítania.',
+    'users_send_invite_text' => 'Dönthet úgy, hogy meghívó emailt küld ennek a felhasználónak, így az beállíthatja saját jelszavát. Ellenkező esetben Ön is beállíthat egy jelszót neki.',
     'users_send_invite_option' => 'Felhasználó meghívó levél küldése',
     'users_external_auth_id' => 'Külső hitelesítés azonosítója',
-    'users_external_auth_id_desc' => 'Ha külső hitelesítési rendszer van használatban (például SAML2, OIDC vagy LDAP), ez az az azonosító, amely a BookStack felhasználót a hitelesítési rendszerfiókhoz kapcsolja. Ha az alapértelmezett e-mail alapú hitelesítést használja, figyelmen kívül hagyhatja ezt a mezőt.',
+    'users_external_auth_id_desc' => 'Ha külső hitelesítési rendszer van használatban (például SAML2, OIDC vagy LDAP), ez az az azonosító, amely a BookStack felhasználót a hitelesítési rendszerfiókhoz kapcsolja. Ha az alapértelmezett email alapú hitelesítést használja, figyelmen kívül hagyhatja ezt a mezőt.',
     'users_password_warning' => 'Csak akkor töltse ki az alábbi mezőt, ha módosítani szeretné ennek a felhasználónak a jelszavát.',
-    'users_system_public' => 'Ez a felhasználó bármelyik, a példányt megtekintő felhasználót képviseli. Nem lehet vele bejelentkezni de automatikusan hozzá lesz rendelve.',
+    'users_system_public' => 'Ez a felhasználó bármelyik, az alkalmazást megtekintő látogatót képviseli. Nem lehet vele bejelentkezni de automatikusan hozzá lesz rendelve.',
     'users_delete' => 'Felhasználó törlése',
     'users_delete_named' => ':userName felhasználó törlése',
     'users_delete_warning' => '\':userName\' felhasználó teljesen törölve lesz a rendszerből.',
-    'users_delete_confirm' => 'Biztosan törölhető ez a felhasználó?',
+    'users_delete_confirm' => 'Biztosan törli ezt a felhasználót?',
     'users_migrate_ownership' => 'Tulajdonjog átruházása',
     'users_migrate_ownership_desc' => 'Válasszon itt egy felhasználót, ha azt szeretné, hogy egy másik felhasználó legyen a tulajdonosa az összes, jelenleg a felhasználó tulajdonában lévő elemnek.',
     'users_none_selected' => 'Nincs felhasználó kiválasztva',
     'users_edit' => 'Felhasználó szerkesztése',
     'users_edit_profile' => 'Profil szerkesztése',
-    'users_avatar' => 'Avatar használata',
-    'users_avatar_desc' => 'A felhasználót ábrázoló kép kiválasztása. Kb. 256px méretű négyzetes képnek kell lennie.',
+    'users_avatar' => 'Felhasználó profilképe',
+    'users_avatar_desc' => 'Válasszon ki egy képet, ami ehhez a felhasználóhoz fog tartozni. Négyzetes, körülbelül 256 pixel széles képnek kell lennie.',
     'users_preferred_language' => 'Előnyben részesített nyelv',
     'users_preferred_language_desc' => 'Ez a beállítás megváltoztatja az alkalmazás felhasználói felületén használt nyelvet. Nincs hatása a felhasználók által létrehozott tartalomra.',
-    'users_social_accounts' => 'Közösségi fiókok',
+    'users_social_accounts' => 'Közösségi média fiókok',
     'users_social_accounts_desc' => 'Tekintse meg a felhasználó csatlakoztatott közösségi fiókjainak állapotát. A közösségi fiókok az elsődleges hitelesítési rendszer mellett használhatók a rendszerhez való hozzáféréshez.',
-    'users_social_accounts_info' => 'Itt lehet egyéb fiókokat hozzákapcsolni a gyorsabb és könnyebb bejelentkezés érdekében. Itt olyan fiókot lehet lecsatlakoztatni, melynek korábban nem volt engedélyezett hozzáférése. Visszavonja a hozzáférést a csatlakoztatott szociális fiók profilbeállításaiból.',
+    'users_social_accounts_info' => 'Itt kapcsolhat össze külső fiókokat a gyorsabb és egyszerűbb bejelentkezés érdekében. Egy összekapcsolás megszüntetése itt, nem vonja vissza a már korábban engedélyezett hozzáférést. Vonja vissza a hozzáférést a külső fiók profil beállításaiban.',
     'users_social_connect' => 'Fiók csatlakoztatása',
     'users_social_disconnect' => 'Fiók lecsatlakoztatása',
     'users_social_status_connected' => 'Csatlakozva',
     'users_social_status_disconnected' => 'Lecsatlakozva',
     'users_social_connected' => ':socialAccount fiók sikeresen csatlakoztatva a profilhoz.',
     'users_social_disconnected' => ':socialAccount fiók sikeresen lecsatlakoztatva a profilról.',
-    'users_api_tokens' => 'API vezérjelek',
-    'users_api_tokens_desc' => 'A BookStack REST API-val történő hitelesítéshez használt hozzáférési token létrehozása és kezelése. Az API engedélyeit azon a felhasználón keresztül kezelik, akihez a token tartozik.',
-    'users_api_tokens_none' => 'Ehhez a felhasználóhoz nincsenek létrehozva API vezérjelek',
-    'users_api_tokens_create' => 'Vezérjel létrehozása',
+    'users_api_tokens' => 'API kulcsok',
+    'users_api_tokens_desc' => 'A BookStack REST API-val történő hitelesítéshez használt hozzáférési kulcs létrehozása és kezelése. Az API engedélyeit azon a felhasználón keresztül kezelik, akihez a token tartozik.',
+    'users_api_tokens_none' => 'Ehhez a felhasználóhoz nincsenek létrehozva API kulcsok',
+    'users_api_tokens_create' => 'Kulcs létrehozása',
     'users_api_tokens_expires' => 'Lejárat',
     'users_api_tokens_docs' => 'API dokumentáció',
-    'users_mfa' => 'Többfaktoros hitelesítés',
+    'users_mfa' => 'Többlépcsős hitelesítés',
     'users_mfa_desc' => 'Állítsa be a többlépcsős azonosítást egy extra biztonsági rétegként a felhasználói fiókjához.',
-    'users_mfa_x_methods' => ':count metódus konfigurálva|:count metódus konfigurálva',
+    'users_mfa_x_methods' => ':count mód beállítva|:count mód beállítva',
     'users_mfa_configure' => 'Módszer beállítása',
+    'users_mfa_reset' => 'Többlépcsős azonosítási módok alaphelyzetbe állítása',
+    'users_mfa_reset_desc' => 'Ez alaphelyzetbe fogja állítani a felhasználónak az összes beállított többlépcsős azonosítási módját. Ha valamelyik a szerepkörük előírja a többlépcsős azonosítást, akkor a következő bejelentkezésnél fel lesznek szólítva egy új beállítására.',
+    'users_mfa_reset_confirm' => 'Biztos benne, hogy alaphelyzetbe szeretné állítani ennek a felhasználónak a többlépcsős azonosítási módjait?',
 
     // API Tokens
-    'user_api_token_create' => 'API vezérjel létrehozása',
+    'user_api_token_create' => 'API kulcs létrehozása',
     'user_api_token_name' => 'Név',
-    'user_api_token_name_desc' => 'Adjon a tokennek egy olvasható nevet, hogy a jövőben emlékeztessen a tervezett céljára.',
+    'user_api_token_name_desc' => 'Adjon a kulcsnak egy olvasható nevet, hogy a jövőben emlékeztessen a tervezett céljára.',
     'user_api_token_expiry' => 'Lejárati dátum',
-    'user_api_token_expiry_desc' => 'Dátum megadása ameddig a vezérjel érvényes. Ez után a dátum után az ezzel a vezérjellel történő kérések nem fognak működni. Üresen hagyva a lejárati idő 100 évre lesz beállítva.',
-    'user_api_token_create_secret_message' => 'Közvetlenül a token létrehozása után egy „Token ID” és „Token Secret” generálódik és jelenik meg. A Secret csak egyszer jelenik meg, ezért a folytatás előtt másolja át az értéket egy biztonságos helyre.',
-    'user_api_token' => 'API vezérjel',
-    'user_api_token_id' => 'Vezérjel azonosító',
-    'user_api_token_id_desc' => 'Ez egy nem szerkeszthető, a rendszer által létrehozott azonosító ehhez a vezérjelhez amire API kérésekben lehet szükség.',
-    'user_api_token_secret' => 'Vezérjel titkos kódja',
-    'user_api_token_secret_desc' => 'Ez egy rendszer által generált "secret" ehhez a tokenhez, amelyet meg kell adni az API-kérésekben. Ez csak most jelenik meg, ezért másolja ezt az értéket egy biztonságos helyre.',
-    'user_api_token_created' => 'Vezérjel létrehozva :timeAgo',
-    'user_api_token_updated' => 'Vezérjel frissítve :timeAgo',
-    'user_api_token_delete' => 'Vezérjel törlése',
-    'user_api_token_delete_warning' => '\':tokenName\' nevű API vezérjel teljesen törölve lesz a rendszerből.',
-    'user_api_token_delete_confirm' => 'Biztosan törölhető ez az API vezérjel?',
+    'user_api_token_expiry_desc' => 'Dátum ameddig a kulcs érvényes. Ez után a dátum után az ezzel a kulccsal történő kérések nem fognak működni. Üresen hagyva a lejárati idő 100 évre lesz beállítva.',
+    'user_api_token_create_secret_message' => 'Közvetlenül a kulcs létrehozása után egy „Kulcs azonosító” és „Titkos kód” generálódik és jelenik meg. A titkos kód csak egyszer jelenik meg, ezért a folytatás előtt másolja át az értéket egy biztonságos helyre.',
+    'user_api_token' => 'API kulcs',
+    'user_api_token_id' => 'Kulcs azonosító',
+    'user_api_token_id_desc' => 'Ez egy nem szerkeszthető, a rendszer által létrehozott azonosító ehhez a kulcshoz, amire API kérésekben lehet szükség.',
+    'user_api_token_secret' => 'Kulcs titkos kódja',
+    'user_api_token_secret_desc' => 'Ez egy rendszer által generált "titok" ehhez a kulcshoz, amelyet meg kell adni az API-kérésekben. Ez csak most jelenik meg, ezért másolja ezt az értéket egy biztonságos helyre.',
+    'user_api_token_created' => 'Kulcs létrehozva :timeAgo',
+    'user_api_token_updated' => 'Kulcs frissítve :timeAgo',
+    'user_api_token_delete' => 'Kulcs törlése',
+    'user_api_token_delete_warning' => '\':tokenName\' nevű API kulcs teljesen törölve lesz a rendszerből.',
+    'user_api_token_delete_confirm' => 'Biztosan törli ezt az API kulcsot?',
 
     // Webhooks
     'webhooks' => 'Webhook-ok',
-    'webhooks_index_desc' => 'A webhookok segítségével adatokat küldhetünk külső URL-ekre, amikor bizonyos műveletek és események történnek a rendszeren belül, ami lehetővé teszi az eseményalapú integrációt külső platformokkal, például üzenetküldő vagy értesítési rendszerekkel.',
+    'webhooks_index_desc' => 'A webhookok segítségével adatokat küldhet külső URL-ekre, amikor bizonyos műveletek és események történnek a rendszeren belül. Ez lehetővé teszi az eseményalapú integrációt külső platformokkal, például üzenetküldő vagy értesítési rendszerekkel.',
     'webhooks_x_trigger_events' => ':count kiváltó esemény|:count kiváltó esemény',
     'webhooks_create' => 'Új webhook létrehozása',
     'webhooks_none_created' => 'Még nincs létrehozva egy webhook sem.',
@@ -298,19 +307,19 @@
     'webhooks_active' => 'Webhook aktív',
     'webhook_events_table_header' => 'Események',
     'webhooks_delete' => 'Webhook törlése',
-    'webhooks_delete_warning' => 'Ezzel a \':webhookName\' nevű webhookot teljesen törli a rendszerből.',
+    'webhooks_delete_warning' => 'Ezzel a(z) \':webhookName\' nevű webhookot teljesen törli a rendszerből.',
     'webhooks_delete_confirm' => 'Biztosan törli ezt a webhookot?',
     'webhooks_format_example' => 'Webhook formátum példa',
-    'webhooks_format_example_desc' => 'A Webhook-adatok POST-kérésként kerülnek elküldésre a konfigurált végponthoz JSON-ként az alábbi formátumban. A "related_item" és az "url" tulajdonság nem kötelező, és az aktivált esemény típusától függ.',
+    'webhooks_format_example_desc' => 'A Webhook-adatok POST-kérésként kerülnek elküldésre a beállított végponthoz JSON-ként az alábbi formátumban. A "related_item" és az "url" tulajdonság nem kötelező, és az aktivált esemény típusától függ.',
     'webhooks_status' => 'Webhook állapota',
     'webhooks_last_called' => 'Utolsó hívás:',
     'webhooks_last_errored' => 'Utolsó hiba:',
     'webhooks_last_error_message' => 'Utolsó hibaüzenet:',
 
     // Licensing
-    'licenses' => 'Licenszek',
+    'licenses' => 'Licencek',
     'licenses_desc' => 'Ez az oldal a BookStack licencinformációit részletezi, a BookStackben használt projekteken és könyvtárakon kívül. Sok felsorolt projekt csak fejlesztési környezetben használható.',
-    'licenses_bookstack' => 'BookStack Licensz',
+    'licenses_bookstack' => 'BookStack licenc',
     'licenses_php' => 'PHP könyvtár licencek',
     'licenses_js' => 'JavaScript könyvtár licencek',
     'licenses_other' => 'Egyéb licencek',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'Thai',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/hu/validation.php b/lang/hu/validation.php
index a215416ca5f..b6c42aeee73 100644
--- a/lang/hu/validation.php
+++ b/lang/hu/validation.php
@@ -8,56 +8,58 @@
 return [
 
     // Standard laravel validation lines
-    'accepted'             => ':attribute elfogadott kell legyen.',
-    'active_url'           => ':attribute nem érvényes webcím.',
-    'after'                => ':attribute dátumnak :date utáninak kell lennie.',
-    'alpha'                => ':attribute csak betűket tartalmazhat.',
-    'alpha_dash'           => ':attribute csak betűket, számokat és kötőjeleket tartalmazhat.',
-    'alpha_num'            => ':attribute csak betűket és számokat tartalmazhat.',
-    'array'                => ':attribute tömb kell legyen.',
+    'accepted'             => 'A(z) :attribute elfogadott kell legyen.',
+    'active_url'           => 'A(z) :attribute nem egy érvényes URL.',
+    'after'                => 'A(z) :attribute objektumnak egy :date utáni dátumnak kell lennie.',
+    'alpha'                => 'A(z) :attribute csak betűket tartalmazhat.',
+    'alpha_dash'           => 'A(z) :attribute csak betűket, számokat, kötőjeleket és alávonásokat tartalmazhat.',
+    'alpha_num'            => 'A(z) :attribute csak betűket és számokat tartalmazhat.',
+    'array'                => 'A(z) :attribute tömb kell legyen.',
     'backup_codes'         => 'A megadott kód érvénytelen, vagy már felhasználták.',
-    'before'               => ':attribute dátumnak :date előttinek kell lennie.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
+    'before'               => 'A(z) :attribute objektumnak egy :date előtti dátumnak kell lennie.',
     'between'              => [
-        'numeric' => ':attribute értékének :min és :max között kell lennie.',
-        'file'    => ':attribute értékének :min és :max kilobájt között kell lennie.',
-        'string'  => ':attribute hosszának :min és :max karakter között kell lennie.',
-        'array'   => ':attribute mennyiségének :min és :max elem között kell lennie.',
+        'numeric' => 'A(z) :attribute értékének :min és :max között kell lennie.',
+        'file'    => 'A(z) :attribute értékének :min és :max kB között kell lennie.',
+        'string'  => 'A(z) :attribute hosszának :min és :max karakter között kell lennie.',
+        'array'   => 'A(z) :attribute tömbnek :min és :max közötti elemszámának kell lennie.',
     ],
-    'boolean'              => ':attribute mezőnek igaznak vagy hamisnak kell lennie.',
-    'confirmed'            => ':attribute megerősítés nem egyezik.',
-    'date'                 => ':attribute nem érvényes dátum.',
-    'date_format'          => ':attribute nem egyezik :format formátummal.',
-    'different'            => ':attribute és :other értékének különböznie kell.',
-    'digits'               => ':attribute :digits számból kell álljon.',
-    'digits_between'       => ':attribute hosszának :min és :max számjegy között kell lennie.',
-    'email'                => ':attribute érvényes email cím kell legyen.',
-    'ends_with' => ':attribute attribútumnak a következők egyikével kell végződnie: :values',
-    'file'                 => 'A(z) :attribute érvényes fájlnak kell lennie.',
-    'filled'               => ':attribute mező kötelező.',
+    'boolean'              => 'A(z) :attribute mezőnek igaznak vagy hamisnak kell lennie.',
+    'confirmed'            => 'A(z) :attribute megerősítés nem egyezik.',
+    'current_password'     => 'This does not match your current password.',
+    'date'                 => 'A(z) :attribute nem egy érvényes dátum.',
+    'date_format'          => 'A(z) :attribute nem egyezik a(z) :format formátummal.',
+    'different'            => 'A(z) :attribute és :other értékének különböznie kell.',
+    'digits'               => 'A(z) :attribute :digits számjegyből kell álljon.',
+    'digits_between'       => 'A(z) :attribute hosszának :min és :max számjegy között kell lennie.',
+    'email'                => 'A(z) :attribute érvényes email cím kell legyen.',
+    'ends_with' => 'A(z) :attribute értékének a következők egyikével kell végződnie: :values',
+    'file'                 => 'A(z) :attribute érvényes fájl kell legyen.',
+    'filled'               => 'A(z) :attribute mező kötelező.',
     'gt'                   => [
-        'numeric' => ':attribute nagyobb kell, hogy legyen, mint :value.',
-        'file'    => ':attribute nagyobb kell, hogy legyen, mint :value kilobájt.',
-        'string'  => ':attribute nagyobb kell legyen mint :value karakter.',
-        'array'   => ':attribute több, mint :value elemet kell, hogy tartalmazzon.',
+        'numeric' => 'A(z) :attribute nagyobb kell, hogy legyen, mint :value.',
+        'file'    => 'A(z) :attribute nagyobb kell, hogy legyen, mint :value kB.',
+        'string'  => 'A(z) :attribute hosszabb kell legyen mint :value karakter.',
+        'array'   => 'A(z) :attribute több, mint :value elemet kell, hogy tartalmazzon.',
     ],
     'gte'                  => [
-        'numeric' => ':attribute attribútumnak :value értéknél nagyobbnak vagy vele egyenlőnek kell lennie.',
-        'file'    => 'A(z) :attribute mérete nem lehet kevesebb, mint :value kilobájt.',
-        'string'  => 'A(z) :attribute nagyobbnak, vagy egyenlőnek kell lennie, mint a :value karakter.',
-        'array'   => 'A(z) :attribute rendelkezzen :value vagy több elemmel.',
+        'numeric' => 'A(z) :attribute számnak :value értéknél nagyobbnak vagy vele egyenlőnek kell lennie.',
+        'file'    => 'A(z) :attribute mérete nem lehet kevesebb, mint :value kB.',
+        'string'  => 'A(z) :attribute szövegnek legalább :value karakter hosszúnak kell lennie.',
+        'array'   => 'A(z) :attribute tömbnek :value vagy több elemmel kell rendelkeznie.',
     ],
     'exists'               => 'A kiválasztott :attribute érvénytelen.',
-    'image'                => ':attribute kép kell legyen.',
-    'image_extension'      => 'A :attribute kép kiterjesztése érvényes és támogatott kell legyen.',
+    'image'                => 'A(z) :attribute kép kell legyen.',
+    'image_extension'      => 'A(z) :attribute kép kiterjesztése érvényes és támogatott kell legyen.',
     'in'                   => 'A kiválasztott :attribute érvénytelen.',
-    'integer'              => ':attribute egész szám kell legyen.',
-    'ip'                   => ':attribute érvényes IP cím kell legyen.',
-    'ipv4'                 => 'A(z) :attribute érvényes IPv4 címnek kell lennie.',
-    'ipv6'                 => 'A(z) :attribute érvényes IPv6 címnek kell lennie.',
-    'json'                 => 'A(z) :attribute érvényes JSON stringnek kell lennie.',
+    'integer'              => 'A(z) :attribute egész szám kell legyen.',
+    'ip'                   => 'A(z) :attribute érvényes IP cím kell legyen.',
+    'ipv4'                 => 'A(z) :attribute érvényes IPv4 cím kell legyen.',
+    'ipv6'                 => 'A(z) :attribute érvényes IPv6 cím kell legyen.',
+    'json'                 => 'A(z) :attribute érvényes JSON szöveg kell legyen.',
     'lt'                   => [
-        'numeric' => 'A(z) :attribute kisebb kell, hogy legyen, mint :value.',
-        'file'    => 'A(z) :attribute kevesebbnek kell lennie, mint :value kilobájt.',
+        'numeric' => 'A(z) :attribute szám kisebb kell, hogy legyen, mint :value.',
+        'file'    => 'A(z) :attribute fájlnak kisebbnek kell lennie, mint :value kB.',
         'string'  => 'A(z) :attribute rövidebb kell, hogy legyen, mint :value karakter.',
         'array'   => 'A(z) :attribute kevesebb, mint :value elemet kell, hogy tartalmazzon.',
     ],
@@ -69,46 +71,47 @@
     ],
     'max'                  => [
         'numeric' => ':attribute nem lehet nagyobb mint :max.',
-        'file'    => ':attribute nem lehet nagyobb mint :max kilobájt.',
-        'string'  => ':attribute nem lehet nagyobb mint :max karakter.',
-        'array'   => ':attribute mennyisége nem lehet több mint :max elem.',
+        'file'    => 'A(z) :attribute nem lehet nagyobb, mint :max kB.',
+        'string'  => 'A(z) :attribute nem lehet hosszabb, mint :max karakter.',
+        'array'   => 'A(z) :attribute nem tartalmazhat több, mint :max elemet.',
     ],
-    'mimes'                => 'A :attribute típusa csak :values lehet.',
+    'mimes'                => 'A(z) :attribute típusa csak :values lehet.',
     'min'                  => [
-        'numeric' => ':attribute legalább :min kell legyen.',
-        'file'    => ':attribute legalább :min kilobájt kell legyen.',
-        'string'  => ':attribute legalább :min karakter kell legyen.',
-        'array'   => ':attribute legalább :min elem kell legyen.',
+        'numeric' => 'A(z) :attribute legalább :min kell legyen.',
+        'file'    => 'A(z) :attribute legalább :min kB kell legyen.',
+        'string'  => 'A(z) :attribute legalább :min karakter kell legyen.',
+        'array'   => 'A(z) :attribute legalább :min elemet kell tartalmazzon.',
     ],
     'not_in'               => 'A kiválasztott :attribute érvénytelen.',
-    'not_regex'            => ':attribute formátuma érvénytelen.',
-    'numeric'              => ':attribute szám kell legyen.',
-    'regex'                => ':attribute formátuma érvénytelen.',
-    'required'             => ':attribute mező kötelező.',
-    'required_if'          => ':attribute mező kötelező ha :other értéke :value.',
-    'required_with'        => ':attribute mező kötelező ha :values be van állítva.',
-    'required_with_all'    => ':attribute mező kötelező ha van :value.',
-    'required_without'     => ':attribute mező kötelező ha :values nincs beállítva.',
-    'required_without_all' => ':attribute mező kötelező ha egyik :values sincs beállítva.',
-    'same'                 => ':attribute és :other értékének egyeznie kell.',
+    'not_regex'            => 'A(z) :attribute formátuma érvénytelen.',
+    'numeric'              => 'A(z) :attribute szám kell legyen.',
+    'regex'                => 'A(z) :attribute formátuma érvénytelen.',
+    'required'             => 'A(z) :attribute mező kötelező.',
+    'required_if'          => 'A(z) :attribute mező kötelező ha :other értéke :value.',
+    'required_with'        => 'A(z) :attribute mező kötelező ha :values be van állítva.',
+    'required_with_all'    => 'A(z) :attribute mező kötelező ha :values be van állítva.',
+    'required_without'     => 'A(z) :attribute mező kötelező ha :values nincs beállítva.',
+    'required_without_all' => 'A(z) :attribute mező kötelező ha egyik :values sincs beállítva.',
+    'same'                 => 'A(z) :attribute és :other értékének egyeznie kell.',
     'safe_url'             => 'Előfordulhat, hogy a megadott link nem biztonságos.',
     'size'                 => [
-        'numeric' => ':attribute :size méretű kell legyen.',
-        'file'    => ':attribute :size kilobájt méretű kell legyen.',
-        'string'  => ':attribute :size karakter kell legyen.',
-        'array'   => ':attribute : size elemet kell tartalmazzon.',
+        'numeric' => 'A(z) :attribute :size méretű kell legyen.',
+        'file'    => 'A(z) :attribute :size kB méretű kell legyen.',
+        'string'  => 'A(z) :attribute :size karakter kell legyen.',
+        'array'   => 'A(z) :attribute :size elemet kell tartalmazzon.',
     ],
-    'string'               => ':attribute karaktersorozatnak kell legyen.',
-    'timezone'             => ':attribute érvényes zóna kell legyen.',
+    'string'               => 'A(z) :attribute szöveg kell legyen.',
+    'timezone'             => 'A(z) :attribute érvényes időzóna kell legyen.',
     'totp'                 => 'A megadott kód érvénytelen vagy lejárt.',
-    'unique'               => ':attribute már elkészült.',
-    'url'                  => ':attribute formátuma érvénytelen.',
-    'uploaded'             => 'A fájlt nem lehet feltölteni. A kiszolgáló nem fogad el ilyen méretű fájlokat.',
+    'unique'               => 'A(z) :attribute már foglalt.',
+    'url'                  => 'A(z) :attribute formátuma érvénytelen.',
+    'uploaded'             => 'A fájlt nem lehet feltölteni. A szerver nem fogad el ilyen méretű fájlokat.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'A(z) :attribute egy a ZIP fájlban található fájlra kell, hogy hivatkozzon',
+    'zip_file_size' => 'A(z) :attribute fájl nem haladhatja meg a :size MB méretet.',
+    'zip_file_mime' => 'A(z) :attribute egy :validTypes típusú fájlra kell, hogy hivatkozzon, a :foundType helyett.',
+    'zip_model_expected' => 'Adat objektum helyett ":type" lett találva.',
+    'zip_unique' => 'A(z) :attribute egyedi kell hogy legyen a ZIP fájlban az adott objektum típushoz.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/id/activities.php b/lang/id/activities.php
index 6e1583a94e7..edb23657ec0 100644
--- a/lang/id/activities.php
+++ b/lang/id/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Pengguna berhasil diperbarui',
     'user_delete' => 'pengguna yang dihapus',
     'user_delete_notification' => 'Pengguna berhasil dihapus',
+    'user_mfa_reset' => 'atur ulang MFA untuk pengguna',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'API token yang dibuat',
diff --git a/lang/id/auth.php b/lang/id/auth.php
index 6af60ca80b1..d2a26d71c97 100644
--- a/lang/id/auth.php
+++ b/lang/id/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Kredensial tidak cocok dengan catatan kami.',
     'throttle' => 'Terlalu banyak upaya masuk. Silahkan mencoba lagi dalam :seconds detik.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Daftar',
@@ -20,6 +21,9 @@
     'username' => 'Nama Pengguna',
     'email' => 'Email',
     'password' => 'Kata Sandi',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Konfirmasi Kata Sandi',
     'password_hint' => 'Harus minimal 8 karakter',
     'forgot_password' => 'Lupa Password?',
diff --git a/lang/id/common.php b/lang/id/common.php
index cee2d327ff0..d9e0167d0ce 100644
--- a/lang/id/common.php
+++ b/lang/id/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Tidak Aktif',
     'never' => 'Jangan Pernah',
     'none' => 'Tidak Satupun',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Beranda',
diff --git a/lang/id/components.php b/lang/id/components.php
index 45aa72fba22..6f1f905a42a 100644
--- a/lang/id/components.php
+++ b/lang/id/components.php
@@ -13,7 +13,7 @@
     'image_intro_upload' => 'Unggah gambar baru dengan menyeret berkas gambar ke jendela ini, atau dengan menggunakan tombol "Unggah Gambar" di atas.',
     'image_all' => 'Semua',
     'image_all_title' => 'Lihat semua gambar',
-    'image_book_title' => 'Lihat gambar yang diunggah ke buku ini',
+    'image_book_title' => 'Lihat gambar untuk diunggah ke buku ini',
     'image_page_title' => 'Lihat gambar yang diunggah ke halaman ini',
     'image_search_hint' => 'Cari berdasarkan nama gambar',
     'image_uploaded' => 'Diunggah :uploadedDate',
@@ -33,7 +33,7 @@
     'image_update_success' => 'Detail gambar berhasil diperbarui',
     'image_delete_success' => 'Gambar berhasil dihapus',
     'image_replace' => 'Ganti Gambar',
-    'image_replace_success' => 'Berkas gambar berhasil diperbarui',
+    'image_replace_success' => 'Detail gambar berhasil diperbarui',
     'image_rebuild_thumbs' => 'Buat Ulang Variasi Ukuran',
     'image_rebuild_thumbs_success' => 'Variasi ukuran gambar berhasil dibuat ulang!',
 
diff --git a/lang/id/editor.php b/lang/id/editor.php
index 04999368930..5eadf80666b 100644
--- a/lang/id/editor.php
+++ b/lang/id/editor.php
@@ -8,8 +8,8 @@
 return [
     // General editor terms
     'general' => 'Umum',
-    'advanced' => 'Lanjutan',
-    'none' => 'Tidak Ada',
+    'advanced' => 'Tingkat lanjut',
+    'none' => 'Tidak Satupun',
     'cancel' => 'Batal',
     'save' => 'Simpan',
     'close' => 'Tutup',
diff --git a/lang/id/entities.php b/lang/id/entities.php
index 2f932992571..a423ef39c88 100644
--- a/lang/id/entities.php
+++ b/lang/id/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sortir Buku :bookName',
     'books_sort_name' => 'Diurutkan berdasarkan nama',
     'books_sort_created' => 'Urutkan berdasarkan Tanggal Dibuat',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Halaman Tag',
     'chapter_tags' => 'Bab Tag',
     'book_tags' => 'Tag Buku',
diff --git a/lang/id/errors.php b/lang/id/errors.php
index 6f766173874..2342824d107 100644
--- a/lang/id/errors.php
+++ b/lang/id/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Tidak dapat membaca berkas ZIP.',
     'import_zip_cant_decode_data' => 'Tidak dapat menemukan dan mendekode konten ZIP data.json.',
     'import_zip_no_data' => 'Data berkas ZIP tidak berisi konten buku, bab, atau halaman yang diharapkan.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Impor ZIP gagal divalidasi dengan kesalahan:',
     'import_zip_failed_notification' => 'Gagal mengimpor berkas ZIP.',
     'import_perms_books' => 'Anda tidak memiliki izin yang diperlukan untuk membuat buku.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Rahasia yang diberikan untuk token API bekas yang diberikan salah',
     'api_user_no_api_permission' => 'Pemilik token API yang digunakan tidak memiliki izin untuk melakukan panggilan API',
     'api_user_token_expired' => 'Token otorisasi yang digunakan telah kedaluwarsa',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Kesalahan dilempar saat mengirim email uji:',
diff --git a/lang/id/notifications.php b/lang/id/notifications.php
index b22af1f730e..7b9d2181a25 100644
--- a/lang/id/notifications.php
+++ b/lang/id/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Halaman yang diperbarui: :pageName',
     'updated_page_intro' => 'Halaman telah diperbarui di :appName:',
     'updated_page_debounce' => 'Untuk mencegah banyaknya pemberitahuan, untuk sementara Anda tidak akan dikirimi pemberitahuan untuk pengeditan lebih lanjut pada halaman ini oleh editor yang sama.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Nama Halaman:',
     'detail_page_path' => 'Jalur Halaman:',
diff --git a/lang/id/passwords.php b/lang/id/passwords.php
index 3ee2e4d57da..2559b265133 100644
--- a/lang/id/passwords.php
+++ b/lang/id/passwords.php
@@ -6,7 +6,7 @@
  */
 return [
 
-    'password' => 'Kata sandi harus setidaknya delapan karakter dan sesuai dengan konfirmasi.',
+    'password' => 'Passwords must be at least eight characters and match the confirmation.',
     'user' => "Kami tidak dapat menemukan pengguna dengan alamat email tersebut.",
     'token' => 'Token setel ulang sandi tidak valid untuk alamat email ini.',
     'sent' => 'Kami telah mengirimkan email tautan pengaturan ulang kata sandi Anda!',
diff --git a/lang/id/preferences.php b/lang/id/preferences.php
index a1bb346b816..eb51c805ae1 100644
--- a/lang/id/preferences.php
+++ b/lang/id/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/id/settings.php b/lang/id/settings.php
index 51c0613cbae..c9602be105d 100644
--- a/lang/id/settings.php
+++ b/lang/id/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Tidak ada batasan yang ditetapkan',
 
     // Sorting Settings
-    'sorting' => 'Menyortir',
-    'sorting_book_default' => 'Penyortiran Buku Default',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Pilih aturan sortir default yang akan diterapkan pada buku baru. Aturan ini tidak akan memengaruhi buku yang sudah ada, dan dapat diganti per buku.',
     'sorting_rules' => 'Aturan Penyortiran',
     'sorting_rules_desc' => 'Ini adalah operasi penyortiran yang telah ditetapkan sebelumnya yang dapat diterapkan pada konten dalam sistem.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Tanggal Pembaruan',
     'sort_rule_op_chapters_first' => 'Bab di Urutan Pertama',
     'sort_rule_op_chapters_last' => 'Bab di Urutan Terakhir',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Pemeliharaan',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Impor Konten',
     'role_editor_change' => 'Ubah editor halaman',
     'role_notifications' => 'Terima dan kelola notifikasi',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Izin Aset',
     'roles_system_warning' => 'Ketahuilah bahwa akses ke salah satu dari tiga izin di atas dapat memungkinkan pengguna untuk mengubah hak mereka sendiri atau orang lain dalam sistem. Hanya tetapkan peran dengan izin ini untuk pengguna tepercaya.',
     'role_asset_desc' => 'Izin ini mengontrol akses default ke aset dalam sistem. Izin pada Buku, Bab, dan Halaman akan menggantikan izin ini.',
     'role_asset_admins' => 'Admin secara otomatis diberi akses ke semua konten tetapi opsi ini dapat menampilkan atau menyembunyikan opsi UI.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Semua',
     'role_own' => 'Sendiri',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Dikendalikan oleh aset tempat mereka diunggah',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Simpan Peran',
     'role_users' => 'Peran berhasil diperbarui',
     'role_users_none' => 'Saat ini tidak ada pengguna yang ditugaskan untuk peran ini',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Buat Token API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/id/validation.php b/lang/id/validation.php
index d5ccb27093c..05c42bd0e98 100644
--- a/lang/id/validation.php
+++ b/lang/id/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute hanya boleh berisi huruf dan angka.',
     'array'                => ':attribute harus berupa larik.',
     'backup_codes'         => 'Kode yang diberikan tidak valid atau telah digunakan.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute harus tanggal sebelum :date.',
     'between'              => [
         'numeric' => ':attribute harus di antara :min dan :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute bidang harus berisi benar atau salah.',
     'confirmed'            => ':attribute konfirmasi tidak sama.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute bukan tanggal yang valid.',
     'date_format'          => ':attribute tidak sesuai dengan format :format.',
     'different'            => ':attribute dan :other harus berbeda.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Berkas tidak dapat diunggah. Server mungkin tidak menerima berkas dengan ukuran ini.',
 
     'zip_file' => ':attribute perlu merujuk ke sebuah file yang terdapat di dalam arsip ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => ':attribute seharusnya berupa file dengan tipe :validTypes, tapi yang Anda unggah bertipe :foundType.',
     'zip_model_expected' => 'Diharapkan sebuah objek data, namun yang ditemukan adalah \':type\'.',
     'zip_unique' => ':attribute harus bersifat unik untuk setiap jenis objek dalam file ZIP.',
diff --git a/lang/is/activities.php b/lang/is/activities.php
index e70aa2567f0..7056e633c3d 100644
--- a/lang/is/activities.php
+++ b/lang/is/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Tókst að uppfæra notanda',
     'user_delete' => 'eyddur notandi',
     'user_delete_notification' => 'Tókst að eyða notanda',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'API token búið til',
diff --git a/lang/is/auth.php b/lang/is/auth.php
index c5e7ce4f1d7..fb4e436f1ec 100644
--- a/lang/is/auth.php
+++ b/lang/is/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Þeesi auðkenning er ekki á skrá.',
     'throttle' => 'Of margar tilraunir til innskráningar. Reyndu aftur eftir :seconds sekúndur.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Nýskrá',
@@ -20,6 +21,9 @@
     'username' => 'Notandanafn',
     'email' => 'Netfang',
     'password' => 'Lykilorð',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Staðfestu lykilorð',
     'password_hint' => 'Verður að vera minnst 8 stafir',
     'forgot_password' => 'Gleymt lykilorð?',
diff --git a/lang/is/common.php b/lang/is/common.php
index 84651be1736..f29e4f6827f 100644
--- a/lang/is/common.php
+++ b/lang/is/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Óvirkt',
     'never' => 'Aldrei',
     'none' => 'Engin',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Forsíða',
diff --git a/lang/is/entities.php b/lang/is/entities.php
index 4308835c7d8..8735a18aea3 100644
--- a/lang/is/entities.php
+++ b/lang/is/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Raða bók :bookName',
     'books_sort_name' => 'Raða eftir nafni',
     'books_sort_created' => 'Raða eftir skráningar dagsetningu',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/is/errors.php b/lang/is/errors.php
index 50e30a8c57a..48b82cf7eb5 100644
--- a/lang/is/errors.php
+++ b/lang/is/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Gat ekki lesið ZIP skrá.',
     'import_zip_cant_decode_data' => 'Fann ekki ZIP data.json innihald.',
     'import_zip_no_data' => 'ZIP skráin inniheldur ekkert efni.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'ZIP skráin stóðst ekki staðfestingu og skilaði villu:',
     'import_zip_failed_notification' => 'Gat ekki lesið inn ZIP skrá.',
     'import_perms_books' => 'Þú hefur ekki heimild til að búa til bækur.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Leyndarmálið sem gefið var upp fyrir API tókann er rangt',
     'api_user_no_api_permission' => 'Eigandi API tókans hefur ekki heimild til að gera API köll',
     'api_user_token_expired' => 'Auðkenningar tókin er útrunninn',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Villa kom upp viðað reyna senda prufu tölvupóst:',
diff --git a/lang/is/notifications.php b/lang/is/notifications.php
index b4fe01ad748..956fc743225 100644
--- a/lang/is/notifications.php
+++ b/lang/is/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Uppfærð síða á: :pageName',
     'updated_page_intro' => 'Síða hefur verið uppfærð á :appName:',
     'updated_page_debounce' => 'Til að fyrirbyggja fjöldatilkynningar verður þér ekki sendar tilkynningar í smá stund um uppfærslu á þessari síðu frá sama höfundi.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Síðunafn:',
     'detail_page_path' => 'Síðuslóð:',
diff --git a/lang/is/preferences.php b/lang/is/preferences.php
index b7ebc2df00a..48e7e05b5fc 100644
--- a/lang/is/preferences.php
+++ b/lang/is/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Stillingar flýtilykla hafa verið uppfærðar!',
     'shortcuts_overview_desc' => 'Stjórna þeim flýtilyklum sem í boði eru.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Stillingar tilkynninga',
     'notifications_desc' => 'Stýrðu þeim tölvupóst tilkynningum sem þú færð þegar ákveðnar aðgerðir eru gerðar af kerfinu.',
     'notifications_opt_own_page_changes' => 'Láta vita þegar gerðar eru breytingar á síðum sem ég á',
     'notifications_opt_own_page_comments' => 'Láta vita þegar gerðar eru athugasmedir við síður sem ég á',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Láta vita þegar athugasemdum mínum er svarað',
     'notifications_save' => 'Vista stillingar',
     'notifications_update_success' => 'Stillingar á tilkynningum hafa verið uppfærðar!',
diff --git a/lang/is/settings.php b/lang/is/settings.php
index 3765db061cc..a21c6945d0e 100644
--- a/lang/is/settings.php
+++ b/lang/is/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Engin skilyrði sett',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Viðhald',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Flytja inn efni',
     'role_editor_change' => 'Skipta um ritil síðu',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Allt',
     'role_own' => 'Eigin',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Vista hlutverk',
     'role_users' => 'Notendur í þessu hlutverki',
     'role_users_none' => 'Engir notendur eru eins og er í þessu hlutverki',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Búa til API tóka',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/is/validation.php b/lang/is/validation.php
index 9183d27cf53..ec3ff4dcc0f 100644
--- a/lang/is/validation.php
+++ b/lang/is/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute má eingöngu innihalda stafi og tölustafi.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'Kóðinn sem þú gafst upp er ekki gildur eða hefur þegar verið notaður.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute verður að vera dagsetning á undan :date.',
     'between'              => [
         'numeric' => ':attribute verður að vera á milli :min og :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute gildið verður að vera true og false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/it/activities.php b/lang/it/activities.php
index d682ccca6e0..e0dba540383 100644
--- a/lang/it/activities.php
+++ b/lang/it/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Utente aggiornato con successo',
     'user_delete' => 'ha eliminato un utente',
     'user_delete_notification' => 'Utente rimosso con successo',
+    'user_mfa_reset' => 'resetta MFA per l\'utente',
+    'user_mfa_reset_notification' => 'Metodi di autenticazione multi-fattore reimpostati',
 
     // API Tokens
     'api_token_create' => 'ha creato un token API',
diff --git a/lang/it/auth.php b/lang/it/auth.php
index 9191ecba794..8803c116a97 100644
--- a/lang/it/auth.php
+++ b/lang/it/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Credenziali errate.',
     'throttle' => 'Troppi tentativi di login. Riprova in :seconds secondi.',
+    'mfa_throttle' => 'Troppi tentativi di verifica multi-fattore. Riprova tra :seconds secondi.',
 
     // Login & Register
     'sign_up' => 'Registrati',
@@ -20,6 +21,9 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'Nuova Password',
+    'password_new_confirm' => 'Conferma Nuova Password',
+    'password_current' => 'Conferma Password Corrente',
     'password_confirm' => 'Conferma password',
     'password_hint' => 'Deve essere lunga almeno 8 caratteri',
     'forgot_password' => 'Password dimenticata?',
diff --git a/lang/it/common.php b/lang/it/common.php
index 9eba738a4e5..993d279950d 100644
--- a/lang/it/common.php
+++ b/lang/it/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inattivo',
     'never' => 'Mai',
     'none' => 'Nessuno',
+    'move_left' => 'Spostarsi a sinistra',
+    'move_right' => 'Spostarsi a destra',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/it/entities.php b/lang/it/entities.php
index eb9868973e5..fefb9d34b08 100644
--- a/lang/it/entities.php
+++ b/lang/it/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Spostare i capitoli e le pagine di un libro per riorganizzarne il contenuto. Possono essere aggiunti altri libri che permettono di spostare facilmente capitoli e pagine tra i libri. Opzionalmente una regola di ordinamento automatico può essere impostata per ordinare automaticamente i contenuti di questo libro in caso di modifiche.',
     'books_sort_auto_sort' => 'Opzione Ordinamento Automatico',
     'books_sort_auto_sort_active' => 'Ordinamento Automatico Attivo: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Le regole delle opzioni di ordinamento automatico possono essere create nell\'area delle impostazioni "Elenchi e ordinamento" da un utente con le relative autorizzazioni.',
     'books_sort_named' => 'Ordina il libro :bookName',
     'books_sort_name' => 'Ordina per Nome',
     'books_sort_created' => 'Ordina per Data di creazione',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Attiva/disattiva barra laterale',
+    'page_contents' => 'Contenuto della pagina',
+    'page_contents_none' => 'Nessun titolo trovato nel contenuto della pagina.',
+    'page_contents_info' => 'Il sommario viene generato sulla base dei formati di intestazione utilizzati nella pagina.',
     'page_tags' => 'Tag pagina',
     'chapter_tags' => 'Tag capitolo',
     'book_tags' => 'Tag libro',
diff --git a/lang/it/errors.php b/lang/it/errors.php
index b3763cce252..1d6c716361d 100644
--- a/lang/it/errors.php
+++ b/lang/it/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Impossibile leggere il file ZIP.',
     'import_zip_cant_decode_data' => 'Impossibile trovare e decodificare il contenuto ZIP data.json.',
     'import_zip_no_data' => 'I dati del file ZIP non hanno il contenuto previsto di libri, capitoli o pagine.',
+    'import_zip_data_too_large' => 'Il contenuto ZIP data.json supera la dimensione massima di upload configurata nell\'applicazione.',
     'import_validation_failed' => 'L\'importazione ZIP non è stata convalidata con errori:',
     'import_zip_failed_notification' => 'Impossibile importare il file ZIP.',
     'import_perms_books' => 'Non hai i permessi necessari per creare libri.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Il token segreto fornito per il token API utilizzato non è corretto',
     'api_user_no_api_permission' => 'Il proprietario del token API utilizzato non ha il permesso di effettuare chiamate API',
     'api_user_token_expired' => 'Il token di autorizzazione utilizzato è scaduto',
+    'api_cookie_auth_only_get' => 'Solo le richieste GET sono consentite quando si utilizza l\'API con autenticazione basata sui cookie',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Si è verificato un errore durante l\'invio di una e-mail di prova:',
diff --git a/lang/it/notifications.php b/lang/it/notifications.php
index 6b8932ebee0..a8b23f1a719 100644
--- a/lang/it/notifications.php
+++ b/lang/it/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Pagina aggiornata: :pageName',
     'updated_page_intro' => 'Una pagina è stata aggiornata in :appName:',
     'updated_page_debounce' => 'Per evitare una massa di notifiche, per un po\' non ti verranno inviate notifiche per ulteriori modifiche a questa pagina dallo stesso editor.',
+    'comment_mention_subject' => 'Sei stato menzionato in un commento nella pagina: :pageName',
+    'comment_mention_intro' => 'Sei stato menzionato in un commento su :appName:',
 
     'detail_page_name' => 'Nome della pagina:',
     'detail_page_path' => 'Percorso della pagina:',
diff --git a/lang/it/preferences.php b/lang/it/preferences.php
index f251384011b..63c10fdfa42 100644
--- a/lang/it/preferences.php
+++ b/lang/it/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Le preferenze delle scorciatoie sono state aggiornate!',
     'shortcuts_overview_desc' => 'Gestisci le scorciatoie da tastiera che puoi usare per navigare nell\'interfaccia utente di sistema.',
 
+    'interface' => 'Preferenze dell\'interfaccia',
+    'interface_desc' => 'Qui puoi trovare le opzioni per personalizzare l\'aspetto dell\'interfaccia utente dell\'applicazione.',
+    'interface_display_mode' => 'Modalità di visualizzazione',
+    'interface_display_mode_desc' => 'Scegli se l\'applicazione deve essere visualizzata in modalità scura o chiara. È possibile cambiare questa impostazione anche dalla schermata iniziale o tramite il menu a tendina del profilo nella barra di intestazione.',
+    'layouts' => 'Preferenze di scelta rapida dell\'Interfaccia Utente',
+    'layouts_desc' => 'Personalizza la disposizione delle sezioni visualizzate nell\'interfaccia utente per una serie di visualizzazioni.',
+    'layout_edit' => 'Modifica il Layout',
+    'layout_edit_desc' => 'Trascina e rilascia le sezioni oppure utilizza il menu delle azioni presente su ciascuna di esse per ridefinire quali sezioni visualizzare all\'interno di questo layout nell\'interfaccia e dove visualizzarle.',
+    'layout_edit_column_hint' => 'Se visualizzate su schermi di dimensioni ridotte, le sezioni della colonna di destra verranno sovrapposte a quelle della colonna di sinistra.',
+    'layout_edit_save' => 'Salva Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Torna alle Preferenze',
+    'layout_edit_left' => 'Sinistra',
+    'layout_edit_right' => 'Destra',
+    'layout_edit_center' => 'Centro',
+    'layout_edit_unused' => 'Non utilizzato',
+    'layout_edit_empty' => 'Nessuna sezione da visualizzare',
+    'layout_edit_reset_to_defaults' => 'Ripristina predefinito',
+    'layout_update_success' => 'Le preferenze di layout sono state aggiornate!',
+    'layout_reset_success' => 'Le preferenze di layout sono state aggiornate!',
+
     'notifications' => 'Preferenze notifiche',
     'notifications_desc' => 'Controlla le notifiche email che ricevi quando viene eseguita una determinata attività all\'interno del sistema.',
     'notifications_opt_own_page_changes' => 'Notifica in caso di modifiche alle pagine che possiedo',
     'notifications_opt_own_page_comments' => 'Notifica i commenti sulle pagine che possiedo',
+    'notifications_opt_comment_mentions' => 'Avvisami quando vengo menzionato in un commento',
     'notifications_opt_comment_replies' => 'Notificare le risposte ai miei commenti',
     'notifications_save' => 'Salva preferenze',
     'notifications_update_success' => 'Le preferenze di notifica sono state aggiornate!',
diff --git a/lang/it/settings.php b/lang/it/settings.php
index 8bda7f8ffe9..93619ce87ef 100644
--- a/lang/it/settings.php
+++ b/lang/it/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nessuna restrizione impostata',
 
     // Sorting Settings
-    'sorting' => 'Ordinamento',
-    'sorting_book_default' => 'Ordinamento libri predefinito',
+    'sorting' => 'Elenchi E Ordinamento',
+    'sorting_book_default' => 'Regola Di Ordinamento Libro Predefinita',
     'sorting_book_default_desc' => 'Selezionare la regola di ordinamento predefinita da applicare ai nuovi libri. Questa regola non influisce sui libri esistenti e può essere modificata per ogni libro.',
     'sorting_rules' => 'Regole di ordinamento',
     'sorting_rules_desc' => 'Si tratta di operazioni di ordinamento predefinite applicabili ai contenuti del sistema.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Data di aggiornamento',
     'sort_rule_op_chapters_first' => 'Capitoli Prima',
     'sort_rule_op_chapters_last' => 'Capitoli dopo',
+    'sorting_page_limits' => 'Limiti Visualizzazione Per Pagina',
+    'sorting_page_limits_desc' => 'Imposta il numero di elementi da visualizzare per pagina nei vari elenchi del sistema. In genere, un numero inferiore garantisce prestazioni migliori, mentre un numero maggiore evita di dover sfogliare più pagine. Si consiglia di utilizzare un multiplo di 6.',
 
     // Maintenance settings
     'maint' => 'Manutenzione',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importa contenuto',
     'role_editor_change' => 'Cambiare editor di pagina',
     'role_notifications' => 'Ricevere e gestire le notifiche',
+    'role_permission_note_users_and_roles' => 'Queste autorizzazioni forniranno tecnicamente anche la visibilità e la ricerca di utenti e ruoli nel sistema.',
     'role_asset' => 'Permessi entità',
     'roles_system_warning' => 'Siate consapevoli che l\'accesso a uno dei tre permessi qui sopra può consentire a un utente di modificare i propri privilegi o i privilegi di altri nel sistema. Assegna ruoli con questi permessi solo ad utenti fidati.',
     'role_asset_desc' => 'Questi permessi controllano l\'accesso predefinito alle entità. I permessi in libri, capitoli e pagine sovrascriveranno questi.',
     'role_asset_admins' => 'Gli amministratori hanno automaticamente accesso a tutti i contenuti ma queste opzioni possono mostrare o nascondere le opzioni della UI.',
     'role_asset_image_view_note' => 'Questo si riferisce alla visibilità all\'interno del gestore delle immagini. L\'accesso effettivo ai file di immagine caricati dipenderà dall\'opzione di archiviazione delle immagini di sistema.',
+    'role_asset_users_note' => 'Queste autorizzazioni forniranno tecnicamente anche la visibilità e la ricerca di utenti nel sistema.',
     'role_all' => 'Tutti',
     'role_own' => 'Propri',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controllato dall\'entità in cui sono caricati',
+    'role_controlled_by_page_delete' => 'Controllato dai permessi di cancellazione della pagina',
     'role_save' => 'Salva ruolo',
     'role_users' => 'Utenti in questo ruolo',
     'role_users_none' => 'Nessun utente assegnato a questo ruolo',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Imposta l\'autenticazione multi-fattore come misura di sicurezza aggiuntiva per il tuo account.',
     'users_mfa_x_methods' => ':count metodo configurato|:count metodi configurati',
     'users_mfa_configure' => 'Configura metodi',
+    'users_mfa_reset' => 'Reimposta Metodi Di Autenticazione Multi-Fattore',
+    'users_mfa_reset_desc' => 'Questo ripristinerà e cancellerà tutti i metodi di autenticazione multi-fattore configurati per questo utente. Se l\'autenticazione multi-fattore è richiesta da uno qualsiasi dei loro ruoli, sarà richiesto loro di configurare nuovi metodi al loro prossimo accesso.',
+    'users_mfa_reset_confirm' => 'Sei sicuro di voler resettare l\'autenticazione multi-fattore per questo utente?',
 
     // API Tokens
     'user_api_token_create' => 'Crea token API',
@@ -358,7 +367,9 @@
         'ru' => 'Russo',
         'sk' => 'Sloveno',
         'sl' => 'Sloveno',
+        'sr' => 'Српски',
         'sv' => 'Svedese',
+        'th' => 'Thailandese',
         'tr' => 'Turco',
         'uk' => 'Ucraino',
         'uz' => 'O‘zbekcha',
diff --git a/lang/it/validation.php b/lang/it/validation.php
index c945ff7d426..488d4840366 100644
--- a/lang/it/validation.php
+++ b/lang/it/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute deve contenere solo lettere e numeri.',
     'array'                => ':attribute deve essere un array.',
     'backup_codes'         => 'Il codice fornito non è valido o è già stato utilizzato.',
+    'base64_uri_mime'      => 'L\' :attribute deve essere un URI Base64 valido contenente dati di tipo MIME :mime .',
     'before'               => ':attribute deve essere una data prima del :date.',
     'between'              => [
         'numeric' => 'Il campo :attribute deve essere tra :min e :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute deve essere vero o falso.',
     'confirmed'            => 'La conferma di :attribute non corrisponde.',
+    'current_password'     => 'Questa password non corrisponde a quella attuale.',
     'date'                 => ':attribute non è una data valida.',
     'date_format'          => 'Il campo :attribute non corrisponde al formato :format.',
     'different'            => 'Il campo :attribute e :other devono essere differenti.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Il file non può essere caricato. Il server potrebbe non accettare file di questa dimensione.',
 
     'zip_file' => 'L\'attributo :attribute deve fare riferimento a un file all\'interno dello ZIP.',
+    'zip_file_size' => 'Il file :attribute non deve superare :size MB.',
     'zip_file_mime' => 'Il campo :attribute deve fare riferimento a un file di tipo :validTypes, trovato :foundType.',
     'zip_model_expected' => 'Oggetto dati atteso ma ":type" trovato.',
     'zip_unique' => 'L\'attributo :attribute deve essere univoco per il tipo di oggetto all\'interno dello ZIP.',
diff --git a/lang/ja/activities.php b/lang/ja/activities.php
index 6f55098bbd9..93a3597f83a 100644
--- a/lang/ja/activities.php
+++ b/lang/ja/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'ユーザーを更新しました',
     'user_delete' => 'がユーザを削除',
     'user_delete_notification' => 'ユーザーを削除しました',
+    'user_mfa_reset' => 'ユーザーの多要素認証をリセット',
+    'user_mfa_reset_notification' => '多要素認証方法をリセット',
 
     // API Tokens
     'api_token_create' => 'がAPIトークンを作成',
diff --git a/lang/ja/auth.php b/lang/ja/auth.php
index 077c31ac85c..c22b5797bad 100644
--- a/lang/ja/auth.php
+++ b/lang/ja/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'この資格情報は登録されていません。',
     'throttle' => 'ログイン試行回数が制限を超えました。:seconds秒後に再試行してください。',
+    'mfa_throttle' => '多要素認証の試行回数が制限を越えました。:seconds 秒後に再試行してください。',
 
     // Login & Register
     'sign_up' => '新規登録',
@@ -20,6 +21,9 @@
     'username' => 'ユーザ名',
     'email' => 'メールアドレス',
     'password' => 'パスワード',
+    'password_new' => '新しいパスワード',
+    'password_new_confirm' => '新しいパスワード(確認用)',
+    'password_current' => '現在のパスワード(確認用)',
     'password_confirm' => 'パスワード (確認)',
     'password_hint' => '8文字以上で設定する必要があります',
     'forgot_password' => 'パスワードをお忘れですか？',
diff --git a/lang/ja/common.php b/lang/ja/common.php
index e888c43f651..cb2f854a090 100644
--- a/lang/ja/common.php
+++ b/lang/ja/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => '無効',
     'never' => '該当なし',
     'none' => 'なし',
+    'move_left' => '左に移動',
+    'move_right' => '右に移動',
 
     // Header
     'homepage' => 'ホームページ',
diff --git a/lang/ja/entities.php b/lang/ja/entities.php
index 551a2e49672..164004451b5 100644
--- a/lang/ja/entities.php
+++ b/lang/ja/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'ブック内のチャプタおよびページを移動して内容を再編成できます。他のブックを並べて、ブック間でチャプタやページを簡単に移動することもできます。オプションで自動ソートルールを設定すると、変更時にブックの内容を自動的にソートすることができます。',
     'books_sort_auto_sort' => '自動ソートオプション',
     'books_sort_auto_sort_active' => '自動ソート有効: :sortName',
+    'books_sort_auto_sort_creation_hint' => '自動ソートオプションのルールは、関連する権限を持ったユーザーによって設定の「一覧とソート」エリアで作成できます。',
     'books_sort_named' => 'ブック「:bookName」を並べ替え',
     'books_sort_name' => '名前で並べ替え',
     'books_sort_created' => '作成日で並べ替え',
@@ -331,6 +332,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'サイドバーの切り替え',
+    'page_contents' => 'ページの内容',
+    'page_contents_none' => 'ページ内に見出しが見つかりませんでした。',
+    'page_contents_info' => '目次メニューは、ページ内で使用されている見出し書式から生成されます。',
     'page_tags' => 'タグ',
     'chapter_tags' => 'チャプターのタグ',
     'book_tags' => 'ブックのタグ',
diff --git a/lang/ja/errors.php b/lang/ja/errors.php
index 8161c08b860..0c1c8d84ad5 100644
--- a/lang/ja/errors.php
+++ b/lang/ja/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIPファイルを読み込めません。',
     'import_zip_cant_decode_data' => 'ZIPファイル内に data.json が見つからないかデコードできませんでした。',
     'import_zip_no_data' => 'ZIPファイルのデータにブック、チャプター、またはページコンテンツがありません。',
+    'import_zip_data_too_large' => 'ZIPに含まれる data.json が、アプリケーションで設定された最大アップロードサイズを超えています。',
     'import_validation_failed' => 'エラーによりインポートZIPの検証に失敗しました:',
     'import_zip_failed_notification' => 'ZIP ファイルのインポートに失敗しました。',
     'import_perms_books' => 'ブックを作成するために必要な権限がありません。',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => '利用されたAPIトークンに対して提供されたシークレットが正しくありません',
     'api_user_no_api_permission' => '使用されているAPIトークンの所有者には、API呼び出しを行う権限がありません',
     'api_user_token_expired' => '認証トークンが期限切れです。',
+    'api_cookie_auth_only_get' => 'Cookie ベースの認証で API を使用する場合、GET リクエストのみが許可されます',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'テストメール送信時にエラーが発生しました:',
diff --git a/lang/ja/notifications.php b/lang/ja/notifications.php
index 6fc0321d353..ea6286b513f 100644
--- a/lang/ja/notifications.php
+++ b/lang/ja/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'ページの更新： :pageName',
     'updated_page_intro' => ':appName でページが更新されました',
     'updated_page_debounce' => '大量の通知を防ぐために、しばらくの間は同じユーザがこのページをさらに編集しても通知は送信されません。',
+    'comment_mention_subject' => 'ページのコメントであなたにメンションされています: :pageName',
+    'comment_mention_intro' => ':appName: のコメントであなたにメンションされました',
 
     'detail_page_name' => 'ページ名：',
     'detail_page_path' => 'ページパス：',
diff --git a/lang/ja/preferences.php b/lang/ja/preferences.php
index 0207596a9ec..4ca6646f3a2 100644
--- a/lang/ja/preferences.php
+++ b/lang/ja/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'ショートカットの設定を更新しました。',
     'shortcuts_overview_desc' => 'システムのユーザーインターフェイスを操作するためのキーボードショートカットを管理します。',
 
+    'interface' => 'インターフェイス設定',
+    'interface_desc' => 'ここでは、アプリケーションユーザーインターフェイスの外観をカスタマイズするオプションを設定することができます。',
+    'interface_display_mode' => '表示モード',
+    'interface_display_mode_desc' => 'アプリケーションのダーク/ライト表示モードを選択します。 これは、ホームビューやヘッダーバーのプロファイルドロップダウンメニューからも切り替えることができます。',
+    'layouts' => 'UI レイアウト設定',
+    'layouts_desc' => 'ユーザーインターフェイスに表示されるセクションのレイアウトをカスタマイズして、ビューの範囲を設定します。',
+    'layout_edit' => 'レイアウトの編集',
+    'layout_edit_desc' => 'セクションをドラッグ＆ドロップするか、アクションメニューを使用して、レイアウト内に表示するセクションと場所を編集します。',
+    'layout_edit_column_hint' => '画面サイズが小さい場合、右側のセクションは左側のセクションの上部に表示されます。',
+    'layout_edit_save' => 'レイアウトを保存',
+    'layout_edit_layouts' => 'レイアウト',
+    'layout_edit_back_to_preferences' => '設定に戻る',
+    'layout_edit_left' => '左',
+    'layout_edit_right' => '右',
+    'layout_edit_center' => '中央',
+    'layout_edit_unused' => '未使用',
+    'layout_edit_empty' => '表示対象のセクションはありません',
+    'layout_edit_reset_to_defaults' => 'デフォルトに戻す',
+    'layout_update_success' => 'レイアウト設定が更新されました！',
+    'layout_reset_success' => 'レイアウト設定をリセットしました！',
+
     'notifications' => '通知設定',
     'notifications_desc' => 'システム内で特定のアクティビティが実行されたときに受信する電子メール通知を制御します。',
     'notifications_opt_own_page_changes' => '自分が所有するページの変更を通知する',
     'notifications_opt_own_page_comments' => '自分が所有するページへのコメントを通知する',
+    'notifications_opt_comment_mentions' => 'コメントでメンションされたときに通知する',
     'notifications_opt_comment_replies' => '自分のコメントへの返信を通知する',
     'notifications_save' => '設定を保存',
     'notifications_update_success' => '通知設定を更新しました。',
diff --git a/lang/ja/settings.php b/lang/ja/settings.php
index db14f3ccc5a..c993a30dcd1 100644
--- a/lang/ja/settings.php
+++ b/lang/ja/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => '制限しない',
 
     // Sorting Settings
-    'sorting' => 'ソート',
-    'sorting_book_default' => 'ブックのデフォルトソート',
+    'sorting' => '一覧とソート',
+    'sorting_book_default' => 'ブックのデフォルトソートルール',
     'sorting_book_default_desc' => '新しいブックに適用するデフォルトのソートルールを選択します。これは既存のブックには影響しません。ルールはブックごとに上書きすることができます。',
     'sorting_rules' => 'ソートルール',
     'sorting_rules_desc' => 'これらはシステム内のコンテンツに適用できる事前定義のソート操作です。',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => '更新日時',
     'sort_rule_op_chapters_first' => 'チャプタを最初に',
     'sort_rule_op_chapters_last' => 'チャプタを最後に',
+    'sorting_page_limits' => 'ページング表示制限',
+    'sorting_page_limits_desc' => 'システム内の各種リストで1ページに表示するアイテム数を設定します。 通常、少ない数に設定するとパフォーマンスが向上し、多い数に設定するとページの移動操作が少なくなります。6 の倍数に設定することをお勧めします。',
 
     // Maintenance settings
     'maint' => 'メンテナンス',
@@ -186,8 +188,8 @@
     'role_system' => 'システム権限',
     'role_manage_users' => 'ユーザ管理',
     'role_manage_roles' => '役割と権限の管理',
-    'role_manage_entity_permissions' => '全てのブック, チャプター, ページに対する権限の管理',
-    'role_manage_own_entity_permissions' => '自身のブック, チャプター, ページに対する権限の管理',
+    'role_manage_entity_permissions' => '全てのブック, チャプター, ページの権限管理',
+    'role_manage_own_entity_permissions' => '自身のブック, チャプター, ページの権限管理',
     'role_manage_page_templates' => 'ページテンプレートの管理',
     'role_access_api' => 'システムのAPIへのアクセス',
     'role_manage_settings' => 'アプリケーション設定の管理',
@@ -195,14 +197,18 @@
     'role_import_content' => 'コンテンツのインポート',
     'role_editor_change' => 'ページエディタの変更',
     'role_notifications' => '通知の受信と管理',
+    'role_permission_note_users_and_roles' => '技術的には、これらの権限によりシステムのユーザーおよび役割の可視性と検索も提供されます。',
     'role_asset' => 'アセット権限',
     'roles_system_warning' => '上記の3つの権限のいずれかを付与することは、ユーザーが自分の特権またはシステム内の他のユーザーの特権を変更できる可能性があることに注意してください。これらの権限は信頼できるユーザーにのみ割り当ててください。',
     'role_asset_desc' => '各アセットに対するデフォルトの権限を設定します。ここで設定した権限が優先されます。',
     'role_asset_admins' => '管理者にはすべてのコンテンツへのアクセス権が自動的に付与されますが、これらのオプションはUIオプションを表示または非表示にする場合があります。',
     'role_asset_image_view_note' => 'これは画像マネージャー内の可視性に関連しています。アップロードされた画像ファイルへの実際のアクセスは、システムの画像保存オプションに依存します。',
+    'role_asset_users_note' => '技術的には、これらの権限によりシステム内のユーザーの可視性と検索も提供されます。',
     'role_all' => '全て',
     'role_own' => '自身',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'このアセットに対し、右記の操作を許可:',
+    'role_controlled_by_page_delete' => 'ページ削除権限を適用',
     'role_save' => '役割を保存',
     'role_users' => 'この役割を持つユーザー',
     'role_users_none' => 'この役割が付与されたユーザーはいません',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'アカウントのセキュリティを強化するために、多要素認証を設定してください。',
     'users_mfa_x_methods' => ':count個の手段が設定されています|:count個の手段が設定されています',
     'users_mfa_configure' => '手段を設定',
+    'users_mfa_reset' => '多要素認証方法をリセット',
+    'users_mfa_reset_desc' => 'このユーザーに設定されたすべての多要素認証方法をリセットしてクリアします。 いずれかのロールで多要素認証が必須になっている場合、次回のログイン時に新しい認証方法を設定するよう求められます。',
+    'users_mfa_reset_confirm' => 'このユーザーの多要素認証をリセットしてもよろしいですか？',
 
     // API Tokens
     'user_api_token_create' => 'APIトークンの作成',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ja/validation.php b/lang/ja/validation.php
index 7d18c85be72..d799d8da64f 100644
--- a/lang/ja/validation.php
+++ b/lang/ja/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attributeは文字と数値のみが含められます。',
     'array'                => ':attributeは配列である必要があります。',
     'backup_codes'         => '提供されたコードは無効か、またはすでに使用されています。',
+    'base64_uri_mime'      => ':attribute は :mime MIMEタイプのデータを含む有効な base64 URI である必要があります。',
     'before'               => ':attributeは:date以前である必要があります。',
     'between'              => [
         'numeric' => ':attributeは:min〜:maxである必要があります。',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attributeはtrueまたはfalseである必要があります。',
     'confirmed'            => ':attributeの確認が一致しません。',
+    'current_password'     => '現在のパスワードが正しくありません。',
     'date'                 => ':attributeは正しい日時ではありません。',
     'date_format'          => ':attributeが:formatのフォーマットと一致しません。',
     'different'            => ':attributeと:otherは異なる必要があります。',
@@ -106,6 +108,7 @@
     'uploaded'             => 'ファイルをアップロードできませんでした。サーバーがこのサイズのファイルを受け付けていない可能性があります。',
 
     'zip_file' => ':attribute はZIP 内のファイルを参照する必要があります。',
+    'zip_file_size' => ':attribute は :size MB を超えてはいけません。',
     'zip_file_mime' => ':attribute は種別 :validType のファイルを参照する必要がありますが、種別 :foundType となっています。',
     'zip_model_expected' => 'データオブジェクトが期待されますが、":type" が見つかりました。',
     'zip_unique' => 'ZIP内のオブジェクトタイプに :attribute が一意である必要があります。',
diff --git a/lang/ka/activities.php b/lang/ka/activities.php
index 35730fd77a0..07304a56277 100644
--- a/lang/ka/activities.php
+++ b/lang/ka/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/ka/auth.php b/lang/ka/auth.php
index 57f0cb5c632..13247c73194 100644
--- a/lang/ka/auth.php
+++ b/lang/ka/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'These credentials do not match our records.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Sign up',
@@ -20,6 +21,9 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirm Password',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Forgot Password?',
diff --git a/lang/ka/common.php b/lang/ka/common.php
index 06a9e855ce3..46b2a187c25 100644
--- a/lang/ka/common.php
+++ b/lang/ka/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/ka/entities.php b/lang/ka/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/ka/entities.php
+++ b/lang/ka/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/ka/errors.php b/lang/ka/errors.php
index 9d738379648..20537d59f0c 100644
--- a/lang/ka/errors.php
+++ b/lang/ka/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/ka/notifications.php b/lang/ka/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/ka/notifications.php
+++ b/lang/ka/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/ka/preferences.php b/lang/ka/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/ka/preferences.php
+++ b/lang/ka/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/ka/settings.php b/lang/ka/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/ka/settings.php
+++ b/lang/ka/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ka/validation.php b/lang/ka/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/ka/validation.php
+++ b/lang/ka/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/ko/activities.php b/lang/ko/activities.php
index c1dbb93fd7b..e011523face 100644
--- a/lang/ko/activities.php
+++ b/lang/ko/activities.php
@@ -33,7 +33,7 @@
     'book_create_from_chapter'              => '챕터를 책으로 변환',
     'book_create_from_chapter_notification' => '챕터가 책으로 성공적으로 변환되었습니다.',
     'book_update'                 => '업데이트된 책',
-    'book_update_notification'    => '책이 성공적으로 업데이트되었습니다.',
+    'book_update_notification'    => '책 수정함',
     'book_delete'                 => '삭제된 책',
     'book_delete_notification'    => '책이 성공적으로 삭제되었습니다.',
     'book_sort'                   => '책 정렬',
@@ -50,9 +50,9 @@
     'bookshelf_delete_notification'    => '책장이 성공적으로 삭제되었습니다.',
 
     // Revisions
-    'revision_restore' => '버전 복구',
-    'revision_delete' => '버전 삭제',
-    'revision_delete_notification' => '버전 삭제 성공',
+    'revision_restore' => '복원한 수정본',
+    'revision_delete' => '삭제한 수정본',
+    'revision_delete_notification' => '수정본을 잘 삭제함',
 
     // Favourites
     'favourite_add_notification' => '":name" 을 북마크에 추가하였습니다.',
@@ -99,6 +99,8 @@
     'user_update_notification' => '사용자가 업데이트되었습니다',
     'user_delete' => '사용자 삭제',
     'user_delete_notification' => '사용자가 삭제되었습니다',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => '생성된 API 토큰',
diff --git a/lang/ko/auth.php b/lang/ko/auth.php
index 6b60225cbd4..59e235e361b 100644
--- a/lang/ko/auth.php
+++ b/lang/ko/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => '자격 증명이 기록과 일치하지 않습니다.',
     'throttle' => '로그인 시도가 너무 많습니다. :seconds초 후에 다시 시도해주세요.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => '가입',
@@ -17,9 +18,12 @@
     'logout' => '로그아웃',
 
     'name' => '이름',
-    'username' => '사용자 이름',
+    'username' => '이용자명',
     'email' => '전자우편 주소',
     'password' => '비밀번호',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => '비밀번호 확인',
     'password_hint' => '8 글자를 넘어야 합니다.',
     'forgot_password' => '비밀번호를 잊으셨나요?',
diff --git a/lang/ko/common.php b/lang/ko/common.php
index ff35f097179..139f39f9b81 100644
--- a/lang/ko/common.php
+++ b/lang/ko/common.php
@@ -30,8 +30,8 @@
     'create' => '만들기',
     'update' => '바꾸기',
     'edit' => '수정',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => '보관',
+    'unarchive' => '보관 해제',
     'sort' => '정렬',
     'move' => '이동',
     'copy' => '복사',
@@ -43,31 +43,31 @@
     'reset' => '리셋',
     'remove' => '제거',
     'add' => '추가',
-    'configure' => '설정',
+    'configure' => '구성',
     'manage' => '관리',
     'fullscreen' => '전체화면',
     'favourite' => '즐겨찾기',
     'unfavourite' => '즐겨찾기 해제',
     'next' => '다음',
     'previous' => '이전',
-    'filter_active' => '적용 중:',
-    'filter_clear' => '모든 필터 해제',
+    'filter_active' => '적용 필터:',
+    'filter_clear' => '필터 해제',
     'download' => '내려받기',
     'open_in_tab' => '탭에서 열기',
-    'open' => '열기 ',
+    'open' => '열기',
 
     // Sort Options
     'sort_options' => '정렬 기준',
     'sort_direction_toggle' => '순서 반전',
     'sort_ascending' => '오름차순',
     'sort_descending' => '내림차순',
-    'sort_name' => '제목',
+    'sort_name' => '이름',
     'sort_default' => '기본값',
     'sort_created_at' => '만든 날짜',
-    'sort_updated_at' => '수정한 날짜',
+    'sort_updated_at' => '갱신한 날짜',
 
     // Misc
-    'deleted_user' => '삭제한 사용자',
+    'deleted_user' => '삭제한 이용자',
     'no_activity' => '활동 없음',
     'no_items' => '항목 없음',
     'back_to_top' => '맨 위로',
@@ -75,8 +75,8 @@
     'toggle_details' => '내용 보기',
     'toggle_thumbnails' => '썸네일 보기',
     'details' => '정보',
-    'grid_view' => '격자 형식으로 보기',
-    'list_view' => '리스트 형식으로 보기',
+    'grid_view' => '격자로 보기',
+    'list_view' => '목록으로 보기',
     'default' => '기본 설정',
     'breadcrumb' => '탐색 경로',
     'status' => '상태',
@@ -84,6 +84,8 @@
     'status_inactive' => '비활성',
     'never' => '안 함',
     'none' => '없음',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => '홈페이지',
diff --git a/lang/ko/components.php b/lang/ko/components.php
index 0c0bc2e65ed..7995ceebd9a 100644
--- a/lang/ko/components.php
+++ b/lang/ko/components.php
@@ -8,7 +8,7 @@
     'image_select' => '이미지 선택',
     'image_list' => '이미지 목록',
     'image_details' => '이미지 상세정보',
-    'image_upload' => '이미지 업로드',
+    'image_upload' => '이미지 올려두기',
     'image_intro' => '여기에서 이전에 시스템에 업로드한 이미지를 선택하고 관리할 수 있습니다.',
     'image_intro_upload' => '이미지 파일을 이 창으로 끌어다 놓거나 위의 \'이미지 업로드\' 버튼을 사용하여 새 이미지를 업로드합니다.',
     'image_all' => '모든 이미지',
@@ -17,7 +17,7 @@
     'image_page_title' => '이 문서에서 쓰고 있는 이미지',
     'image_search_hint' => '이미지 이름 검색',
     'image_uploaded' => '올림 :uploadedDate',
-    'image_uploaded_by' => '업로드 :userName',
+    'image_uploaded_by' => ':userName 이용자가 올려둠',
     'image_uploaded_to' => ':pageLink 로 업로드됨',
     'image_updated' => '갱신일 :updateDate',
     'image_load_more' => '더 보기',
diff --git a/lang/ko/editor.php b/lang/ko/editor.php
index b5c4ae8070c..a274586c180 100644
--- a/lang/ko/editor.php
+++ b/lang/ko/editor.php
@@ -178,5 +178,5 @@
     'shortcuts_intro' => '편집기에서 사용할 수 있는 바로 가기는 다음과 같습니다:',
     'windows_linux' => '(윈도우/리눅스)',
     'mac' => '(맥)',
-    'description' => '상세정보',
+    'description' => '설명',
 ];
diff --git a/lang/ko/entities.php b/lang/ko/entities.php
index b5624f2213b..838aebd7a69 100644
--- a/lang/ko/entities.php
+++ b/lang/ko/entities.php
@@ -16,8 +16,8 @@
     'recently_viewed' => '최근에 본 목록',
     'recent_activity' => '최근 활동 기록',
     'create_now' => '바로 만들기',
-    'revisions' => '버전',
-    'meta_revision' => '버전 #:revisionCount',
+    'revisions' => '수정본',
+    'meta_revision' => '수정본 #:revisionCount',
     'meta_created' => '생성 :timeLength',
     'meta_created_name' => '생성 :timeLength, :user',
     'meta_updated' => '수정 :timeLength',
@@ -115,7 +115,7 @@
     'shelves_create' => '책꽂이 만들기',
     'shelves_popular' => '많이 읽은 책꽂이',
     'shelves_new' => '새로운 책꽂이',
-    'shelves_new_action' => '새로운 책꽂이',
+    'shelves_new_action' => '새 책꽂이',
     'shelves_popular_empty' => '많이 읽은 책꽂이 목록',
     'shelves_new_empty' => '새로운 책꽂이 목록',
     'shelves_save' => '저장',
@@ -148,7 +148,7 @@
     'books_popular' => '많이 읽은 책',
     'books_recent' => '최근에 읽은 책',
     'books_new' => '새로운 책',
-    'books_new_action' => '새로운 책',
+    'books_new_action' => '새 책',
     'books_popular_empty' => '많이 읽은 책 목록',
     'books_new_empty' => '새로운 책 목록',
     'books_create' => '책 만들기',
@@ -173,6 +173,7 @@
     'books_sort_desc' => '책 내의 챕터와 페이지를 이동하여 콘텐츠를 재구성할 수 있습니다. 다른 책들을 추가하여 책 간의 챕터와 페이지를 쉽게 이동할 수 있습니다. 선택적으로 자동 정렬 규칙을 설정하여 변경 시 이 책의 콘텐츠를 자동으로 정렬할 수 있습니다.',
     'books_sort_auto_sort' => '자동 정렬 옵션',
     'books_sort_auto_sort_active' => '현재 설정된 자동 정렬: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => ':bookName 정렬',
     'books_sort_name' => '제목',
     'books_sort_created' => '만든 날짜',
@@ -200,7 +201,7 @@
     'chapters' => '챕터',
     'x_chapters' => '챕터 :count개|총 :count개',
     'chapters_popular' => '많이 읽은 챕터',
-    'chapters_new' => '새로운 챕터',
+    'chapters_new' => '새 장',
     'chapters_create' => '챕터 만들기',
     'chapters_delete' => '챕터 삭제하기',
     'chapters_delete_named' => ':chapterName(을)를 지웁니다.',
@@ -221,11 +222,11 @@
     'chapter_sort_book' => '책 정렬하기',
 
     // Pages
-    'page' => '문서',
-    'pages' => '문서',
+    'page' => '페이지',
+    'pages' => '페이지',
     'x_pages' => '문서 :count개|총 :count개',
     'pages_popular' => '많이 읽은 문서',
-    'pages_new' => '새로운 문서',
+    'pages_new' => '새 페이지',
     'pages_attachments' => '첨부',
     'pages_navigation' => '목차',
     'pages_delete' => '문서 삭제하기',
@@ -272,7 +273,7 @@
     'pages_md_insert_drawing' => '드로잉 추가',
     'pages_md_show_preview' => '미리보기 표시',
     'pages_md_sync_scroll' => '미리보기 스크롤 동기화',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => '플레인텍스트 편집기',
     'pages_drawing_unsaved' => '저장되지 않은 드로잉 발견',
     'pages_drawing_unsaved_confirm' => '이전에 실패한 드로잉 저장 시도에서 저장되지 않은 드로잉 데이터가 발견되었습니다. 이 저장되지 않은 드로잉을 복원하고 계속 편집하시겠습니까?',
     'pages_not_in_chapter' => '챕터에 있는 문서가 아닙니다.',
@@ -290,10 +291,10 @@
     'pages_revision_restored_from' => '#:id; :summary에서 복구함',
     'pages_revisions_created_by' => '만든 사용자',
     'pages_revisions_date' => '수정한 날짜',
-    'pages_revisions_number' => 'No.',
+    'pages_revisions_number' => '#',
     'pages_revisions_sort_number' => '수정 번호',
-    'pages_revisions_numbered' => '수정본 :id',
-    'pages_revisions_numbered_changes' => '수정본 :id에서 바꾼 부분',
+    'pages_revisions_numbered' => '수정본 #:id',
+    'pages_revisions_numbered_changes' => '수정본 #:id에서 바꾼 부분',
     'pages_revisions_editor' => '편집기 유형',
     'pages_revisions_changelog' => '설명',
     'pages_revisions_changes' => '바꾼 부분',
@@ -310,7 +311,7 @@
     'pages_pointer_toggle_link' => '퍼머링크 모드, 포함 태그를 표시하려면 누릅니다.',
     'pages_pointer_toggle_include' => '태그 포함 모드, 퍼머링크를 표시하려면 누릅니다.',
     'pages_permissions_active' => '문서 권한 허용함',
-    'pages_initial_revision' => '처음 판본',
+    'pages_initial_revision' => '최초 게시',
     'pages_references_update_revision' => '시스템에서 내부 링크 자동 업데이트',
     'pages_initial_name' => '제목 없음',
     'pages_editing_draft_notification' => ':timeDiff에 초안 문서입니다.',
@@ -330,27 +331,30 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '사이드바 토글',
-    'page_tags' => '문서 태그',
-    'chapter_tags' => '챕터 꼬리표',
-    'book_tags' => '책 꼬리표',
-    'shelf_tags' => '책꽂이 꼬리표',
-    'tag' => '꼬리표',
-    'tags' =>  '꼬리표',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_tags' => '페이지 태그',
+    'chapter_tags' => '장 태그',
+    'book_tags' => '책 태그',
+    'shelf_tags' => '책꽂이 태그',
+    'tag' => '태그',
+    'tags' =>  '태그',
     'tags_index_desc' => '태그를 시스템 내의 콘텐츠에 적용하여 유연한 형태의 분류를 적용할 수 있습니다. 태그는 키와 값을 모두 가질 수 있으며 값은 선택 사항입니다. 태그가 적용되면 태그 이름과 값을 사용하여 콘텐츠를 쿼리할 수 있습니다.',
-    'tag_name' =>  '꼬리표 이름',
+    'tag_name' =>  '태그 이름',
     'tag_value' => '리스트 값 (선택 사항)',
     'tags_explain' => "문서를 더 잘 분류하려면 태그를 추가하세요.\n태그에 값을 할당하여 더욱 체계적으로 구성할 수 있습니다.",
-    'tags_add' => '꼬리표 추가',
-    'tags_remove' => '꼬리표 삭제',
-    'tags_usages' => '모든 꼬리표',
-    'tags_assigned_pages' => '문서에 꼬리표 지정함',
-    'tags_assigned_chapters' => '챕터에 꼬리표 지정함',
-    'tags_assigned_books' => '책에 태그 지정함',
-    'tags_assigned_shelves' => '책꽂이에 꼬리표 지정함',
+    'tags_add' => '다른 태그 추가하기',
+    'tags_remove' => '이 태그 제거하기',
+    'tags_usages' => '전체 태그 이용량',
+    'tags_assigned_pages' => '| 페이지 태그 할당 |',
+    'tags_assigned_chapters' => '| 장 태그 할당 |',
+    'tags_assigned_books' => '| 책 태그 할당 |',
+    'tags_assigned_shelves' => '| 책꽂이 태그 할당 |',
     'tags_x_unique_values' => ':count 중복 없는 값',
     'tags_all_values' => '모든 값',
-    'tags_view_tags' => '꼬리표 보기',
-    'tags_view_existing_tags' => '사용 중인 꼬리표 보기',
+    'tags_view_tags' => '태그 보기',
+    'tags_view_existing_tags' => '기존 태그 보기',
     'tags_list_empty_hint' => '태그는 에디터 사이드바나 책, 챕터 또는 책꽂이 정보 편집에서 지정할 수 있습니다.',
     'attachments' => '첨부 파일',
     'attachments_explain' => '파일이나 링크를 첨부하세요. 정보 탭에 나타납니다.',
@@ -403,7 +407,7 @@
     'comment_archived_count' => ':count Archived',
     'comment_archived_threads' => 'Archived Threads',
     'comment_save' => '등록',
-    'comment_new' => '새로운 댓글',
+    'comment_new' => '새 의견',
     'comment_created' => '댓글 등록함 :createDiff',
     'comment_updated' => ':username(이)가 댓글 수정함 :updateDiff',
     'comment_updated_indicator' => '업데이트됨',
@@ -416,14 +420,14 @@
     'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => '이 댓글을 지울 건가요?',
     'comment_in_reply_to' => ':commentId(을)를 향한 답글',
-    'comment_reference' => 'Reference',
+    'comment_reference' => '참조',
     'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => '이 페이지에 남겨진 댓글은 다음과 같습니다. 저장된 페이지를 볼 때 댓글을 추가하고 관리할 수 있습니다.',
 
     // Revision
     'revision_delete_confirm' => '이 수정본을 지울 건가요?',
     'revision_restore_confirm' => '이 버전을 되돌릴 건가요? 현재 페이지는 대체됩니다.',
-    'revision_cannot_delete_latest' => '현재 버전본은 지울 수 없습니다.',
+    'revision_cannot_delete_latest' => '최신 수정본은 지울 수 없습니다.',
 
     // Copy view
     'copy_consider' => '항목을 복사할 때 다음을 고려하세요.',
diff --git a/lang/ko/errors.php b/lang/ko/errors.php
index 9639a503613..ca7c54573a2 100644
--- a/lang/ko/errors.php
+++ b/lang/ko/errors.php
@@ -71,8 +71,8 @@
     'book_not_found' => '책이 없습니다.',
     'page_not_found' => '문서가 없습니다.',
     'chapter_not_found' => '챕터가 없습니다.',
-    'selected_book_not_found' => '고른 책이 없습니다.',
-    'selected_book_chapter_not_found' => '고른 책이나 챕터가 없습니다.',
+    'selected_book_not_found' => '선택된 책이 없습니다.',
+    'selected_book_chapter_not_found' => '선택된 책이나 챕터가 없습니다',
     'guests_cannot_save_drafts' => 'Guest는 초안 문서를 보관할 수 없습니다.',
 
     // Users
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIP 파일을 읽을 수 없습니다.',
     'import_zip_cant_decode_data' => 'ZIP data.json 콘텐츠를 찾아서 디코딩할 수 없습니다.',
     'import_zip_no_data' => '컨텐츠 ZIP 파일 데이터에 데이터가 비어있습니다.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => '컨텐츠 ZIP 파일을 가져오려다 실패했습니다. 이유:',
     'import_zip_failed_notification' => '컨텐츠 ZIP 파일을 가져오지 못했습니다.',
     'import_perms_books' => '책을 만드는 데 필요한 권한이 없습니다.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'API 토큰이 제공한 암호에 문제가 있습니다.',
     'api_user_no_api_permission' => 'API 토큰의 소유자가 API를 호출할 권한이 없습니다.',
     'api_user_token_expired' => '인증 토큰이 만료되었습니다.',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => '메일을 발송하는 도중 문제가 생겼습니다:',
diff --git a/lang/ko/notifications.php b/lang/ko/notifications.php
index b337fa86de2..a5abcf0f9ff 100644
--- a/lang/ko/notifications.php
+++ b/lang/ko/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => '페이지 업데이트됨: :pageName',
     'updated_page_intro' => ':appName: 에서 페이지가 업데이트되었습니다:',
     'updated_page_debounce' => '알림이 한꺼번에 몰리는 것을 방지하기 위해 당분간 동일한 편집자가 이 페이지를 추가로 편집할 경우 알림이 전송되지 않습니다.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => '페이지 이름:',
     'detail_page_path' => '페이지 경로:',
diff --git a/lang/ko/preferences.php b/lang/ko/preferences.php
index 79692f564c3..c20c5b91b37 100644
--- a/lang/ko/preferences.php
+++ b/lang/ko/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => '단축키 설정이 수정되었습니다!',
     'shortcuts_overview_desc' => '시스템 사용자 인터페이스를 탐색하는 데 사용할 수 있는 키보드 단축키를 관리합니다.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => '알림 환경설정',
     'notifications_desc' => '시스템 내에서 특정 활동이 수행될 때 수신하는 이메일 알림을 제어합니다.',
     'notifications_opt_own_page_changes' => '내가 소유한 페이지가 변경되면 알림 받기',
     'notifications_opt_own_page_comments' => '내가 소유한 페이지에 댓글이 달렸을 때 알림 받기',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => '내 댓글에 대한 답글 알림 받기',
     'notifications_save' => '환경설정 저장',
     'notifications_update_success' => '알림 환경설정이 업데이트되었습니다!',
diff --git a/lang/ko/settings.php b/lang/ko/settings.php
index 797c12043a1..1ec77377e50 100644
--- a/lang/ko/settings.php
+++ b/lang/ko/settings.php
@@ -18,13 +18,13 @@
     'app_name' => '애플리케이션 이름 (사이트 제목)',
     'app_name_desc' => '이 이름은 헤더와 시스템에서 보낸 모든 이메일에 표시됩니다.',
     'app_name_header' => '헤더에 이름 표시',
-    'app_public_access' => '사이트 공개',
-    'app_public_access_desc' => '이 옵션을 활성화하면 로그인하지 않은 방문자도 이 서버의 콘텐츠에 액세스할 수 있습니다.',
+    'app_public_access' => '공개 접근',
+    'app_public_access_desc' => '이 옵션을 활성화하면 로그인하지 않은 방문자가 BookStack 인스턴스의 내용에 접근할 수 있습니다.',
     'app_public_access_desc_guest' => '일반 방문자의 액세스는 "Guest" 사용자를 통해 제어할 수 있습니다.',
     'app_public_access_toggle' => '공개 액세스 허용',
     'app_public_viewing' => '공개 열람을 허용할까요?',
-    'app_secure_images' => '보안 강화된 이미지 업로드',
-    'app_secure_images_toggle' => '보안 강화된 이미지 업로드 사용',
+    'app_secure_images' => '보안을 강화하여 이미지 올려두기',
+    'app_secure_images_toggle' => '보안을 강화하여 이미지 올려두기 활성화',
     'app_secure_images_desc' => '성능상의 이유로 모든 이미지는 공개됩니다. 이 옵션은 이미지 URL 앞에 추측하기 어려운 임의의 문자열을 추가합니다. 쉽게 액세스할 수 없도록 디렉토리 인덱스가 활성화되어 있지 않은지 확인하세요.',
     'app_default_editor' => '기본 페이지 편집기',
     'app_default_editor_desc' => '새 페이지를 편집할 때 기본으로 사용될 편집기를 선택합니다. 권한을 갖고 있다면 페이지마다 다르게 적용될 수 있습니다.',
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => '차단한 도메인 없음',
 
     // Sorting Settings
-    'sorting' => '정렬',
-    'sorting_book_default' => '기본 책 정렬',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => '새로운 책에 적용할 기본 정렬 규칙을 선택하세요. 이 선택은 기존 책에는 영향을 주지 않고, 기존 책의 설정은 책마다 변경할 수 있습니다.',
     'sorting_rules' => '정렬 규칙',
     'sorting_rules_desc' => '현재 시스템에 미리 정의된 정렬 규칙의 목록입니다.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => '수정일',
     'sort_rule_op_chapters_first' => '챕터 우선 정렬',
     'sort_rule_op_chapters_last' => '챕터 나중 정렬',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => '유지관리',
@@ -155,7 +157,7 @@
     'audit_event_filter_no_filter' => '필터 없음',
     'audit_deleted_item' => '삭제한 항목',
     'audit_deleted_item_name' => '이름: :name',
-    'audit_table_user' => '사용자',
+    'audit_table_user' => '이용자',
     'audit_table_event' => '이벤트',
     'audit_table_related' => '관련 항목 또는 세부 사항',
     'audit_table_ip' => 'IP 주소',
@@ -165,7 +167,7 @@
 
     // Role Settings
     'roles' => '역할',
-    'role_user_roles' => '사용자 역할',
+    'role_user_roles' => '이용자 역할',
     'roles_index_desc' => '역할은 사용자를 그룹화하고 구성원에게 시스템 권한을 제공하기 위해 사용됩니다. 사용자가 여러 역할의 구성원인 경우 부여된 권한이 중첩되며 모든 권한을 상속받게 됩니다.',
     'roles_x_users_assigned' => ':count 명의 사용자가 할당됨|:count 명의 사용자가 할당됨',
     'roles_x_permissions_provided' => ':count 개의 권한|:count 개의 권한',
@@ -184,7 +186,7 @@
     'role_mfa_enforced' => '다중 인증 필요',
     'role_external_auth_id' => '외부 인증 계정',
     'role_system' => '시스템 권한',
-    'role_manage_users' => '사용자 관리',
+    'role_manage_users' => '이용자 관리하기',
     'role_manage_roles' => '권한 관리',
     'role_manage_entity_permissions' => '문서별 권한 관리',
     'role_manage_own_entity_permissions' => '직접 만든 문서별 권한 관리',
@@ -195,14 +197,18 @@
     'role_import_content' => '내용 가져오기',
     'role_editor_change' => '페이지 편집기 변경',
     'role_notifications' => '알림 수신 및 관리',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => '권한 항목',
     'roles_system_warning' => '위 세 권한은 자신의 권한이나 다른 유저의 권한을 바꿀 수 있습니다.',
     'role_asset_desc' => '책, 챕터, 문서별 권한은 이 설정에 우선합니다.',
     'role_asset_admins' => '관리자 권한은 어디든 접근할 수 있지만 이 설정은 사용자 인터페이스에서 해당 활동을 표시할지 결정합니다.',
     'role_asset_image_view_note' => '이는 이미지 관리자 내 가시성과 관련이 있습니다. 업로드된 이미지 파일의 실제 접근은 시스템의 이미지 저장 설정에 따라 달라집니다.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => '모든 항목',
     'role_own' => '직접 만든 항목',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => '저마다 다름',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => '저장',
     'role_users' => '이 역할을 가진 사용자들',
     'role_users_none' => '역할이 부여된 사용자가 없습니다.',
@@ -213,7 +219,7 @@
     'user_profile' => '사용자 프로필',
     'users_add_new' => '사용자 만들기',
     'users_search' => '사용자 검색',
-    'users_latest_activity' => '마지막 활동',
+    'users_latest_activity' => '최근 활동',
     'users_details' => '사용자 정보',
     'users_details_desc' => '메일 주소로 로그인합니다.',
     'users_details_desc_no_email' => '사용자 이름을 바꿉니다.',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => '추가 보안 계층으로 다중 인증을 설정합니다.',
     'users_mfa_x_methods' => ':count 설정함|:count 설정함',
     'users_mfa_configure' => '설정',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'API 토큰 만들기',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ko/validation.php b/lang/ko/validation.php
index ef7361ff9ac..a2940b8d2fc 100644
--- a/lang/ko/validation.php
+++ b/lang/ko/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute(을)를 문자, 숫자로만 구성하세요.',
     'array'                => ':attribute(을)를 배열로 구성하세요.',
     'backup_codes'         => '유효하지 않거나 사용 중인 코드입니다.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute(을)를 :date 전으로 설정하세요.',
     'between'              => [
         'numeric' => ':attribute(을)를 :min~:max(으)로 구성하세요.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute(을)를 true나 false로만 구성하세요.',
     'confirmed'            => ':attribute(와)과 다릅니다.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute(을)를 유효한 날짜로 구성하세요.',
     'date_format'          => ':attribute(은)는 :format(와)과 다릅니다.',
     'different'            => ':attribute(와)과 :other(을)를 다르게 구성하세요.',
@@ -106,6 +108,7 @@
     'uploaded'             => '파일 크기가 서버에서 허용하는 수치를 넘습니다.',
 
     'zip_file' => ':attribute은(는) 컨텐츠 ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => ':attribute은(는)  :validTypes, found :foundType 유형의 파일을 참조해야 합니다.',
     'zip_model_expected' => '데이터 객체가 필요하지만 ":type" 타입이 발견되었습니다.',
     'zip_unique' => ':attribute은(는) 컨텐츠 ZIP 파일 내의 객체 유형에 대해 고유해야 합니다.',
diff --git a/lang/ku/activities.php b/lang/ku/activities.php
index 4362fc02958..e9344a3d477 100644
--- a/lang/ku/activities.php
+++ b/lang/ku/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/ku/auth.php b/lang/ku/auth.php
index 369e06f93ed..4a3e47bf6e2 100644
--- a/lang/ku/auth.php
+++ b/lang/ku/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'ئەم بەکارهێنەرە نەدۆزرایەوە.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Sign up',
@@ -20,6 +21,9 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirm Password',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Forgot Password?',
diff --git a/lang/ku/common.php b/lang/ku/common.php
index 8d799d028bc..75fa41826e9 100644
--- a/lang/ku/common.php
+++ b/lang/ku/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'هیچ',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'پەرەی سەرەكی',
diff --git a/lang/ku/entities.php b/lang/ku/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/ku/entities.php
+++ b/lang/ku/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/ku/errors.php b/lang/ku/errors.php
index 9d738379648..20537d59f0c 100644
--- a/lang/ku/errors.php
+++ b/lang/ku/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/ku/notifications.php b/lang/ku/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/ku/notifications.php
+++ b/lang/ku/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/ku/preferences.php b/lang/ku/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/ku/preferences.php
+++ b/lang/ku/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/ku/settings.php b/lang/ku/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/ku/settings.php
+++ b/lang/ku/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ku/validation.php b/lang/ku/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/ku/validation.php
+++ b/lang/ku/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/lt/activities.php b/lang/lt/activities.php
index a808171bb6d..0d08d41ead4 100644
--- a/lang/lt/activities.php
+++ b/lang/lt/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/lt/auth.php b/lang/lt/auth.php
index a2f7f466846..e84c47bcb50 100644
--- a/lang/lt/auth.php
+++ b/lang/lt/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Šie įgaliojimai neatitinka mūsų įrašų.',
     'throttle' => 'Per daug prisijungimo bandymų. Prašome pabandyti dar kartą po :seconds sekundžių.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Užsiregistruoti',
@@ -20,6 +21,9 @@
     'username' => 'Vartotojo vardas',
     'email' => 'Elektroninis paštas',
     'password' => 'Slaptažodis',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Patvirtinti slaptažodį',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Pamiršote slaptažodį?',
diff --git a/lang/lt/common.php b/lang/lt/common.php
index bbafc347c59..c4c5ed9c400 100644
--- a/lang/lt/common.php
+++ b/lang/lt/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/lt/editor.php b/lang/lt/editor.php
index 0d250e9a7bd..0541908195c 100644
--- a/lang/lt/editor.php
+++ b/lang/lt/editor.php
@@ -37,7 +37,7 @@
     'blockquote' => 'Blockquote',
     'inline_code' => 'Inline code',
     'callouts' => 'Callouts',
-    'callout_information' => 'Information',
+    'callout_information' => 'Informacija',
     'callout_success' => 'Success',
     'callout_warning' => 'Warning',
     'callout_danger' => 'Danger',
@@ -61,7 +61,7 @@
     'list_task' => 'Task list',
     'indent_increase' => 'Increase indent',
     'indent_decrease' => 'Decrease indent',
-    'table' => 'Table',
+    'table' => 'Lentelė',
     'insert_image' => 'Insert image',
     'insert_image_title' => 'Insert/Edit Image',
     'insert_link' => 'Insert/edit link',
@@ -150,11 +150,11 @@
     'text_to_display' => 'Text to display',
     'title' => 'Title',
     'browse_links' => 'Browse links',
-    'open_link' => 'Open link',
-    'open_link_in' => 'Open link in...',
+    'open_link' => 'Atverti nuorodą',
+    'open_link_in' => 'Atverti nuorodą...',
     'open_link_current' => 'Current window',
-    'open_link_new' => 'New window',
-    'remove_link' => 'Remove link',
+    'open_link_new' => 'Naujame lange',
+    'remove_link' => 'Pašalinti nuorodą',
     'insert_collapsible' => 'Insert collapsible block',
     'collapsible_unwrap' => 'Unwrap',
     'edit_label' => 'Edit label',
@@ -163,14 +163,14 @@
     'toggle_label' => 'Toggle label',
 
     // About view
-    'about' => 'About the editor',
-    'about_title' => 'About the WYSIWYG Editor',
+    'about' => 'Apie redaktorių',
+    'about_title' => 'Apie WYSIWYG redaktorių',
     'editor_license' => 'Editor License & Copyright',
     'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
     'editor_lexical_license_link' => 'Full license details can be found here.',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under the MIT license.',
     'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.',
-    'save_continue' => 'Save Page & Continue',
+    'save_continue' => 'Išsaugoti puslapį ir tęsti',
     'callouts_cycle' => '(Keep pressing to toggle through types)',
     'link_selector' => 'Link to content',
     'shortcuts' => 'Shortcuts',
diff --git a/lang/lt/entities.php b/lang/lt/entities.php
index 5624567811f..6bf86635aca 100644
--- a/lang/lt/entities.php
+++ b/lang/lt/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Rūšiuoti knygą :bookName',
     'books_sort_name' => 'Rūšiuoti pagal vardą',
     'books_sort_created' => 'Rūšiuoti pagal sukūrimo datą',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Puslapio žymos',
     'chapter_tags' => 'Skyriaus žymos',
     'book_tags' => 'Knygos žymos',
@@ -416,7 +420,7 @@
     'comment_jump_to_thread' => 'Jump to thread',
     'comment_delete_confirm' => 'Esate tikri, kad norite ištrinti šį komentarą?',
     'comment_in_reply_to' => 'Atsakydamas į :commentId',
-    'comment_reference' => 'Reference',
+    'comment_reference' => 'Nuoroda',
     'comment_reference_outdated' => '(Outdated)',
     'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
 
@@ -446,7 +450,7 @@
     'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
 
     // References
-    'references' => 'References',
+    'references' => 'Nuorodos',
     'references_none' => 'There are no tracked references to this item.',
     'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
 
diff --git a/lang/lt/errors.php b/lang/lt/errors.php
index 392e99a5192..c962c27f2f5 100644
--- a/lang/lt/errors.php
+++ b/lang/lt/errors.php
@@ -23,7 +23,7 @@
     'saml_no_email_address' => 'Nerandamas šio naudotojo elektroninio pašto adresas išorinės autentifikavimo sistemos pateiktuose duomenyse',
     'saml_invalid_response_id' => 'Prašymas iš išorinės autentifikavimo sistemos nėra atpažintas proceso, kurį pradėjo ši programa. Naršymas po prisijungimo gali sukelti šią problemą.',
     'saml_fail_authed' => 'Prisijungimas, naudojant :system nepavyko, sistema nepateikė sėkmingo leidimo.',
-    'oidc_already_logged_in' => 'Already logged in',
+    'oidc_already_logged_in' => 'Jau prisijungta',
     'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
     'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
     'social_no_action_defined' => 'Neapibrėžtas joks veiksmas',
@@ -97,7 +97,7 @@
     '404_page_not_found' => 'Puslapis nerastas',
     'sorry_page_not_found' => 'Atleiskite, puslapis, kurio ieškote, nerastas.',
     'sorry_page_not_found_permission_warning' => 'Jei tikėjotės, kad šis puslapis egzistuoja, galbūt neturite leidimo jo peržiūrėti.',
-    'image_not_found' => 'Image Not Found',
+    'image_not_found' => 'Paveikslėlis nerastas',
     'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
     'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
     'return_home' => 'Grįžti į namus',
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Pateiktas panaudoto API žetono slėpinys yra neteisingas',
     'api_user_no_api_permission' => 'API prieigos rakto savininkas neturi leidimo daryti API skambučius',
     'api_user_token_expired' => 'Prieigos rakto naudojimas baigė galioti',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Siunčiant bandymo email: įvyko klaida',
diff --git a/lang/lt/notifications.php b/lang/lt/notifications.php
index 1afd23f1dc4..5f938c3970b 100644
--- a/lang/lt/notifications.php
+++ b/lang/lt/notifications.php
@@ -6,21 +6,23 @@
 
     'new_comment_subject' => 'New comment on page: :pageName',
     'new_comment_intro' => 'A user has commented on a page in :appName:',
-    'new_page_subject' => 'New page: :pageName',
+    'new_page_subject' => 'Naujas puslapis: :pageName',
     'new_page_intro' => 'A new page has been created in :appName:',
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
-    'detail_page_name' => 'Page Name:',
+    'detail_page_name' => 'Puslapio pavadinimas:',
     'detail_page_path' => 'Page Path:',
     'detail_commenter' => 'Commenter:',
-    'detail_comment' => 'Comment:',
-    'detail_created_by' => 'Created By:',
-    'detail_updated_by' => 'Updated By:',
+    'detail_comment' => 'Komentaras:',
+    'detail_created_by' => 'Sukurta:',
+    'detail_updated_by' => 'Atnaujinta:',
 
     'action_view_comment' => 'View Comment',
-    'action_view_page' => 'View Page',
+    'action_view_page' => 'Peržiūrėti puslapį',
 
     'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
     'footer_reason_link' => 'your notification preferences',
diff --git a/lang/lt/passwords.php b/lang/lt/passwords.php
index 672620d352b..e661c020fa3 100644
--- a/lang/lt/passwords.php
+++ b/lang/lt/passwords.php
@@ -7,9 +7,9 @@
 return [
 
     'password' => 'Slaptažodis privalo būti mažiausiai aštuonių simbolių ir atitikti patvirtinimą.',
-    'user' => "We can't find a user with that e-mail address.",
+    'user' => "Nerastas vartotojas pagal šį el. pašto adresą.",
     'token' => 'Slaptažodžio nustatymo raktas yra neteisingas šiam elektroninio pašto adresui.',
-    'sent' => 'Elektroniu paštu jums atsiuntėme slaptažodžio atkūrimo nuorodą!',
+    'sent' => 'Elektroniniu paštu Jums išsiųsta slaptažodžio atkūrimo nuoroda!',
     'reset' => 'Jūsų slaptažodis buvo atkurtas!',
 
 ];
diff --git a/lang/lt/preferences.php b/lang/lt/preferences.php
index 5c38d191c0b..2d1e9391700 100644
--- a/lang/lt/preferences.php
+++ b/lang/lt/preferences.php
@@ -19,12 +19,34 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
+    'notifications_save' => 'Išsaugoti nuostatas',
     'notifications_update_success' => 'Notification preferences have been updated!',
     'notifications_watched' => 'Watched & Ignored Items',
     'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
diff --git a/lang/lt/settings.php b/lang/lt/settings.php
index 563038bf267..c368902a74b 100644
--- a/lang/lt/settings.php
+++ b/lang/lt/settings.php
@@ -9,8 +9,8 @@
     // Common Messages
     'settings' => 'Nustatymai',
     'settings_save' => 'Išsaugoti nustatymus',
-    'system_version' => 'System Version',
-    'categories' => 'Categories',
+    'system_version' => 'Sistemos versija',
+    'categories' => 'Kategorijos',
 
     // App Settings
     'app_customization' => 'Tinkinimas',
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nėra jokių apribojimų',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Priežiūra',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Nuosavybės leidimai',
     'roles_system_warning' => 'Būkite sąmoningi, kad prieiga prie bet kurio iš trijų leidimų viršuje gali leisti naudotojui pakeisti jų pačių privilegijas arba kitų privilegijas sistemoje. Paskirkite vaidmenis su šiais leidimais tik patikimiems naudotojams.',
     'role_asset_desc' => 'Šie leidimai kontroliuoja numatytą prieigą į nuosavybę, esančią sistemoje. Knygų, skyrių ir puslapių leidimai nepaisys šių leidimų.',
     'role_asset_admins' => 'Administratoriams automatiškai yra suteikiama prieiga prie viso turinio, tačiau šie pasirinkimai gali rodyti arba slėpti vartotojo sąsajos parinktis.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Visi',
     'role_own' => 'Nuosavi',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontroliuojami nuosavybės, į kurią yra įkelti',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Išsaugoti vaidmenį',
     'role_users' => 'Naudotojai šiame vaidmenyje',
     'role_users_none' => 'Šiuo metu prie šio vaidmens nėra priskirta naudotojų',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Sukurti API sąsajos prieigos raktą',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/lt/validation.php b/lang/lt/validation.php
index 92de23004aa..d2188f40489 100644
--- a/lang/lt/validation.php
+++ b/lang/lt/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute turi būti sudarytas tik iš raidžių ir skaičių.',
     'array'                => ':attribute turi būti masyvas.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute turi būti data anksčiau negu :date.',
     'between'              => [
         'numeric' => ':attribute turi būti tarp :min ir :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute laukas turi būti tiesa arba melas.',
     'confirmed'            => ':attribute patvirtinimas nesutampa.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nėra tinkama data.',
     'date_format'          => ':attribute neatitinka formato :format.',
     'different'            => ':attribute ir :other turi būti skirtingi.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Šis failas negali būti įkeltas. Serveris gali nepriimti tokio dydžio failų.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/lv/activities.php b/lang/lv/activities.php
index 38d9ae21766..8f902517031 100644
--- a/lang/lv/activities.php
+++ b/lang/lv/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Lietotājs veiksmīgi atjaunināts',
     'user_delete' => 'dzēsa lietotāju',
     'user_delete_notification' => 'Lietotājs veiksmīgi dzēsts',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'izveidoja API žetonu',
diff --git a/lang/lv/auth.php b/lang/lv/auth.php
index 71b92ac0109..625b40b36c3 100644
--- a/lang/lv/auth.php
+++ b/lang/lv/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Šie reģistrācijas dati neatbilst mūsu ierakstiem.',
     'throttle' => 'Pārāk daudz pieteikšanās mēģinājumu. Lūdzu, mēģiniet vēlreiz pēc :seconds seconds.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Reģistrēties',
@@ -20,6 +21,9 @@
     'username' => 'Lietotājvārds',
     'email' => 'E-pasts',
     'password' => 'Parole',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Apstiprināt paroli',
     'password_hint' => 'Jābūt vismaz 8 rakstzīmēm',
     'forgot_password' => 'Aizmirsta parole?',
diff --git a/lang/lv/common.php b/lang/lv/common.php
index 4917ad3d717..ca1c6aa42a7 100644
--- a/lang/lv/common.php
+++ b/lang/lv/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Neaktīvs',
     'never' => 'Nekad',
     'none' => 'Neviens',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Sākumlapa',
diff --git a/lang/lv/entities.php b/lang/lv/entities.php
index 5f921048e52..dccab4bd114 100644
--- a/lang/lv/entities.php
+++ b/lang/lv/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Kārtot grāmatu :bookName',
     'books_sort_name' => 'Kārtot pēc nosaukuma',
     'books_sort_created' => 'Kārtot pēc izveidošanas datuma',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Pārslēgt sānjoslu',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Lapas birkas',
     'chapter_tags' => 'Nodaļas birkas',
     'book_tags' => 'Grāmatas birkas',
diff --git a/lang/lv/errors.php b/lang/lv/errors.php
index 28cc0d892c1..a11b5754c9c 100644
--- a/lang/lv/errors.php
+++ b/lang/lv/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Nevarēja nolasīt ZIP failu.',
     'import_zip_cant_decode_data' => 'Nevarēja atrast un nolasīt data.json saturu ZIP failā.',
     'import_zip_no_data' => 'ZIP faila datos nav atrasts grāmatu, nodaļu vai lapu saturs.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'ZIP faila imports ir neveiksmīgs ar šādām kļūdām:',
     'import_zip_failed_notification' => 'ZIP faila imports ir neveiksmīgs.',
     'import_perms_books' => 'Jums nav nepieciešamo tiesību izveidot grāmatas.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Norādītā slepenā atslēga izmantotajam API žetonam nav pareiza',
     'api_user_no_api_permission' => 'Izmantotā API žetona īpašniekam nav tiesības veikt API izsaukumus',
     'api_user_token_expired' => 'Autorizācijas žetona derīguma termiņš ir izbeidzies',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Radusies kļūda sūtot testa epastu:',
diff --git a/lang/lv/notifications.php b/lang/lv/notifications.php
index 9fd60222a72..7233822a46f 100644
--- a/lang/lv/notifications.php
+++ b/lang/lv/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Atjaunināta lapa: :pageName',
     'updated_page_intro' => 'Lapa atjaunināta :appName:',
     'updated_page_debounce' => 'Lai novērstu pārliecīgu paziņojumu sūtīšanu, uz laiku jums tiks pārtraukti paziņojumi par turpmākiem šī lietotāja labojumiem šai lapai.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Lapas nosaukums:',
     'detail_page_path' => 'Ceļš uz lapu:',
diff --git a/lang/lv/preferences.php b/lang/lv/preferences.php
index b91cc2e0833..50bd88602f7 100644
--- a/lang/lv/preferences.php
+++ b/lang/lv/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Saīsņu uzstādījumi ir saglabāt!',
     'shortcuts_overview_desc' => 'Pārvaldīt klaviatūras īsceļus, ko var izmantot sistēmas saskarnes navigācijai.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Paziņojumu iestatījumi',
     'notifications_desc' => 'Pārvaldiet epasta paziņojumus, ko saņemsiet, kad sistēmā tiek veiktas noteiktas darbības.',
     'notifications_opt_own_page_changes' => 'Paziņot par izmaiņām manās lapās',
     'notifications_opt_own_page_comments' => 'Paziņot par komentāriem manās lapās',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Paziņot par atbildēm uz maniem komentāriem',
     'notifications_save' => 'Saglabāt iestatījumus',
     'notifications_update_success' => 'Paziņojumu iestatījumi ir atjaunoti!',
diff --git a/lang/lv/settings.php b/lang/lv/settings.php
index 9901f781190..47502cc6fca 100644
--- a/lang/lv/settings.php
+++ b/lang/lv/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nav ierobežojumu',
 
     // Sorting Settings
-    'sorting' => 'Kārtošana',
-    'sorting_book_default' => 'Noklusētā grāmatu kārtošana',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Izvēlieties noklusēto kārtošanas nosacījumu, ko pielietot jaunām grāmatām. Šis neskars jau esošas grāmatas, un to var izmainīt grāmatas iestatījumos.',
     'sorting_rules' => 'Kārtošanas noteikumi',
     'sorting_rules_desc' => 'Šīs ir iepriekš noteiktas kārtošanas darbības, ko var pielietot saturam šajā sistēmā.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Atjaunināšanas datums',
     'sort_rule_op_chapters_first' => 'Nodaļas pirmās',
     'sort_rule_op_chapters_last' => 'Nodaļas pēdējās',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Apkope',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importēt saturu',
     'role_editor_change' => 'Mainīt lapu redaktoru',
     'role_notifications' => 'Saņemt un pārvaldīt paziņojumus',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Resursa piekļuves tiesības',
     'roles_system_warning' => 'Jebkuras no trīs augstāk redzamajām atļaujām dod iespēju lietotājam mainīt savas un citu lietotāju sistēmas atļaujas. Pievieno šīs grupu atļaujas tikai tiem lietotājiem, kuriem uzticies.',
     'role_asset_desc' => 'Šīs piekļuves tiesības kontrolē noklusēto piekļuvi sistēmas resursiem. Grāmatām, nodaļām un lapām norādītās tiesības būs pārākas par šīm.',
     'role_asset_admins' => 'Administratoriem automātiski ir piekļuve visam saturam, bet šie uzstādījumi var noslēpt vai parādīt lietotāja saskarnes iespējas.',
     'role_asset_image_view_note' => 'Šis ir saistīts ar redzamību attēlu pārvaldniekā. Faktiskā piekļuve augšupielādēto attēlu failiem būs atkarīga no sistēmas attēlu glabātuves uzstādījuma.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Visi',
     'role_own' => 'Savi',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrolē resurss, uz ko tie ir augšupielādēti',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Saglabāt grupu',
     'role_users' => 'Lietotāji šajā grupā',
     'role_users_none' => 'Pagaidām neviens lietotājs nav pievienots šai grupai',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Iestati vairākfaktoru autentifikāciju kā papildus drošības līmeni tavam lietotāja kontam.',
     'users_mfa_x_methods' => ':count metode iestatīta|:count metodes iestatītas',
     'users_mfa_configure' => 'Iestatīt metodes',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Izveidot API žetonu',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/lv/validation.php b/lang/lv/validation.php
index dd318119a58..b6655386c94 100644
--- a/lang/lv/validation.php
+++ b/lang/lv/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute var saturēt tikai burtus un ciparus.',
     'array'                => ':attribute ir jābūt masīvam.',
     'backup_codes'         => 'Ievadītais kods nav derīgs vai arī jau ir izmantots.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute jābūt datumam pirms :date.',
     'between'              => [
         'numeric' => ':attribute jābūt starp :min un :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute jābūt True vai False.',
     'confirmed'            => ':attribute apstiprinājums nesakrīt.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nav derīgs datums.',
     'date_format'          => ':attribute neatbilst formātam :format.',
     'different'            => ':attribute un :other jābūt atšķirīgiem.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Fails netika ielādēts. Serveris nevar pieņemt šāda izmēra failus.',
 
     'zip_file' => ':attribute ir jāatsaucas uz failu ZIP arhīvā.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => ':attribute ir jāatsaucas uz failu ar tipu :validTypes, bet atrasts :foundType.',
     'zip_model_expected' => 'Sagaidīts datu objekts, bet atrasts ":type".',
     'zip_unique' => ':attribute jābūt unikālam šim objekta tipam ZIP arhīvā.',
diff --git a/lang/nb/activities.php b/lang/nb/activities.php
index fd4de53216e..771f5438baa 100644
--- a/lang/nb/activities.php
+++ b/lang/nb/activities.php
@@ -100,6 +100,8 @@
     'user_update_notification' => 'Brukeren ble oppdatert',
     'user_delete' => 'slettet bruker',
     'user_delete_notification' => 'Brukeren ble fjernet',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'opprettet API-nøkkel',
diff --git a/lang/nb/auth.php b/lang/nb/auth.php
index 125e6daf5d4..d880fde0e7a 100644
--- a/lang/nb/auth.php
+++ b/lang/nb/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Disse detaljene samsvarer ikke med det vi har på bok.',
     'throttle' => 'For mange forsøk, prøv igjen om :seconds sekunder.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registrer deg',
@@ -20,6 +21,9 @@
     'username' => 'Brukernavn',
     'email' => 'E-post',
     'password' => 'Passord',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Bekreft passord',
     'password_hint' => 'Må være minst 8 tegn',
     'forgot_password' => 'Glemt passord?',
diff --git a/lang/nb/common.php b/lang/nb/common.php
index 38104ba0396..bec7ed9f57e 100644
--- a/lang/nb/common.php
+++ b/lang/nb/common.php
@@ -30,8 +30,8 @@
     'create' => 'Opprett',
     'update' => 'Oppdater',
     'edit' => 'Rediger',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Arkiver',
+    'unarchive' => 'Av-arkiver',
     'sort' => 'Sortér',
     'move' => 'Flytt',
     'copy' => 'Kopier',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Aldri',
     'none' => 'Ingen',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Hjemmeside',
diff --git a/lang/nb/editor.php b/lang/nb/editor.php
index 77b01f17ba9..23a788d71ee 100644
--- a/lang/nb/editor.php
+++ b/lang/nb/editor.php
@@ -48,7 +48,7 @@
     'superscript' => 'Hevet skrift',
     'subscript' => 'Senket skrift',
     'text_color' => 'Tekstfarge',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Uthevingsfarge',
     'custom_color' => 'Egenvalgt farge',
     'remove_color' => 'Fjern farge',
     'background_color' => 'Bakgrunnsfarge',
diff --git a/lang/nb/entities.php b/lang/nb/entities.php
index 50f3847d867..0e9070e53d5 100644
--- a/lang/nb/entities.php
+++ b/lang/nb/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Dette vil slette den opplastede importen av ZIP-filen og kan ikke angres.',
     'import_errors' => 'Import feil',
     'import_errors_desc' => 'Feil oppstod under importforsøket:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Naviger relaterte sider',
+    'breadcrumb_siblings_for_chapter' => 'Naviger relaterte kapitler',
+    'breadcrumb_siblings_for_book' => 'Naviger relaterte bøker',
+    'breadcrumb_siblings_for_bookshelf' => 'Naviger relaterte hyller',
 
     // Permissions and restrictions
     'permissions' => 'Tilganger',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Flytt kapitler og sider innen en bok for å reorganisere innholdet. Andre bøker kan legges til, noe som gjør det enkelt å flytte kapitler og sider mellom bøkene. Valgfritt kan en automatisk sorteringsregel settes for å automatisk sortere innholdet i denne boken ved endringer.',
     'books_sort_auto_sort' => 'Automatisk sorteringsalternativ',
     'books_sort_auto_sort_active' => 'Automatisk sortering aktiv: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Omorganisér :bookName (bok)',
     'books_sort_name' => 'Sorter på navn',
     'books_sort_created' => 'Sorter på opprettet dato',
@@ -252,7 +253,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Urørt innhold)',
     'pages_edit_switch_to_wysiwyg' => 'Bytt til WYSIWYG tekstredigering',
     'pages_edit_switch_to_new_wysiwyg' => 'Bytt til ny WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(under Beta-testing)',
     'pages_edit_set_changelog' => 'Angi endringslogg',
     'pages_edit_enter_changelog_desc' => 'Gi en kort beskrivelse av endringene dine',
     'pages_edit_enter_changelog' => 'Se endringslogg',
@@ -272,7 +273,7 @@
     'pages_md_insert_drawing' => 'Sett inn tegning',
     'pages_md_show_preview' => 'Forhåndsvisning',
     'pages_md_sync_scroll' => 'Synkroniser forhåndsvisningsrulle',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Redigeringsverktøy for klartekst',
     'pages_drawing_unsaved' => 'Ulagret tegning funnet',
     'pages_drawing_unsaved_confirm' => 'Ulagret tegningsdata ble funnet fra en tidligere mislykket lagring. Vil du gjenopprette og fortsette å redigere denne ulagrede tegningen?',
     'pages_not_in_chapter' => 'Siden tilhører ingen kapittel',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Bytt sidestolpe',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Sidemerker',
     'chapter_tags' => 'Kapittelmerker',
     'book_tags' => 'Bokmerker',
@@ -397,11 +401,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Skriv kommentar',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Ingen kommentarer å vise',
     'comment_placeholder' => 'Skriv en kommentar her',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Kommentar Tråd|:count Kommentar Tråder',
+    'comment_archived_count' => ':count Arkivert',
+    'comment_archived_threads' => 'Arkiverte tråder',
     'comment_save' => 'Publiser kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterte :createDiff',
@@ -410,14 +414,14 @@
     'comment_deleted_success' => 'Kommentar fjernet',
     'comment_created_success' => 'Kommentar skrevet',
     'comment_updated_success' => 'Kommentar endret',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Kommentar arkivert',
+    'comment_unarchive_success' => 'Kommentar uarkivert',
+    'comment_view' => 'Vis kommentar',
+    'comment_jump_to_thread' => 'Gå til tråd',
     'comment_delete_confirm' => 'Er du sikker på at du vil fjerne kommentaren?',
     'comment_in_reply_to' => 'Som svar til :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referanse',
+    'comment_reference_outdated' => '(Utdatert)',
     'comment_editor_explain' => 'Her er kommentarene som er på denne siden. Kommentarer kan legges til og administreres når du ser på den lagrede siden.',
 
     // Revision
diff --git a/lang/nb/errors.php b/lang/nb/errors.php
index 400681b10d1..111a20418cd 100644
--- a/lang/nb/errors.php
+++ b/lang/nb/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Kunne ikke lese ZIP-filen.',
     'import_zip_cant_decode_data' => 'Kunne ikke finne og dekode ZIP data.json innhold.',
     'import_zip_no_data' => 'ZIP-fildata har ingen forventet bok, kapittel eller sideinnhold.',
+    'import_zip_data_too_large' => 'ZIP data.json innholdet overskrider maksimal filstørrelse for opplasting.',
     'import_validation_failed' => 'Import av ZIP feilet i å validere med feil:',
     'import_zip_failed_notification' => 'Kunne ikke importere ZIP-fil.',
     'import_perms_books' => 'Du mangler nødvendige tillatelser for å lage bøker.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Hemmeligheten som er gitt for det gitte brukte API-tokenet er feil',
     'api_user_no_api_permission' => 'Eieren av det brukte API-tokenet har ikke tillatelse til å ringe API-samtaler',
     'api_user_token_expired' => 'Autorisasjonstokenet som er brukt, har utløpt',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Feil kastet når du sendte en test-e-post:',
diff --git a/lang/nb/notifications.php b/lang/nb/notifications.php
index bb46e09dbe8..47dc34a7150 100644
--- a/lang/nb/notifications.php
+++ b/lang/nb/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Oppdatert side: :pageName',
     'updated_page_intro' => 'En side er oppdatert i :appName:',
     'updated_page_debounce' => 'For å forhindre mange varslinger, vil du ikke få nye varslinger for endringer på denne siden fra samme forfatter.',
+    'comment_mention_subject' => 'Du har blitt nevnt i en kommentar på siden: :pageName',
+    'comment_mention_intro' => 'Du har blitt nevnt i en kommentar på :appName:',
 
     'detail_page_name' => 'Sidenavn:',
     'detail_page_path' => 'Side bane:',
diff --git a/lang/nb/preferences.php b/lang/nb/preferences.php
index 245c9c954f1..6d6acc5ccf7 100644
--- a/lang/nb/preferences.php
+++ b/lang/nb/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Snarvei innstillinger er oppdatert!',
     'shortcuts_overview_desc' => 'Behandle tastatursnarveier du kan bruke for å navigere i systembrukergrensesnittet.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Innstillinger for varsling',
     'notifications_desc' => 'Kontroller e-postvarslene du mottar når en bestemt aktivitet utføres i systemet.',
     'notifications_opt_own_page_changes' => 'Varsle ved endringer til sider jeg eier',
     'notifications_opt_own_page_comments' => 'Varsle om kommentarer på sider jeg eier',
+    'notifications_opt_comment_mentions' => 'Varsle når jeg blir nevnt i en kommentar',
     'notifications_opt_comment_replies' => 'Varsle ved svar på mine kommentarer',
     'notifications_save' => 'Lagre innstillinger',
     'notifications_update_success' => 'Varslingsinnstillingene er oppdatert!',
diff --git a/lang/nb/settings.php b/lang/nb/settings.php
index 68bab6f3038..0366955022c 100644
--- a/lang/nb/settings.php
+++ b/lang/nb/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begrensninger er satt',
 
     // Sorting Settings
-    'sorting' => 'Sortering',
-    'sorting_book_default' => 'Standard boksortering',
+    'sorting' => 'Lister & Sortering',
+    'sorting_book_default' => 'Standard regel for boksortering',
     'sorting_book_default_desc' => 'Velg standard sorteringsregelen som skal brukes for nye bøker. Dette vil ikke påvirke eksisterende bøker, og kan overstyres per bok.',
     'sorting_rules' => 'Sorteringsregler',
     'sorting_rules_desc' => 'Dette er forhåndsdefinerte sorteringsoperasjoner som kan brukes på innhold i systemet.',
@@ -91,18 +91,20 @@
     'sort_rule_details_desc' => 'Angi et navn for denne sorteringsregelen, som vil vises i lister når brukerne velger en sorteringsmetode.',
     'sort_rule_operations' => 'Sorteringsoperasjoner',
     'sort_rule_operations_desc' => 'Konfigurer sorteringshandlinger ved å flytte dem fra listen over tilgjengelige operasjoner. Ved bruk vil operasjonene bli brukt i rekkefølge, fra topp til bunn. Eventuelle endringer gjort her vil bli brukt for alle tildelte bøker når du lagrer.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
+    'sort_rule_available_operations' => 'Tilgjengelige operasjoner',
+    'sort_rule_available_operations_empty' => 'Ingen gjenværende operasjoner',
+    'sort_rule_configured_operations' => 'Konfigurerte operasjoner',
     'sort_rule_configured_operations_empty' => 'Dra/legg til operasjoner fra listen "Tilgjengelige operasjoner"',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_op_asc' => '(Stigende)',
+    'sort_rule_op_desc' => '(Synkende)',
     'sort_rule_op_name' => 'Navn - Alfabetisk',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
+    'sort_rule_op_name_numeric' => 'Navn - Numerisk',
+    'sort_rule_op_created_date' => 'Dato opprettet',
+    'sort_rule_op_updated_date' => 'Dato oppdatert',
     'sort_rule_op_chapters_first' => 'Kapitler først',
     'sort_rule_op_chapters_last' => 'Kapitler sist',
+    'sorting_page_limits' => 'Visningsgrenser for hver side',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Vedlikehold',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import innhold',
     'role_editor_change' => 'Endre sideredigering',
     'role_notifications' => 'Motta og administrere varslinger',
+    'role_permission_note_users_and_roles' => 'Disse tillatelsene vil teknisk sett også gi mulighet til å se & søke etter brukere & roller i systemet.',
     'role_asset' => 'Eiendomstillatelser',
     'roles_system_warning' => 'Vær oppmerksom på at tilgang til noen av de ovennevnte tre tillatelsene kan tillate en bruker å endre sine egne rettigheter eller rettighetene til andre i systemet. Bare tildel roller med disse tillatelsene til pålitelige brukere.',
     'role_asset_desc' => 'Disse tillatelsene kontrollerer standard tilgang til eiendelene i systemet. Tillatelser til bøker, kapitler og sider overstyrer disse tillatelsene.',
     'role_asset_admins' => 'Administratorer får automatisk tilgang til alt innhold, men disse alternativene kan vise eller skjule UI-alternativer.',
     'role_asset_image_view_note' => 'Dette gjelder synlighet innenfor bilde-administrasjonen. Faktisk tilgang på opplastede bildefiler vil være avhengig av valget for systemlagring av bildet.',
+    'role_asset_users_note' => 'Disse tillatelsene vil teknisk sett også gi mulighet til å se & søke etter brukere i systemet.',
     'role_all' => 'Alle',
     'role_own' => 'Egne',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrollert av eiendelen de er lastet opp til',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Lagre rolle',
     'role_users' => 'Kontoholdere med denne rollen',
     'role_users_none' => 'Ingen kontoholdere er gitt denne rollen',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Konfigurer flerfaktorautentisering som et ekstra lag med sikkerhet for din konto.',
     'users_mfa_x_methods' => ':count metode konfigurert|:count metoder konfigurert',
     'users_mfa_configure' => 'Konfigurer metoder',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Opprett API-nøkkel',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/nb/validation.php b/lang/nb/validation.php
index a156da8f705..b5dc51f37de 100644
--- a/lang/nb/validation.php
+++ b/lang/nb/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute kan kun inneholde bokstaver og tall.',
     'array'                => ':attribute må være en liste.',
     'backup_codes'         => 'Den angitte koden er ikke gyldig, eller er allerede benyttet.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute må være en dato før :date.',
     'between'              => [
         'numeric' => ':attribute må være mellom :min og :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute feltet kan bare være sann eller falsk.',
     'confirmed'            => ':attribute bekreftelsen samsvarer ikke.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute er ikke en gyldig dato.',
     'date_format'          => ':attribute samsvarer ikke med :format.',
     'different'            => ':attribute og :other må være forskjellige.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'kunne ikke lastes opp, tjeneren støtter ikke filer av denne størrelsen.',
 
     'zip_file' => 'Attributtet :attribute må henvises til en fil i ZIP.',
+    'zip_file_size' => 'Filen :attribute må ikke overstige :size MB.',
     'zip_file_mime' => 'Attributtet :attribute må referere en fil av typen :validTypes, som ble funnet :foundType.',
     'zip_model_expected' => 'Data objekt forventet, men ":type" funnet.',
     'zip_unique' => 'Attributtet :attribute må være unikt for objekttypen i ZIP.',
diff --git a/lang/ne/activities.php b/lang/ne/activities.php
index 4b4edf7be3a..24c2b948a4b 100644
--- a/lang/ne/activities.php
+++ b/lang/ne/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'प्रयोगकर्ता सफलतापूर्वक अद्यावधिक गरियो',
     'user_delete' => 'प्रयोगकर्ता हटाइयो',
     'user_delete_notification' => 'प्रयोगकर्ता सफलतापूर्वक हटाइयो',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'API टोकन सिर्जना गरियो',
diff --git a/lang/ne/auth.php b/lang/ne/auth.php
index cd875a226cb..d2c5cc7d13f 100644
--- a/lang/ne/auth.php
+++ b/lang/ne/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'यी प्रमाणिकरण जानकारी हाम्रो अभिलेखसँग मेल खाँदैन।',
     'throttle' => 'लगइन प्रयासहरूको संख्या धेरै भएको छ। कृपया :seconds सेकेन्ड पछि पुनः प्रयास गर्नुहोस्।',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'साइन अप गर्नुहोस्',
@@ -20,6 +21,9 @@
     'username' => 'प्रयोगकर्ता नाम',
     'email' => 'ईमेल',
     'password' => 'पासवर्ड',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'पासवर्ड पक्का गर्नुहोस्',
     'password_hint' => 'कम्तिमा 8 अङ्कको हुनुपर्छ',
     'forgot_password' => 'पासवर्ड भुल्नुभयो?',
diff --git a/lang/ne/common.php b/lang/ne/common.php
index 696ddc6b4dc..762de6c1057 100644
--- a/lang/ne/common.php
+++ b/lang/ne/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'निष्क्रिय',
     'never' => 'कहिल्यै होइन',
     'none' => 'कुनै पनि होइन',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'गृहपृष्ठ',
diff --git a/lang/ne/entities.php b/lang/ne/entities.php
index 88b202deed3..f51c265c576 100644
--- a/lang/ne/entities.php
+++ b/lang/ne/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'पुस्तकमा अध्यायहरू र पृष्ठहरूलाई पुनः व्यवस्थित गर्नका लागि सार्नुहोस्। अन्य पुस्तकहरू थप्न सकिन्छ जसले अध्याय र पृष्ठहरूलाई पुस्तकहरू बीच सजिलै सर्न मद्दत गर्दछ। वैकल्पिक रूपमा एक स्वचालित वर्गीकरण नियम सेट गर्न सकिन्छ जसले पुस्तकको सामग्रीहरू परिवर्तन भएपछि स्वत: वर्गीकृत गर्छ।',
     'books_sort_auto_sort' => 'स्वचालित वर्गीकरण विकल्प',
     'books_sort_auto_sort_active' => 'स्वचालित वर्गीकरण सक्रिय: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'पुस्तक :bookName को वर्गीकरण गर्नुहोस्',
     'books_sort_name' => 'नाम अनुसार वर्गीकृत गर्नुहोस्',
     'books_sort_created' => 'सिर्जना मितिअनुसार वर्गीकृत गर्नुहोस्',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'साइडबार टगल गर्नुहोस्',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'पाना ट्यागहरू',
     'chapter_tags' => 'अध्याय ट्यागहरू',
     'book_tags' => 'पुस्तक ट्यागहरू',
diff --git a/lang/ne/errors.php b/lang/ne/errors.php
index 79ee27c78d1..d221f610434 100644
--- a/lang/ne/errors.php
+++ b/lang/ne/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'ZIP फाइल पढ्न सकिएन।',
     'import_zip_cant_decode_data' => 'ZIP डाटा.json सामग्री पत्ता लाग्न र डिकोड गर्न सकिएन।',
     'import_zip_no_data' => 'ZIP फाइल डाटामा अपेक्षित पुस्तक, अध्याय वा पाना सामग्री छैन।',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'आयात ZIP प्रमाणीकरण असफल भयो। त्रुटिहरू छन्:',
     'import_zip_failed_notification' => 'ZIP फाइल आयात गर्न असफल भयो।',
     'import_perms_books' => 'तपाईंलाई पुस्तकहरू सिर्जना गर्न आवश्यक अनुमति छैन।',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'दिइएको API टोकनको लागि प्रदान गरिएको गोप्य सही छैन।',
     'api_user_no_api_permission' => 'API टोकनको मालिकसँग API कल गर्ने अनुमति छैन।',
     'api_user_token_expired' => 'प्रमाणीकरण टोकन समाप्त भइसकेको छ।',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'टेस्ट इमेल पठाउँदा त्रुटि:',
diff --git a/lang/ne/notifications.php b/lang/ne/notifications.php
index 1e9c572215a..a4eb6983262 100644
--- a/lang/ne/notifications.php
+++ b/lang/ne/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'पाना अपडेट भयो: :pageName',
     'updated_page_intro' => ':appName मा पाना अपडेट गरिएको छ',
     'updated_page_debounce' => 'धेरै सूचना नपरोस् भनेर, केही समयको लागि एउटै सम्पादकबाट हुने थप सम्पादनहरूका सूचना तपाईंलाई पठाइने छैन।',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'पानाको नाम:',
     'detail_page_path' => 'पानाको स्थान:',
diff --git a/lang/ne/preferences.php b/lang/ne/preferences.php
index 70388e8baef..578195d1138 100644
--- a/lang/ne/preferences.php
+++ b/lang/ne/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'सर्टकट प्राथमिकताहरू अपडेट गरिएका छन्!',
     'shortcuts_overview_desc' => 'प्रणाली प्रयोगकर्ता इन्टरफेसमा नेभिगेट गर्न तपाईंले प्रयोग गर्न सक्ने किबोर्ड सर्टकटहरू व्यवस्थापन गर्नुहोस्।',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'सूचना प्राथमिकताहरू',
     'notifications_desc' => 'प्रणालीमा केही क्रियाकलापहरू गर्दा तपाईंलाई प्राप्त हुने इमेल सूचनाहरू नियन्त्रण गर्नुहोस्।',
     'notifications_opt_own_page_changes' => 'मैले स्वामित्व राख्ने पृष्ठहरूमा परिवर्तन हुँदा सूचित गर्नुहोस्',
     'notifications_opt_own_page_comments' => 'मैले स्वामित्व राख्ने पृष्ठहरूमा टिप्पणी हुँदा सूचित गर्नुहोस्',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'मेरो टिप्पणीहरूमा उत्तर आएको बेला सूचित गर्नुहोस्',
     'notifications_save' => 'प्राथमिकताहरू बचत गर्नुहोस्',
     'notifications_update_success' => 'सूचना प्राथमिकताहरू अपडेट गरिएका छन्!',
diff --git a/lang/ne/settings.php b/lang/ne/settings.php
index eb99f26bdf7..e64c70edf58 100644
--- a/lang/ne/settings.php
+++ b/lang/ne/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'कुनै प्रतिबन्ध छैन',
 
     // Sorting Settings
-    'sorting' => 'क्रमबद्धता',
-    'sorting_book_default' => 'डिफल्ट पुस्तक क्रम',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'नयाँ पुस्तकहरूमा लागु गर्न डिफल्ट क्रम नियम चयन गर्नुहोस्। यो अस्तित्वमा रहेका पुस्तकहरूमा असर पार्दैन र पुस्तक अनुसार ओभरराइड गर्न सकिन्छ।',
     'sorting_rules' => 'क्रम नियमहरू',
     'sorting_rules_desc' => 'यी पूर्वनिर्धारित क्रम सञ्चालनहरू हुन् जुन प्रणालीमा सामग्रीमा लागू गर्न सकिन्छ।',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'अपडेट मिति',
     'sort_rule_op_chapters_first' => 'पहिले अध्यायहरू',
     'sort_rule_op_chapters_last' => 'अन्त्यमा अध्यायहरू',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'सम्भार',
@@ -195,14 +197,18 @@
     'role_import_content' => 'सामग्री आयात गर्नुहोस्',
     'role_editor_change' => 'पृष्ठ सम्पादक परिवर्तन गर्नुहोस्',
     'role_notifications' => 'सूचनाहरू प्राप्त र व्यवस्थापन गर्नुहोस्',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'संपत्ति अनुमति',
     'roles_system_warning' => 'माथिका कुनै पनि तीन अनुमति प्रयोगकर्ताले आफैं वा अरूका अधिकार परिवर्तन गर्न सक्छन्। यी अनुमति भएको भूमिका मात्र भरपर्दो प्रयोगकर्तालाई दिनुहोस्।',
     'role_asset_desc' => 'यी अनुमतिले प्रणालीभित्र सम्पत्तिमा डिफल्ट पहुँच नियन्त्रण गर्छ। पुस्तक, अध्याय र पृष्ठमा अनुमति यी भन्दा प्राथमिक हुन्छ।',
     'role_asset_admins' => 'प्रशासनकर्ताहरूलाई सबै सामग्रीमा स्वतः पहुँच दिइन्छ, यी विकल्पहरूले UI मा देखिने वा लुकेका विकल्पहरू मात्र प्रभाव पार्न सक्छ।',
     'role_asset_image_view_note' => 'यो छवि व्यवस्थापक भित्रको दृश्यता सम्बन्धि हो। अपलोड गरिएको छविमा वास्तविक पहुँच प्रणालीको छवि भण्डारण विकल्प अनुसार हुन्छ।',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'सबै',
     'role_own' => 'आफ्नो',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'अपलोड गरिएको सम्पत्तिले नियन्त्रण गरेको',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'भूमिका सुरक्षित गर्नुहोस्',
     'role_users' => 'यस भूमिकाका प्रयोगकर्ताहरू',
     'role_users_none' => 'यो भूमिकामा हाल कुनै प्रयोगकर्ता छैन',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'तपाईंको प्रयोगकर्ता खाताको लागि थप सुरक्षा तहको रूपमा बहु-फ्याक्टर प्रमाणीकरण सेटअप गर्नुहोस्।',
     'users_mfa_x_methods' => ':count विधि सेटअप गरिएको|:count विधिहरू सेटअप गरिएको',
     'users_mfa_configure' => 'विधिहरू सेटअप गर्नुहोस्',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'API टोकन सिर्जना गर्नुहोस्',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ne/validation.php b/lang/ne/validation.php
index f00c0f73153..69df7ca6885 100644
--- a/lang/ne/validation.php
+++ b/lang/ne/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute मा अक्षर र अंक मात्र हुनुपर्छ।',
     'array'                => ':attribute array हुनुपर्छ।',
     'backup_codes'         => 'दिइएको कोड गलत छ वा पहिल्यै प्रयोग भइसकेको छ।',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute मिति :date भन्दा पहिला हुनुपर्छ।',
     'between'              => [
         'numeric' => ':attribute :min देखि :max बीचमा हुनुपर्छ।',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute साँचो (true) वा झूटो (false) हुनुपर्छ।',
     'confirmed'            => ':attribute पुष्टि मिलेन।',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute मान्य मिति होइन।',
     'date_format'          => ':attribute ढाँचा :format सँग मेल खाँदैन।',
     'different'            => ':attribute र :other फरक हुनुपर्छ।',
@@ -106,6 +108,7 @@
     'uploaded'             => 'फाइल अपलोड हुन सकेन। सर्भरले यस्तो साइज स्वीकार नगर्न सक्छ।',
 
     'zip_file' => ':attribute ले ZIP फाइलभित्रको फाइल देखाउनु पर्छ।',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => ':attribute मा :validTypes प्रकारको फाइल हुनुपर्छ, तर :foundType भेटियो।',
     'zip_model_expected' => 'डेटा वस्तु चाहिएको थियो तर ":type" भेटियो।',
     'zip_unique' => ':attribute ZIP भित्रको वस्तु प्रकारको लागि अद्वितीय हुनुपर्छ।',
diff --git a/lang/nl/activities.php b/lang/nl/activities.php
index 230c7a58b3a..23519f9c9d7 100644
--- a/lang/nl/activities.php
+++ b/lang/nl/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Gebruiker succesvol bijgewerkt',
     'user_delete' => 'verwijderde gebruiker',
     'user_delete_notification' => 'Gebruiker succesvol verwijderd',
+    'user_mfa_reset' => 'herstel meervoudige verificatie voor gebruiker',
+    'user_mfa_reset_notification' => 'Meervoudige verificatie methodes hersteld',
 
     // API Tokens
     'api_token_create' => 'API-token aangemaakt',
diff --git a/lang/nl/auth.php b/lang/nl/auth.php
index 12c6b6c7bff..8246ff4f8ae 100644
--- a/lang/nl/auth.php
+++ b/lang/nl/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Deze inloggegevens zijn niet bij ons bekend.',
     'throttle' => 'Te veel inlogpogingen! Probeer het opnieuw na :seconds seconden.',
+    'mfa_throttle' => 'Te veel pogingen om te verifiëren met meervoudige verificatie. Probeer het opnieuw na :seconds seconden.',
 
     // Login & Register
     'sign_up' => 'Registreer',
@@ -20,6 +21,9 @@
     'username' => 'Gebruikersnaam',
     'email' => 'E-mail',
     'password' => 'Wachtwoord',
+    'password_new' => 'Nieuw Wachtwoord',
+    'password_new_confirm' => 'Bevestig Nieuw Wachtwoord',
+    'password_current' => 'Bevestig Huidig Wachtwoord',
     'password_confirm' => 'Wachtwoord Bevestigen',
     'password_hint' => 'Moet uit minstens 8 tekens bestaan',
     'forgot_password' => 'Wachtwoord vergeten?',
diff --git a/lang/nl/common.php b/lang/nl/common.php
index bcd7fbe0853..75c2fd83bc6 100644
--- a/lang/nl/common.php
+++ b/lang/nl/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactief',
     'never' => 'Nooit',
     'none' => 'Geen',
+    'move_left' => 'Naar Links',
+    'move_right' => 'Naar Rechts',
 
     // Header
     'homepage' => 'Startpagina',
diff --git a/lang/nl/entities.php b/lang/nl/entities.php
index b9be1f42b3c..6f5f7a37b7a 100644
--- a/lang/nl/entities.php
+++ b/lang/nl/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Verplaats hoofdstukken en pagina\'s door het boek om ze te organiseren. Andere boeken kunnen worden toegevoegd zodat hoofdstukken en pagina\'s gemakkelijk tussen boeken kunnen worden verplaatst. Het is mogelijk om een automatische sorteerregel in te stellen die de inhoud zal sorteren bij wijzigingen.',
     'books_sort_auto_sort' => 'Automatisch Sorteren',
     'books_sort_auto_sort_active' => 'Automatisch Sorteren Actief: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Regels voor automatisch sorteren kunnen worden aangemaakt door een bevoegde gebruiker in het gedeelte "Lijsten & Sorteren" van de instellingen.',
     'books_sort_named' => 'Sorteer boek :bookName',
     'books_sort_name' => 'Sorteren op naam',
     'books_sort_created' => 'Sorteren op datum van aanmaken',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Zijbalk Tonen/Verbergen',
+    'page_contents' => 'Pagina Inhoud',
+    'page_contents_none' => 'Geen koppen gevonden binnen de inhoud van deze pagina.',
+    'page_contents_info' => 'Het inhoudsmenu wordt gemaakt van alle koppen op een pagina.',
     'page_tags' => 'Pagina Labels',
     'chapter_tags' => 'Hoofdstuk Labels',
     'book_tags' => 'Boek Labels',
diff --git a/lang/nl/errors.php b/lang/nl/errors.php
index 9829986a2a7..8dc197efe3e 100644
--- a/lang/nl/errors.php
+++ b/lang/nl/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Kon het Zip-bestand niet lezen.',
     'import_zip_cant_decode_data' => 'Kon de data.json Zip-inhoud niet vinden of decoderen.',
     'import_zip_no_data' => 'Zip-bestand bevat niet de verwachte boek, hoofdstuk of pagina-inhoud.',
+    'import_zip_data_too_large' => 'De inhoud van data.json in de ZIP overschrijdt de ingestelde maximum upload grootte.',
     'import_validation_failed' => 'De validatie van het Zip-bestand is mislukt met de volgende fouten:',
     'import_zip_failed_notification' => 'Importeren van het Zip-bestand is mislukt.',
     'import_perms_books' => 'Je mist de vereiste machtigingen om boeken te maken.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Het opgegeven geheim voor de API-token is onjuist',
     'api_user_no_api_permission' => 'De eigenaar van de gebruikte API-token heeft geen machtiging om API calls te maken',
     'api_user_token_expired' => 'De gebruikte autorisatie token is verlopen',
+    'api_cookie_auth_only_get' => 'Alleen GET verzoeken zijn toegestaan wanneer de API wordt gebruikt met cookie-gebaseerde authenticatie',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Fout opgetreden bij het verzenden van een test email:',
diff --git a/lang/nl/notifications.php b/lang/nl/notifications.php
index 1e7035670da..cccd1cca2a2 100644
--- a/lang/nl/notifications.php
+++ b/lang/nl/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Aangepaste pagina: :pageName',
     'updated_page_intro' => 'Een pagina werd aangepast in :appName:',
     'updated_page_debounce' => 'Om een stortvloed aan meldingen te voorkomen, zul je een tijdje geen meldingen ontvangen voor verdere bewerkingen van deze pagina door dezelfde redacteur.',
+    'comment_mention_subject' => 'Je bent vermeld in een opmerking op pagina: :pageName',
+    'comment_mention_intro' => 'Je bent vermeld in een opmerking in :appName:',
 
     'detail_page_name' => 'Pagina Naam:',
     'detail_page_path' => 'Paginapad:',
diff --git a/lang/nl/preferences.php b/lang/nl/preferences.php
index d0e3623b9cc..38a8ea6eddd 100644
--- a/lang/nl/preferences.php
+++ b/lang/nl/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Toetsencombinatievoorkeuren zijn bijgewerkt!',
     'shortcuts_overview_desc' => 'Beheer toetsenbordsnelkoppelingen om door de gebruikersinterface van het systeem te navigeren.',
 
+    'interface' => 'Interface Voorkeuren',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'Lay-out Voorkeuren',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Terug naar Voorkeuren',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Opnieuw Instellen',
+    'layout_update_success' => 'Lay-out voorkeuren zijn aangepast!',
+    'layout_reset_success' => 'Lay-out voorkeuren zijn opnieuw ingesteld!',
+
     'notifications' => 'Melding Voorkeuren',
     'notifications_desc' => 'Bepaal welke e-mailmeldingen je ontvangt wanneer bepaalde activiteiten in het systeem worden uitgevoerd.',
     'notifications_opt_own_page_changes' => 'Geef melding bij wijzigingen aan pagina\'s waarvan ik de eigenaar ben',
     'notifications_opt_own_page_comments' => 'Geef melding van opmerkingen op pagina\'s waarvan ik de eigenaar ben',
+    'notifications_opt_comment_mentions' => 'Geef een melding wanneer ik word vermeld in een opmerking',
     'notifications_opt_comment_replies' => 'Geef melding van reacties op mijn opmerkingen',
     'notifications_save' => 'Voorkeuren opslaan',
     'notifications_update_success' => 'Voorkeuren voor meldingen zijn bijgewerkt!',
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
index 3b4da75a985..4bd6795fc1c 100644
--- a/lang/nl/settings.php
+++ b/lang/nl/settings.php
@@ -75,7 +75,7 @@
     'reg_confirm_restrict_domain_placeholder' => 'Geen beperkingen ingesteld',
 
     // Sorting Settings
-    'sorting' => 'Sorteren',
+    'sorting' => 'Lijsten & Sorteren',
     'sorting_book_default' => 'Standaard Sorteerregel Boek',
     'sorting_book_default_desc' => 'Selecteer de standaard sorteerregel om toe te passen op nieuwe boeken. Dit heeft geen invloed op bestaande boeken, en kan per boek worden overschreven.',
     'sorting_rules' => 'Sorteerregels',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Bijwerkdatum',
     'sort_rule_op_chapters_first' => 'Hoofdstukken Eerst',
     'sort_rule_op_chapters_last' => 'Hoofdstukken Laatst',
+    'sorting_page_limits' => 'Weergavelimiet Per Pagina',
+    'sorting_page_limits_desc' => 'Stel in hoeveel items er op een pagina worden laten zien in de verschillende lijstweergaves. Een lager aantal verbeterd de snelheid, een hoger aantal verminderd het doorklikken door pagina\'s. Het wordt aanbevolen om een meervoud van 6 te gebruiken.',
 
     // Maintenance settings
     'maint' => 'Onderhoud',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importeer inhoud',
     'role_editor_change' => 'Wijzig pagina bewerker',
     'role_notifications' => 'Meldingen ontvangen & beheren',
+    'role_permission_note_users_and_roles' => 'Deze machtigingen geven technisch gezien toegang tot het weergeven van gebruikers & rollen binnen het systeem.',
     'role_asset' => 'Asset Machtigingen',
     'roles_system_warning' => 'Wees ervan bewust dat toegang tot een van de bovengenoemde drie machtigingen een gebruiker in staat kan stellen zijn eigen machtigingen of de machtigingen van anderen in het systeem kan wijzigen. Wijs alleen rollen toe met deze machtigingen aan vertrouwde gebruikers.',
     'role_asset_desc' => 'Deze machtigingen bepalen de standaard toegang tot de assets binnen het systeem. Machtigingen op boeken, hoofdstukken en pagina\'s overschrijven deze instelling.',
     'role_asset_admins' => 'Beheerders krijgen automatisch toegang tot alle inhoud, maar deze opties kunnen gebruikersinterface opties tonen of verbergen.',
     'role_asset_image_view_note' => 'Dit heeft betrekking op de zichtbaarheid binnen de afbeeldingsbeheerder. De werkelijke toegang tot geüploade afbeeldingsbestanden hangt af van de gekozen opslagmethode.',
+    'role_asset_users_note' => 'Deze machtigingen geven technisch gezien toegang tot het weergeven van gebruikers binnen het systeem.',
     'role_all' => 'Alles',
     'role_own' => 'Eigen',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Gecontroleerd door de asset waar deze is geüpload',
+    'role_controlled_by_page_delete' => 'Ingesteld volgens pagina verwijder machtigingen',
     'role_save' => 'Rol Opslaan',
     'role_users' => 'Gebruikers in deze rol',
     'role_users_none' => 'Geen enkele gebruiker heeft deze rol',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Stel meervoudige verificatie in als extra beveiligingslaag voor je gebruikersaccount.',
     'users_mfa_x_methods' => ':count methode geconfigureerd|:count methoden geconfigureerd',
     'users_mfa_configure' => 'Configureer methoden',
+    'users_mfa_reset' => 'Herstel Meervoudige Verificatie Methodes',
+    'users_mfa_reset_desc' => 'Dit zal alle methodes voor meervoudige verificatie van deze gebruiker wissen. Als meervoudige verificatie vereist is vanwege een van hun rollen, worden ze bij hun volgende inlogpoging gevraagd om nieuwe methodes te configureren.',
+    'users_mfa_reset_confirm' => 'Weet je zeker dat je de meervoudige verificatie van deze gebruiker wilt herstellen?',
 
     // API Tokens
     'user_api_token_create' => 'API-token aanmaken',
@@ -358,7 +367,9 @@
         'ru' => 'Русский (Russisch)',
         'sk' => 'Slovensky (Slowaaks)',
         'sl' => 'Slovenščina (Sloveens)',
+        'sr' => 'Српски',
         'sv' => 'Svenska (Zweeds)',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe (Turks)',
         'uk' => 'Українська (Oekraïens)',
         'uz' => 'Oezbeeks',
diff --git a/lang/nl/validation.php b/lang/nl/validation.php
index 7c7e20c8bfc..0b87d0d441d 100644
--- a/lang/nl/validation.php
+++ b/lang/nl/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute mag alleen letters en nummers bevatten.',
     'array'                => ':attribute moet een reeks zijn.',
     'backup_codes'         => 'De opgegeven code is niet geldig of eerder al gebruikt.',
+    'base64_uri_mime'      => ':attribute moet een geldige base64 URI zijn met data van het :mime mime type.',
     'before'               => ':attribute moet een datum zijn voor :date.',
     'between'              => [
         'numeric' => ':attribute moet tussen de :min en :max zijn.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute moet ja of nee zijn.',
     'confirmed'            => ':attribute bevestiging komt niet overeen.',
+    'current_password'     => 'Dit komt niet overeen met je huidige wachtwoord.',
     'date'                 => ':attribute is geen geldige datum.',
     'date_format'          => ':attribute komt niet overeen met het formaat :format.',
     'different'            => ':attribute en :other moeten verschillend zijn.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Het bestand kon niet worden geüpload. De server accepteert mogelijk geen bestanden van deze grootte.',
 
     'zip_file' => 'Het \':attribute\' veld moet verwijzen naar een bestand in de ZIP.',
+    'zip_file_size' => 'Het bestand :attribute mag niet groter zijn dan :size MB.',
     'zip_file_mime' => 'Het \':attribute\' veld moet verwijzen naar een bestand met het type :validTypes, vond :foundType.',
     'zip_model_expected' => 'Dataobject verwacht maar vond ":type".',
     'zip_unique' => ':attribute moet uniek zijn voor het objecttype binnen de ZIP.',
diff --git a/lang/nn/activities.php b/lang/nn/activities.php
index f87aadc6677..fa934bf45fb 100644
--- a/lang/nn/activities.php
+++ b/lang/nn/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Brukaren vart oppdatert',
     'user_delete' => 'sletta brukar',
     'user_delete_notification' => 'Brukaren vart fjerna',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'opprett API-nøkkel',
diff --git a/lang/nn/auth.php b/lang/nn/auth.php
index 5da686eaa9e..f5f6a17bea3 100644
--- a/lang/nn/auth.php
+++ b/lang/nn/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Desse detaljane samsvarar ikkje med det me har på bok.',
     'throttle' => 'For mange forsøk, prøv på nytt om :seconds sekunder.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registrer deg',
@@ -20,6 +21,9 @@
     'username' => 'Brukarnamn',
     'email' => 'E-post',
     'password' => 'Passord',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Stadfest passord',
     'password_hint' => 'Må vere minst 8 teikn',
     'forgot_password' => 'Gløymt passord?',
diff --git a/lang/nn/common.php b/lang/nn/common.php
index 4247563e0fb..108120667ac 100644
--- a/lang/nn/common.php
+++ b/lang/nn/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Aldri',
     'none' => 'Ingen',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Heimeside',
diff --git a/lang/nn/entities.php b/lang/nn/entities.php
index 4c75d501986..878e2ef0faa 100644
--- a/lang/nn/entities.php
+++ b/lang/nn/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Omorganiser :bookName',
     'books_sort_name' => 'Sorter på namn',
     'books_sort_created' => 'Sorter på oppretta dato',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Vis/gøym sidepanelet',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Sidemerker',
     'chapter_tags' => 'Kapittelmerker',
     'book_tags' => 'Bokmerker',
diff --git a/lang/nn/errors.php b/lang/nn/errors.php
index c56b7d07850..31a08c2c2a8 100644
--- a/lang/nn/errors.php
+++ b/lang/nn/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Hemmeligheten som er gitt for det gitte brukte API-tokenet er feil',
     'api_user_no_api_permission' => 'Eieren av det brukte API-tokenet har ikke tillatelse til å ringe API-samtaler',
     'api_user_token_expired' => 'Autorisasjonstokenet som er brukt, har utløpt',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Feil kastet når du sendte en test-e-post:',
diff --git a/lang/nn/notifications.php b/lang/nn/notifications.php
index 247d8d10572..25f0f30c86d 100644
--- a/lang/nn/notifications.php
+++ b/lang/nn/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Oppdatert side: :pageName',
     'updated_page_intro' => 'Ei side vart oppdatert i :appName:',
     'updated_page_debounce' => 'For å forhindre mange varslingar, vil du ikkje få nye varslinger for endringar på denne siden frå same forfattar.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Sidenamn:',
     'detail_page_path' => 'Sidenamn:',
diff --git a/lang/nn/preferences.php b/lang/nn/preferences.php
index ac6dc1b77dc..48351100ac7 100644
--- a/lang/nn/preferences.php
+++ b/lang/nn/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Snarvei innstillinger er oppdatert!',
     'shortcuts_overview_desc' => 'Behandle tastatursnarveier du kan bruke for å navigere i systembrukergrensesnittet.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Innstillinger for varsling',
     'notifications_desc' => 'Kontroller e-postvarslene du mottar når en bestemt aktivitet utføres i systemet.',
     'notifications_opt_own_page_changes' => 'Varsle ved endringer til sider jeg eier',
     'notifications_opt_own_page_comments' => 'Varsle om kommentarer på sider jeg eier',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Varsle ved svar på mine kommentarer',
     'notifications_save' => 'Lagre innstillinger',
     'notifications_update_success' => 'Varslingsinnstillingene er oppdatert!',
diff --git a/lang/nn/settings.php b/lang/nn/settings.php
index c098ac75386..23040f07382 100644
--- a/lang/nn/settings.php
+++ b/lang/nn/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begrensninger er satt',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Vedlikehold',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Endre sideredigering',
     'role_notifications' => 'Motta og administrere varslinger',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Eiendomstillatelser',
     'roles_system_warning' => 'Vær oppmerksom på at tilgang til noen av de ovennevnte tre tillatelsene kan tillate en bruker å endre sine egne rettigheter eller rettighetene til andre i systemet. Bare tildel roller med disse tillatelsene til pålitelige brukere.',
     'role_asset_desc' => 'Disse tillatelsene kontrollerer standard tilgang til eiendelene i systemet. Tillatelser til bøker, kapitler og sider overstyrer disse tillatelsene.',
     'role_asset_admins' => 'Administratorer får automatisk tilgang til alt innhold, men disse alternativene kan vise eller skjule UI-alternativer.',
     'role_asset_image_view_note' => 'Dette gjelder synlighet innenfor bilde-administrasjonen. Faktisk tilgang på opplastede bildefiler vil være avhengig av valget for systemlagring av bildet.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Alle',
     'role_own' => 'Egne',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrollert av eiendelen de er lastet opp til',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Lagre rolle',
     'role_users' => 'Kontoholdere med denne rollen',
     'role_users_none' => 'Ingen kontoholdere er gitt denne rollen',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Konfigurer flerfaktorautentisering som eit ekstra lag med tryggleik for din konto.',
     'users_mfa_x_methods' => ':count metode konfigurert|:count metoder konfigurert',
     'users_mfa_configure' => 'Konfigurer metoder',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Opprett API-nøkkel',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/nn/validation.php b/lang/nn/validation.php
index a24ebd17189..edfdf356400 100644
--- a/lang/nn/validation.php
+++ b/lang/nn/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute kan kun inneholde bokstaver og tall.',
     'array'                => ':attribute må være en liste.',
     'backup_codes'         => 'Den angitte koden er ikke gyldig, eller er allerede benyttet.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute må være en dato før :date.',
     'between'              => [
         'numeric' => ':attribute må være mellom :min og :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute feltet kan bare være sann eller falsk.',
     'confirmed'            => ':attribute bekreftelsen samsvarer ikke.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute er ikke en gyldig dato.',
     'date_format'          => ':attribute samsvarer ikke med :format.',
     'different'            => ':attribute og :other må være forskjellige.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'kunne ikke lastes opp, tjeneren støtter ikke filer av denne størrelsen.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/pl/activities.php b/lang/pl/activities.php
index dc078ad57ab..45920dcde34 100644
--- a/lang/pl/activities.php
+++ b/lang/pl/activities.php
@@ -6,52 +6,52 @@
 return [
 
     // Pages
-    'page_create'                 => 'utworzył stronę',
+    'page_create'                 => 'utworzono stronę',
     'page_create_notification'    => 'Strona została utworzona',
-    'page_update'                 => 'zaktualizował stronę',
+    'page_update'                 => 'zaktualizowano stronę',
     'page_update_notification'    => 'Strona zaktualizowana pomyślnie',
-    'page_delete'                 => 'usunął stronę',
+    'page_delete'                 => 'usunięto stronę',
     'page_delete_notification'    => 'Strona została usunięta',
-    'page_restore'                => 'przywrócił stronę',
+    'page_restore'                => 'przywrócono stronę',
     'page_restore_notification'   => 'Strona przywrócona pomyślnie',
-    'page_move'                   => 'przeniósł stronę',
+    'page_move'                   => 'przeniesiono stronę',
     'page_move_notification'      => 'Strona przeniesiona pomyślnie',
 
     // Chapters
-    'chapter_create'              => 'utworzył rozdział',
+    'chapter_create'              => 'utworzono rozdział',
     'chapter_create_notification' => 'Rozdział utworzony pomyślnie',
-    'chapter_update'              => 'zaktualizował rozdział',
+    'chapter_update'              => 'zaktualizowano rozdział',
     'chapter_update_notification' => 'Rozdział zaktualizowany pomyślnie',
-    'chapter_delete'              => 'usunął rozdział',
+    'chapter_delete'              => 'usunięto rozdział',
     'chapter_delete_notification' => 'Rozdział usunięty pomyślnie',
-    'chapter_move'                => 'przeniósł rozdział',
+    'chapter_move'                => 'przeniesiono rozdział',
     'chapter_move_notification' => 'Rozdział przeniesiony pomyślnie',
 
     // Books
-    'book_create'                 => 'utworzył książkę',
+    'book_create'                 => 'utworzono książkę',
     'book_create_notification'    => 'Książka utworzona pomyślnie',
-    'book_create_from_chapter'              => 'skonwertował rozdział na książkę',
+    'book_create_from_chapter'              => 'przekonwertowano rozdział na książkę',
     'book_create_from_chapter_notification' => 'Rozdział został pomyślnie skonwertowany do książki',
-    'book_update'                 => 'zaktualizował książkę',
+    'book_update'                 => 'zaktualizowano książkę',
     'book_update_notification'    => 'Książka zaktualizowana pomyślnie',
-    'book_delete'                 => 'usunął książkę',
+    'book_delete'                 => 'usunięto książkę',
     'book_delete_notification'    => 'Książka usunięta pomyślnie',
-    'book_sort'                   => 'posortował książkę',
+    'book_sort'                   => 'posortowano książkę',
     'book_sort_notification'      => 'Książka posortowana pomyślnie',
 
     // Bookshelves
-    'bookshelf_create'            => 'utworzył półkę',
+    'bookshelf_create'            => 'utworzyono półkę',
     'bookshelf_create_notification'    => 'Półka utworzona pomyślnie',
-    'bookshelf_create_from_book'    => 'skonwertował książkę na półkę',
+    'bookshelf_create_from_book'    => 'przekonwertowano książkę na półkę',
     'bookshelf_create_from_book_notification'    => 'Książka została pomyślnie skonwertowana na półkę',
-    'bookshelf_update'                 => 'zaktualizował półkę',
+    'bookshelf_update'                 => 'zaktualizowano półkę',
     'bookshelf_update_notification'    => 'Półka zaktualizowana pomyślnie',
-    'bookshelf_delete'                 => 'usunął półkę',
+    'bookshelf_delete'                 => 'usunięto półkę',
     'bookshelf_delete_notification'    => 'Półka usunięta pomyślnie',
 
     // Revisions
-    'revision_restore' => 'przywrócił wersję',
-    'revision_delete' => 'usunął wersję',
+    'revision_restore' => 'przywrócono wersję',
+    'revision_delete' => 'usunięto wersję',
     'revision_delete_notification' => 'Wersja usunięta pomyślnie',
 
     // Favourites
@@ -72,54 +72,56 @@
     'mfa_remove_method_notification' => 'Metoda wieloskładnikowa pomyślnie usunięta',
 
     // Settings
-    'settings_update' => 'zaktualizował ustawienia',
+    'settings_update' => 'zaktualizowano ustawienia',
     'settings_update_notification' => 'Ustawienia zaktualizowane pomyślnie',
-    'maintenance_action_run' => 'uruchomił akcję konserwacji',
+    'maintenance_action_run' => 'uruchomiono akcję konserwacji',
 
     // Webhooks
-    'webhook_create' => 'utworzył webhook',
+    'webhook_create' => 'utworzono webhook',
     'webhook_create_notification' => 'Webhook utworzony pomyślnie',
-    'webhook_update' => 'zaktualizował webhook',
+    'webhook_update' => 'zaktualizowano webhook',
     'webhook_update_notification' => 'Webhook zaktualizowany pomyślnie',
-    'webhook_delete' => 'usunął webhook',
+    'webhook_delete' => 'usunięto webhook',
     'webhook_delete_notification' => 'Webhook usunięty pomyślnie',
 
     // Imports
     'import_create' => 'utworzono import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create_notification' => 'Import zakończony sukcesem',
+    'import_run' => 'zaktualizowano import',
+    'import_run_notification' => 'Zawartość pomyślnie zaimportowana',
+    'import_delete' => 'usunięto import',
+    'import_delete_notification' => 'Import usunięty',
 
     // Users
-    'user_create' => 'utworzył użytkownika',
+    'user_create' => 'utworzono użytkownika',
     'user_create_notification' => 'Użytkownik utworzony pomyślnie',
-    'user_update' => 'zaktualizował użytkownika',
+    'user_update' => 'zaktualizowano użytkownika',
     'user_update_notification' => 'Użytkownik zaktualizowany pomyślnie',
-    'user_delete' => 'usunął użytkownika',
+    'user_delete' => 'usunięto użytkownika',
     'user_delete_notification' => 'Użytkownik pomyślnie usunięty',
+    'user_mfa_reset' => 'zresetuj MFA dla użytkownika',
+    'user_mfa_reset_notification' => 'Przywracanie metod uwierzytelniania wieloskładnikowego',
 
     // API Tokens
-    'api_token_create' => 'utworzył token API',
+    'api_token_create' => 'utworzono token API',
     'api_token_create_notification' => 'Token API został poprawnie utworzony',
-    'api_token_update' => 'zaktualizował token API',
+    'api_token_update' => 'zaktualizowano token API',
     'api_token_update_notification' => 'Token API został pomyślnie zaktualizowany',
-    'api_token_delete' => 'usunął token API',
+    'api_token_delete' => 'usunięto token API',
     'api_token_delete_notification' => 'Token API został pomyślnie usunięty',
 
     // Roles
-    'role_create' => 'utworzył rolę',
+    'role_create' => 'utworzono rolę',
     'role_create_notification' => 'Rola utworzona pomyślnie',
-    'role_update' => 'zaktualizował rolę',
+    'role_update' => 'zaktualizowano rolę',
     'role_update_notification' => 'Rola zaktualizowana pomyślnie',
-    'role_delete' => 'usunął rolę',
+    'role_delete' => 'usunięto rolę',
     'role_delete_notification' => 'Rola usunięta pomyślnie',
 
     // Recycle Bin
-    'recycle_bin_empty' => 'opróżnił kosz',
-    'recycle_bin_restore' => 'przywrócił z kosza',
-    'recycle_bin_destroy' => 'usunął z kosza',
+    'recycle_bin_empty' => 'opróżniono kosz',
+    'recycle_bin_restore' => 'przywrócono z kosza',
+    'recycle_bin_destroy' => 'usunięto z kosza',
 
     // Comments
     'commented_on'                => 'skomentował',
@@ -128,12 +130,12 @@
     'comment_delete'              => 'usunął komentarz',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'utworzono regułę sortowania',
+    'sort_rule_create_notification' => 'Reguła sortowania została pomyślnie stworzona',
+    'sort_rule_update' => 'zaktualizowano regułę sortowania',
+    'sort_rule_update_notification' => 'Reguła sortowania została pomyślnie zaktualizowana',
+    'sort_rule_delete' => 'usunięto regułę sortowania',
+    'sort_rule_delete_notification' => 'Reguła sortowania została pomyślnie usunięta',
 
     // Other
     'permissions_update'          => 'zaktualizował uprawnienia',
diff --git a/lang/pl/auth.php b/lang/pl/auth.php
index 445f8198af8..9d1df8ff6c8 100644
--- a/lang/pl/auth.php
+++ b/lang/pl/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Wprowadzone poświadczenia są nieprawidłowe.',
     'throttle' => 'Zbyt wiele prób logowania. Spróbuj ponownie za :seconds s.',
+    'mfa_throttle' => 'Zbyt wiele prób weryfikacji wieloskładnikowej. Spróbuj ponownie za :seconds sekund.',
 
     // Login & Register
     'sign_up' => 'Zarejestruj się',
@@ -20,6 +21,9 @@
     'username' => 'Nazwa użytkownika',
     'email' => 'E-mail',
     'password' => 'Hasło',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Potwierdź hasło',
     'password_hint' => 'Musi mieć co najmniej 8 znaków',
     'forgot_password' => 'Zapomniałeś hasła?',
diff --git a/lang/pl/common.php b/lang/pl/common.php
index e21302928b6..eb1e9c65eb5 100644
--- a/lang/pl/common.php
+++ b/lang/pl/common.php
@@ -30,8 +30,8 @@
     'create' => 'Utwórz',
     'update' => 'Zaktualizuj',
     'edit' => 'Edytuj',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Archiwizuj',
+    'unarchive' => 'Wypakuj z archiwum',
     'sort' => 'Sortuj',
     'move' => 'Przenieś',
     'copy' => 'Skopiuj',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Nieaktywny',
     'never' => 'Nigdy',
     'none' => 'Brak',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Strona domowa',
diff --git a/lang/pl/editor.php b/lang/pl/editor.php
index a93b5dd7880..02206ba476c 100644
--- a/lang/pl/editor.php
+++ b/lang/pl/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Anuluj',
     'save' => 'Zapisz',
     'close' => 'Zamknij',
-    'apply' => 'Apply',
+    'apply' => 'Zatwierdź',
     'undo' => 'Cofnij',
     'redo' => 'Ponów',
     'left' => 'Lewa strona',
@@ -48,7 +48,7 @@
     'superscript' => 'Indeks górny',
     'subscript' => 'Indeks dolny',
     'text_color' => 'Kolor tekstu',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Kolor podkreślenia',
     'custom_color' => 'Kolor niestandardowy',
     'remove_color' => 'Usuń kolor',
     'background_color' => 'Kolor tła',
@@ -149,7 +149,7 @@
     'url' => 'Adres URL',
     'text_to_display' => 'Tekst do wyświetlenia',
     'title' => 'Tytuł',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Przeglądaj linki',
     'open_link' => 'Otwórz link',
     'open_link_in' => 'Otwórz link w...',
     'open_link_current' => 'Bieżące okno',
@@ -166,8 +166,8 @@
     'about' => 'O edytorze',
     'about_title' => 'O edytorze WYSIWYG',
     'editor_license' => 'Licencja edytora i prawa autorskie',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Ten edytor został zbudowany na podstawie :lexicalLink, który jest dystrybuowany na licencji MIT.',
+    'editor_lexical_license_link' => 'Pełne szczegóły licencji znajdziesz tutaj.',
     'editor_tiny_license' => 'Ten edytor jest zbudowany przy użyciu :tinyLink, który jest udostępniany na licencji MIT.',
     'editor_tiny_license_link' => 'Szczegóły dotyczące praw autorskich i licencji TinyMCE można znaleźć tutaj.',
     'save_continue' => 'Zapisz stronę i kontynuuj',
diff --git a/lang/pl/entities.php b/lang/pl/entities.php
index 72389500b65..6cc7966e28f 100644
--- a/lang/pl/entities.php
+++ b/lang/pl/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'Plik PDF',
     'export_text' => 'Plik tekstowy',
     'export_md' => 'Pliki Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Archiwum ZIP',
     'default_template' => 'Domyślny szablon strony',
     'default_template_explain' => 'Przypisz szablon strony, który będzie używany jako domyślna zawartość dla wszystkich stron utworzonych w tym elemencie. Pamiętaj, że będzie to używane tylko wtedy, gdy twórca strony ma dostęp do wybranej strony szablonu.',
     'default_template_select' => 'Wybierz stronę szablonu',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import' => 'Importuj',
+    'import_validate' => 'Zweryfikuj import',
+    'import_desc' => 'Importuj książki, rozdziały i strony za pomocą eksportu archiwum ZIP z tej samej lub innej instancji. Wybierz plik ZIP, aby kontynuować. Po przesłaniu i potwierdzeniu pliku będziesz mógł skonfigurować i potwierdzić import w następnym kroku.',
+    'import_zip_select' => 'Wybierz archiwum ZIP do wgrania',
+    'import_zip_validation_errors' => 'Podczas sprawdzania poprawności dostarczonego pliku ZIP wykryto błędy:',
+    'import_pending' => 'Oczekujące importy',
+    'import_pending_none' => 'Żaden import nie został uruchomiony.',
+    'import_continue' => 'Kontynuuj import',
+    'import_continue_desc' => 'Przejrzyj zawartość, która ma być zaimportowana z przesłanego pliku ZIP. Kiedy będziesz gotowy, uruchom import, aby dodać jego zawartość do systemu. Przesłane archiwum ZIP zostanie automatycznie usunięte po udanym importowaniu.',
+    'import_details' => 'Szczegóły importu',
+    'import_run' => 'Wykonaj import',
+    'import_size' => ':size wielkość importu ZIP',
+    'import_uploaded_at' => 'Przesłano :relativeTime',
+    'import_uploaded_by' => 'Przesłane przez',
+    'import_location' => 'Lokalizacja importu',
+    'import_location_desc' => 'Wybierz docelową lokalizację dla importowanej zawartości. Będziesz potrzebować odpowiednich uprawnień do tworzenia w wybranej lokalizacji.',
+    'import_delete_confirm' => 'Czy na pewno chcesz usunąć ten import?',
+    'import_delete_desc' => 'Spowoduje to usunięcie zaimportowanego archiwum ZIP. Tej operacji nie da się cofnąć.',
+    'import_errors' => 'Błędy importu',
+    'import_errors_desc' => 'Podczas próby importu wystąpiły następujące błędy:',
     'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
     'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
     'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
@@ -170,9 +170,10 @@
     'books_search_this' => 'Wyszukaj w tej książce',
     'books_navigation' => 'Nawigacja po książce',
     'books_sort' => 'Sortuj zawartość książki',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Przenieś rozdziały i strony w książce w celu reorganizacji jej treści. Można dodać inne książki, które umożliwiają łatwe przenoszenie rozdziałów i stron między książkami. Opcjonalnie reguła automatycznego sortowania może być ustawiona, aby automatycznie sortować zawartość tej książki po jej zmianach.',
+    'books_sort_auto_sort' => 'Opcja automatycznego sortowania',
+    'books_sort_auto_sort_active' => 'Automatyczne sortowanie aktywne: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Reguły opcji automatycznego sortowania mogą być tworzone w obszarze ustawień "Listy i sortowanie" przez użytkownika z odpowiednimi uprawnieniami.',
     'books_sort_named' => 'Sortuj książkę :bookName',
     'books_sort_name' => 'Sortuj według nazwy',
     'books_sort_created' => 'Sortuj według daty utworzenia',
@@ -252,7 +253,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Statyczna zawartość)',
     'pages_edit_switch_to_wysiwyg' => 'Przełącz na edytor WYSIWYG',
     'pages_edit_switch_to_new_wysiwyg' => 'Przełącz na nowy WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(W testach beta)',
     'pages_edit_set_changelog' => 'Ustaw dziennik zmian',
     'pages_edit_enter_changelog_desc' => 'Opisz zmiany, które zostały wprowadzone',
     'pages_edit_enter_changelog' => 'Wyświetl dziennik zmian',
@@ -272,7 +273,7 @@
     'pages_md_insert_drawing' => 'Wstaw rysunek',
     'pages_md_show_preview' => 'Pokaż podgląd',
     'pages_md_sync_scroll' => 'Synchronizuj przewijanie podglądu',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Zwykły edytor',
     'pages_drawing_unsaved' => 'Znaleziono niezapisany rysunek',
     'pages_drawing_unsaved_confirm' => 'Znaleziono niezapisane dane rysowania z poprzedniej nieudanej próby zapisu. Czy chcesz przywrócić i kontynuować edycję tego niezapisanego rysunku?',
     'pages_not_in_chapter' => 'Strona nie została umieszczona w rozdziale',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Przełącz pasek boczny',
+    'page_contents' => 'Zawartość strony',
+    'page_contents_none' => 'Nie znaleziono nagłówków w treści strony.',
+    'page_contents_info' => 'Menu zawartości jest generowane z dowolnych formatów nagłówków używanych na stronie.',
     'page_tags' => 'Tagi strony',
     'chapter_tags' => 'Tagi rozdziału',
     'book_tags' => 'Tagi książki',
@@ -397,11 +401,11 @@
     'comment' => 'Komentarz',
     'comments' => 'Komentarze',
     'comment_add' => 'Dodaj komentarz',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Brak komentarzy do wyświetlenia',
     'comment_placeholder' => 'Napisz swój komentarz tutaj',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count wątek komentarza|:count wątków komentarzy',
+    'comment_archived_count' => ':count zarchiwizowanych',
+    'comment_archived_threads' => 'Zarchiwizowane wątki',
     'comment_save' => 'Zapisz komentarz',
     'comment_new' => 'Nowy komentarz',
     'comment_created' => 'Skomentowano :createDiff',
@@ -410,14 +414,14 @@
     'comment_deleted_success' => 'Komentarz usunięty',
     'comment_created_success' => 'Komentarz dodany',
     'comment_updated_success' => 'Komentarz zaktualizowany',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Komentarz zarchiwizowany',
+    'comment_unarchive_success' => 'Komentarz usunięty z archiwum',
+    'comment_view' => 'Zobacz komentarz',
+    'comment_jump_to_thread' => 'Przejdź do wątku',
     'comment_delete_confirm' => 'Czy na pewno chcesz usunąc ten komentarz?',
     'comment_in_reply_to' => 'W odpowiedzi na :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Odwołania',
+    'comment_reference_outdated' => '(Przestarzałe)',
     'comment_editor_explain' => 'Oto komentarze pozostawione na tej stronie. Komentarze mogą być dodawane i zarządzane podczas przeglądania zapisanej strony.',
 
     // Revision
diff --git a/lang/pl/errors.php b/lang/pl/errors.php
index e6ad2093f1f..3cba1bfb24e 100644
--- a/lang/pl/errors.php
+++ b/lang/pl/errors.php
@@ -106,16 +106,17 @@
     'back_soon' => 'Niedługo zostanie uruchomiona ponownie.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Nie można odczytać archiwum ZIP.',
+    'import_zip_cant_decode_data' => 'Nie udało się odnaleźć i dekodować pliku data.json w zawartości archiwum ZIP.',
+    'import_zip_no_data' => 'Dane archiwum ZIP nie zawierają oczekiwanej zawartości książki, rozdziału lub strony.',
+    'import_zip_data_too_large' => 'Zawartość pliku data.json w archiwum ZIP przekracza maksymalny dopuszczalny rozmiar narzucony przez aktualną konfigurację aplikacji.',
+    'import_validation_failed' => 'Walidacja importu archiwum ZIP nie powiodła się z błędami:',
+    'import_zip_failed_notification' => 'Nie udało się zaimportować archiwum ZIP.',
+    'import_perms_books' => 'Brakuje Ci wymaganych uprawnień do tworzenia książek.',
+    'import_perms_chapters' => 'Brakuje Ci wymaganych uprawnień do tworzenia rozdziałów.',
+    'import_perms_pages' => 'Brakuje Ci wymaganych uprawnień do tworzenia stron.',
+    'import_perms_images' => 'Brakuje Ci wymaganych uprawnień do tworzenia zdjęć.',
+    'import_perms_attachments' => 'Brakuje Ci wymaganych uprawnień do tworzenia załączników.',
 
     // API errors
     'api_no_authorization_found' => 'Nie znaleziono tokenu autoryzacji dla żądania',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Podany sekret dla tego API jest nieprawidłowy',
     'api_user_no_api_permission' => 'Właściciel używanego tokenu API nie ma uprawnień do wykonywania zapytań do API',
     'api_user_token_expired' => 'Token uwierzytelniania wygasł',
+    'api_cookie_auth_only_get' => 'Tylko żądania GET są dozwolone podczas korzystania z API z uwierzytelniania opartego na plikach cookie',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Błąd podczas wysyłania testowej wiadomości e-mail:',
diff --git a/lang/pl/notifications.php b/lang/pl/notifications.php
index 66114999446..937db084fae 100644
--- a/lang/pl/notifications.php
+++ b/lang/pl/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Zaktualizowano stronę: :pageName',
     'updated_page_intro' => 'Strona została zaktualizowana w :appName:',
     'updated_page_debounce' => 'Aby zapobiec nadmiarowi powiadomień, przez jakiś czas nie będziesz otrzymywać powiadomień o dalszych edycjach tej strony przez tego samego edytora.',
+    'comment_mention_subject' => 'Zostałeś oznaczony w komentarzu na stronie: :pageName',
+    'comment_mention_intro' => 'Zostałeś oznaczony w komentarzu w :appName:',
 
     'detail_page_name' => 'Nazwa strony:',
     'detail_page_path' => 'Ścieżka strony:',
diff --git a/lang/pl/preferences.php b/lang/pl/preferences.php
index dd348210279..4af6c0de741 100644
--- a/lang/pl/preferences.php
+++ b/lang/pl/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Ustawienia skrótów zostały zaktualizowane!',
     'shortcuts_overview_desc' => 'Zarządzaj skrótami klawiaturowymi, które możesz użyć do nawigacji interfejsu użytkownika systemu.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Preferencje powiadomień',
     'notifications_desc' => 'Kontroluj otrzymywane powiadomienia e-mail, gdy określona aktywność jest wykonywana w systemie.',
     'notifications_opt_own_page_changes' => 'Powiadom o zmianach na stronach, których jestem właścicielem',
     'notifications_opt_own_page_comments' => 'Powiadom o komentarzach na stronach, których jestem właścicielem',
+    'notifications_opt_comment_mentions' => 'Powiadom, kiedy zostanę oznaczony w komentarzu',
     'notifications_opt_comment_replies' => 'Powiadom o odpowiedziach na moje komentarze',
     'notifications_save' => 'Zapisz preferencje',
     'notifications_update_success' => 'Preferencje powiadomień zostały zaktualizowane!',
diff --git a/lang/pl/settings.php b/lang/pl/settings.php
index 7c84ce34b87..adce719893b 100644
--- a/lang/pl/settings.php
+++ b/lang/pl/settings.php
@@ -20,12 +20,12 @@
     'app_name_header' => 'Pokaż nazwę aplikacji w nagłówku',
     'app_public_access' => 'Dostęp publiczny',
     'app_public_access_desc' => 'Włączenie tej opcji umożliwi niezalogowanym odwiedzającym dostęp do treści w Twojej instancji BookStack.',
-    'app_public_access_desc_guest' => 'Dostęp dla niezalogowanych odwiedzających jest dostępny poprzez użytkownika "Guest".',
+    'app_public_access_desc_guest' => 'Dostęp dla niezalogowanych odwiedzających jest kontrolowany poprzez użytkownika "Guest".',
     'app_public_access_toggle' => 'Zezwalaj na dostęp publiczny',
     'app_public_viewing' => 'Zezwolić na publiczne przeglądanie?',
-    'app_secure_images' => 'Włączyć przesyłanie obrazów o wyższym poziomie bezpieczeństwa?',
+    'app_secure_images' => 'Bezpieczniejsze przesyłanie obrazów',
     'app_secure_images_toggle' => 'Włącz wyższy poziom bezpieczeństwa dla obrazów',
-    'app_secure_images_desc' => 'Ze względów wydajnościowych wszystkie obrazki są publiczne. Ta opcja dodaje dodatkowy, trudny do odgadnięcia losowy ciąg na początku nazwy obrazka. Upewnij się że indeksowanie katalogów jest zablokowane, aby uniemożliwić łatwy dostęp do obrazków.',
+    'app_secure_images_desc' => 'Ze względu na wydajność systemu wszystkie obrazki są publiczne. Ta opcja dodaje trudny do odgadnięcia losowy ciąg znaków na początku nazwy obrazka. Upewnij się, że indeksowanie katalogów jest wyłączone, aby uniemożliwić łatwy dostęp do obrazków.',
     'app_default_editor' => 'Domyślny edytor stron',
     'app_default_editor_desc' => 'Wybierz, który edytor będzie domyślnie używany podczas edycji nowych stron. Może to być nadpisane na poziomie strony, na którym pozwalają na to uprawnienia.',
     'app_custom_html' => 'Własna zawartość w tagu <head>',
@@ -64,45 +64,47 @@
     'reg_settings' => 'Ustawienia rejestracji',
     'reg_enable' => 'Włącz rejestrację',
     'reg_enable_toggle' => 'Włącz rejestrację',
-    'reg_enable_desc' => 'Po włączeniu rejestracji użytkownicy ci będą mogli się samodzielnie zarejestrować i otrzymają domyślną rolę.',
+    'reg_enable_desc' => 'Przy włączonej rejestracji użytkownicy będą w stanie samodzielnie założyć sobie konto w systemie. Po rejestracji automatycznie otrzymają domyślną rolę.',
     'reg_default_role' => 'Domyślna rola użytkownika po rejestracji',
     'reg_enable_external_warning' => 'Powyższa opcja jest ignorowana, gdy zewnętrzne uwierzytelnianie LDAP lub SAML jest aktywne. Konta użytkowników dla nieistniejących użytkowników zostaną automatycznie utworzone, jeśli uwierzytelnianie za pomocą systemu zewnętrznego zakończy się sukcesem.',
     'reg_email_confirmation' => 'Potwierdzenie adresu email',
     'reg_email_confirmation_toggle' => 'Wymagaj potwierdzenia adresu email',
-    'reg_confirm_email_desc' => 'Jeśli restrykcje domenowe zostały ustawione, potwierdzenie adresu stanie się konieczne, a poniższa wartośc zostanie zignorowana.',
-    'reg_confirm_restrict_domain' => 'Restrykcje domenowe dot. adresu e-mail',
-    'reg_confirm_restrict_domain_desc' => 'Wprowadź listę domen adresów e-mail, rozdzieloną przecinkami, którym chciałbyś zezwolić na rejestrację. Wymusi to konieczność potwierdzenia adresu e-mail przez użytkownika przed uzyskaniem dostępu do aplikacji. <br> Pamiętaj, że użytkownicy będą mogli zmienić adres e-mail po rejestracji.',
+    'reg_confirm_email_desc' => 'Jeśli restrykcje domenowe zostały ustawione, potwierdzenie adresu email stanie się konieczne i ta opcja zostanie zignorowana.',
+    'reg_confirm_restrict_domain' => 'Restrykcje domenowe',
+    'reg_confirm_restrict_domain_desc' => 'Wprowadź listę domen adresów email, rozdzieloną przecinkami, którym chciałbyś zezwolić na rejestrację. Wymusi to konieczność potwierdzenia adresu e-mail przez użytkownika przed uzyskaniem dostępu do aplikacji. <br> Pamiętaj, że użytkownicy będą mogli zmienić adres e-mail po rejestracji.',
     'reg_confirm_restrict_domain_placeholder' => 'Brak restrykcji',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Listy i sortowanie',
+    'sorting_book_default' => 'Domyślna reguła sortowania książek',
+    'sorting_book_default_desc' => 'Wybierz domyślną regułę sortowania dla nowych książek. To nie wpłynie na istniejące książki i może być nadpisane per książka.',
+    'sorting_rules' => 'Reguły sortowania',
+    'sorting_rules_desc' => 'Są to wstępnie zdefiniowane operacje sortowania, które mogą być stosowane do treści w systemie.',
+    'sort_rule_assigned_to_x_books' => 'Przypisane do :count książki|Przypisane do :count książek',
+    'sort_rule_create' => 'Utwórz regułę sortowania',
+    'sort_rule_edit' => 'Edytuj regułę sortowania',
+    'sort_rule_delete' => 'Usuń regułę sortowania',
+    'sort_rule_delete_desc' => 'Usuń tę regułę sortowania z systemu. Książki używające tej reguły powrócą do ręcznego sortowania.',
+    'sort_rule_delete_warn_books' => 'Ta reguła sortowania jest obecnie używana na :count książkach. Czy na pewno chcesz ją usunąć?',
+    'sort_rule_delete_warn_default' => 'Ta reguła sortowania jest obecnie używana jako domyślna dla książek. Czy na pewno chcesz ją usunąć?',
+    'sort_rule_details' => 'Szczegóły reguły sortowania',
+    'sort_rule_details_desc' => 'Ustaw nazwę dla tej reguły sortowania, która pojawi się na listach, gdy użytkownicy skorzystają z sortowania.',
+    'sort_rule_operations' => 'Operacje sortowania',
+    'sort_rule_operations_desc' => 'Skonfiguruj akcje sortowanie do wykonania, przenosząc je z listy dostępnych operacji. Po użyciu operacje zostaną zastosowane w kolejności od góry do dołu. Wszelkie zmiany wprowadzone tutaj zostaną zastosowane do wszystkich przypisanych książek po zapisaniu.',
+    'sort_rule_available_operations' => 'Dostępne operacje',
+    'sort_rule_available_operations_empty' => 'Brak pozostałych operacji',
+    'sort_rule_configured_operations' => 'Skonfigurowane operacje',
+    'sort_rule_configured_operations_empty' => 'Przeciągnij/dodaj operacje z listy "Dostępne Operacje"',
+    'sort_rule_op_asc' => '(rosnąco)',
+    'sort_rule_op_desc' => '(malejąco)',
+    'sort_rule_op_name' => 'Nazwa — alfabetycznie',
+    'sort_rule_op_name_numeric' => 'Nazwa — numerycznie',
+    'sort_rule_op_created_date' => 'Data utworzenia',
+    'sort_rule_op_updated_date' => 'Data aktualizacji',
+    'sort_rule_op_chapters_first' => 'Rozdziały na początku',
+    'sort_rule_op_chapters_last' => 'Rozdziały na końcu',
+    'sorting_page_limits' => 'Limity wyświetlania per strona',
+    'sorting_page_limits_desc' => 'Ustaw ile elementów pokazywać na stronie w różnych listach w systemie. Zazwyczaj mniejsza ilość będzie bardziej wydajna, podczas gdy większa ilość unika konieczności kliknięcia na wiele stron. Zaleca się stosowanie wielokrotności 6 razy.',
 
     // Maintenance settings
     'maint' => 'Konserwacja',
@@ -192,17 +194,21 @@
     'role_access_api' => 'Dostęp do systemowego API',
     'role_manage_settings' => 'Zarządzanie ustawieniami aplikacji',
     'role_export_content' => 'Eksportuj zawartość',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importuj zawartość',
     'role_editor_change' => 'Zmień edytor strony',
     'role_notifications' => 'Odbieranie i zarządzanie powiadomieniami',
+    'role_permission_note_users_and_roles' => 'Uprawnienia te mogą zapewnić również widoczność i wyszukiwanie użytkowników i ról w systemie.',
     'role_asset' => 'Zarządzanie zasobami',
     'roles_system_warning' => 'Pamiętaj, że dostęp do trzech powyższych uprawnień może pozwolić użytkownikowi na zmianę własnych uprawnień lub uprawnień innych osób w systemie. Przypisz tylko role z tymi uprawnieniami do zaufanych użytkowników.',
     'role_asset_desc' => 'Te ustawienia kontrolują zarządzanie zasobami systemu. Uprawnienia książek, rozdziałów i stron nadpisują te ustawienia.',
     'role_asset_admins' => 'Administratorzy mają automatycznie dostęp do wszystkich treści, ale te opcję mogą być pokazywać lub ukrywać opcje interfejsu użytkownika.',
     'role_asset_image_view_note' => 'To odnosi się do widoczności w ramach menedżera obrazów. Rzeczywista możliwość dostępu do przesłanych plików obrazów będzie zależeć od systemowej opcji przechowywania obrazów.',
+    'role_asset_users_note' => 'Uprawnienia te mogą zapewnić również widoczność i wyszukiwanie użytkowników w systemie.',
     'role_all' => 'Wszyscy',
     'role_own' => 'Własne',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrolowane przez zasób, do którego zostały udostępnione',
+    'role_controlled_by_page_delete' => 'Kontrolowane przez uprawnienia do usuwania stron',
     'role_save' => 'Zapisz rolę',
     'role_users' => 'Użytkownicy w tej roli',
     'role_users_none' => 'Brak użytkowników zapisanych do tej roli',
@@ -223,7 +229,7 @@
     'users_password_desc' => 'Ustaw hasło logowania do aplikacji. Hasło musi mieć przynajmniej 8 znaków.',
     'users_send_invite_text' => 'Możesz wybrać wysłanie do tego użytkownika wiadomości e-mail z zaproszeniem, która pozwala mu ustawić własne hasło, w przeciwnym razie możesz ustawić je samemu.',
     'users_send_invite_option' => 'Wyślij e-mail z zaproszeniem',
-    'users_external_auth_id' => 'Zewnętrzne identyfikatory autentykacji',
+    'users_external_auth_id' => 'Zewnętrzne identyfikatory uwierzytelniania',
     'users_external_auth_id_desc' => 'Gdy używany jest zewnętrzny system uwierzytelniania (np. SAML2, OIDC lub LDAP), to jest ID, które łączy tego użytkownika BookStack z kontem w systemie uwierzytelniania. Możesz zignorować to pole, jeśli używasz domyślnego uwierzytelniania e-mailem.',
     'users_password_warning' => 'Wypełnij poniższe tylko, jeśli chcesz zmienić hasło dla tego użytkownika.',
     'users_system_public' => 'Ten użytkownik reprezentuje każdego gościa odwiedzającego tę aplikację. Nie można się na niego zalogować, lecz jest przyznawany automatycznie.',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Skonfiguruj uwierzytelnianie wieloskładnikowe jako dodatkową warstwę bezpieczeństwa dla swojego konta użytkownika.',
     'users_mfa_x_methods' => ':count metoda skonfigurowana|:count metody skonfigurowane',
     'users_mfa_configure' => 'Konfiguruj metody',
+    'users_mfa_reset' => 'Resetuj metody uwierzytelniania wieloetapowego',
+    'users_mfa_reset_desc' => 'Spowoduje to zresetowanie i wyczyszczenie wszystkich skonfigurowanych metod uwierzytelniania wieloetapowego dla tego użytkownika. Jeśli uwierzytelnianie wieloetapowe jest wymagane przez dowolną z ich ról, zostaną poproszone o skonfigurowanie nowych metod przy następnym logowaniu.',
+    'users_mfa_reset_confirm' => 'Czy na pewno chcesz zresetować uwierzytelnianie wieloskładnikowe dla tego użytkownika?',
 
     // API Tokens
     'user_api_token_create' => 'Utwórz klucz API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/pl/validation.php b/lang/pl/validation.php
index f20a66dfb6c..9044dbd851e 100644
--- a/lang/pl/validation.php
+++ b/lang/pl/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute może zawierać wyłącznie litery i cyfry.',
     'array'                => ':attribute musi być tablicą.',
     'backup_codes'         => 'Podany kod jest nieprawidłowy lub został już użyty.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute musi być datą poprzedzającą :date.',
     'between'              => [
         'numeric' => ':attribute musi zawierać się w przedziale od :min do :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute musi być wartością prawda/fałsz.',
     'confirmed'            => ':attribute i potwierdzenie muszą być zgodne.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nie jest prawidłową datą.',
     'date_format'          => ':attribute musi mieć format :format.',
     'different'            => ':attribute i :other muszą się różnić.',
@@ -105,10 +107,11 @@
     'url'                  => 'Format :attribute jest nieprawidłowy.',
     'uploaded'             => 'Plik nie może zostać wysłany. Serwer nie akceptuje plików o takim rozmiarze.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute musi odnosić się do pliku w archiwum ZIP.',
+    'zip_file_size' => 'Plik :attribute nie może przekraczać :size MB.',
+    'zip_file_mime' => ':attribute musi odnosić się do pliku typu :validTypes. Znaleziono :foundType.',
+    'zip_model_expected' => 'Oczekiwano obiektu danych, ale znaleziono ":type".',
+    'zip_unique' => ':attribute musi być unikalny dla typu obiektu w archiwum ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/pt/activities.php b/lang/pt/activities.php
index 33d9e2ca686..b7ca3d5b474 100644
--- a/lang/pt/activities.php
+++ b/lang/pt/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Utilizador atualizado com sucesso',
     'user_delete' => 'utilizador eliminado',
     'user_delete_notification' => 'Utilizador removido com sucesso',
+    'user_mfa_reset' => 'reiniciar a MFA para o utilizador',
+    'user_mfa_reset_notification' => 'Reinicialização dos métodos de autenticação multifatorial',
 
     // API Tokens
     'api_token_create' => 'token API criado',
diff --git a/lang/pt/auth.php b/lang/pt/auth.php
index 8807e1a87d3..469d1f221f8 100644
--- a/lang/pt/auth.php
+++ b/lang/pt/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Estas credenciais não coincidem com os nossos registos.',
     'throttle' => 'Demasiadas tentativas de acesso. Tente novamente em :seconds segundos.',
+    'mfa_throttle' => 'Foram efetuadas demasiadas tentativas de verificação multifatorial. Por favor, tente novamente daqui a :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Registar',
@@ -20,6 +21,9 @@
     'username' => 'Nome de utilizador',
     'email' => 'E-mail',
     'password' => 'Palavra-passe',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirmar Palavra-passe',
     'password_hint' => 'Deve ter no mínimo 8 caracteres',
     'forgot_password' => 'Esqueceu-se da palavra-passe?',
diff --git a/lang/pt/common.php b/lang/pt/common.php
index a0d83ac1e73..a63c058e9cc 100644
--- a/lang/pt/common.php
+++ b/lang/pt/common.php
@@ -30,8 +30,8 @@
     'create' => 'Criar',
     'update' => 'Atualizar',
     'edit' => 'Editar',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Arquivar',
+    'unarchive' => 'Desarquivar',
     'sort' => 'Ordenar',
     'move' => 'Mover',
     'copy' => 'Copiar',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inativo',
     'never' => 'Nunca',
     'none' => 'Nenhum',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Página inicial',
diff --git a/lang/pt/editor.php b/lang/pt/editor.php
index b60f813b51b..2a5a0f5c6e3 100644
--- a/lang/pt/editor.php
+++ b/lang/pt/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Cancelar',
     'save' => 'Guardar',
     'close' => 'Fechar',
-    'apply' => 'Apply',
+    'apply' => 'Aplicar',
     'undo' => 'Anular',
     'redo' => 'Refazer',
     'left' => 'Esquerda',
@@ -48,7 +48,7 @@
     'superscript' => 'Superior à linha',
     'subscript' => 'Inferior à linha',
     'text_color' => 'Cor do texto',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => 'Cor de destaque',
     'custom_color' => 'Cor personalizada',
     'remove_color' => 'Remover cor',
     'background_color' => 'Cor de fundo',
@@ -83,9 +83,9 @@
     'table_properties' => 'Propriedades da tabela',
     'table_properties_title' => 'Propriedades da Tabela',
     'delete_table' => 'Eliminar tabela',
-    'table_clear_formatting' => 'Clear table formatting',
-    'resize_to_contents' => 'Resize to contents',
-    'row_header' => 'Row header',
+    'table_clear_formatting' => 'Limpar formatação de tabela',
+    'resize_to_contents' => 'Redimensionar para o conteúdo',
+    'row_header' => 'Cabeçalho da linha',
     'insert_row_before' => 'Inserir linha antes',
     'insert_row_after' => 'Inserir linha depois',
     'delete_row' => 'Eliminar linha',
@@ -149,7 +149,7 @@
     'url' => 'URL',
     'text_to_display' => 'Texto a ser exibido',
     'title' => 'Título',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Procurar ligações',
     'open_link' => 'Abrir ligação',
     'open_link_in' => 'Abrir ligação em...',
     'open_link_current' => 'Janela atual',
@@ -166,8 +166,8 @@
     'about' => 'Sobre o editor',
     'about_title' => 'Sobre o Editor WYSIWYG',
     'editor_license' => 'Editor da licença de direitos autorais',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Este editor é criado como um fork do :lexicaLink que é distribuído sob a licença MIT.',
+    'editor_lexical_license_link' => 'Detalhes da licença completa podem ser encontrados aqui.',
     'editor_tiny_license' => 'Este editor foi criado com :tinyLink que é fornecido sob a licença MIT.',
     'editor_tiny_license_link' => 'Os dados relativos aos direitos de autor e à licença do TinyMCE podem ser encontrados aqui.',
     'save_continue' => 'Salvar página e continuar',
diff --git a/lang/pt/entities.php b/lang/pt/entities.php
index 91fe6d90cd1..5038eebcc7a 100644
--- a/lang/pt/entities.php
+++ b/lang/pt/entities.php
@@ -23,7 +23,7 @@
     'meta_updated' => 'Atualizado :timeLength',
     'meta_updated_name' => 'Atualizado :timeLength por :user',
     'meta_owned_name' => 'Propriedade de :user',
-    'meta_reference_count' => 'Referenced by :count item|Referenced by :count items',
+    'meta_reference_count' => 'Referenciado por :count item├Referenciado por :count itens',
     'entity_select' => 'Seleção de Entidade',
     'entity_select_lack_permission' => 'Não tem as permissões necessárias para selecionar este item',
     'images' => 'Imagens',
@@ -39,34 +39,34 @@
     'export_pdf' => 'Arquivo PDF',
     'export_text' => 'Arquivo Texto',
     'export_md' => 'Ficheiro Markdown',
-    'export_zip' => 'Portable ZIP',
-    'default_template' => 'Default Page Template',
-    'default_template_explain' => 'Assign a page template that will be used as the default content for all pages created within this item. Keep in mind this will only be used if the page creator has view access to the chosen template page.',
-    'default_template_select' => 'Select a template page',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'export_zip' => 'ZIP Portátil',
+    'default_template' => 'Modelo de página padrão',
+    'default_template_explain' => 'Atribuir um modelo de página que será usado como o conteúdo padrão para todas as páginas criadas dentro deste item. Tenha em mente que isto só será usado se o criador da página tiver acesso à página de modelo escolhida.',
+    'default_template_select' => 'Selecione uma página de modelo',
+    'import' => 'Importar',
+    'import_validate' => 'Validar Importação',
+    'import_desc' => 'Importar livros, capítulos e páginas usando uma exportação ZIP portátil da mesma ou uma instância diferente. Selecione um arquivo ZIP para prosseguir. Após o carregamento e validação do arquivo, conseguirá configurar e confirmar a importação na próxima visualização.',
+    'import_zip_select' => 'Selecione o ficheiro ZIP para enviar',
+    'import_zip_validation_errors' => 'Foram detetados erros ao validar o ficheiro ZIP fornecido:',
+    'import_pending' => 'Aguardando importação',
+    'import_pending_none' => 'Nenhuma importação foi iniciada.',
+    'import_continue' => 'Continuar importação',
+    'import_continue_desc' => 'Verifique o conteúdo a importar a partir do ficheiro ZIP carregado. Quando estiver pronto, execute a importação para adicionar o seu conteúdo a este sistema. O ficheiro ZIP de importação carregado será automaticamente removido após a importação bem-sucedida.',
+    'import_details' => 'Detalhes da importação',
+    'import_run' => 'Executar Importação',
+    'import_size' => ':size Tamanho do ZIP importado',
+    'import_uploaded_at' => 'Carregado :relativeTime',
+    'import_uploaded_by' => 'Carregado por',
+    'import_location' => 'Local de Importação',
+    'import_location_desc' => 'Selecione um local de destino para o seu conteúdo importado. Terá de dispor das permissões necessárias para criar conteúdo no local que escolher.',
+    'import_delete_confirm' => 'Tem a certeza que pretende eliminar a importação?',
+    'import_delete_desc' => 'Isto irá eliminar o arquivo ZIP de importação enviado e não pode ser desfeito.',
+    'import_errors' => 'Erros de Importação',
+    'import_errors_desc' => 'Ocorreram os seguintes erros durante a tentativa de importação:',
+    'breadcrumb_siblings_for_page' => 'Navegar itens do mesmo nível por página',
+    'breadcrumb_siblings_for_chapter' => 'Navegar itens do mesmo nível por capítulo',
+    'breadcrumb_siblings_for_book' => 'Navegar itens do mesmo nível por livro',
+    'breadcrumb_siblings_for_bookshelf' => 'Navegar itens do mesmo nível por estante',
 
     // Permissions and restrictions
     'permissions' => 'Permissões',
@@ -170,9 +170,10 @@
     'books_search_this' => 'Pesquisar neste livro',
     'books_navigation' => 'Navegação do Livro',
     'books_sort' => 'Ordenar Conteúdos do Livro',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Mova capítulos e páginas de um livro para reorganizar o seu conteúdo. É possível acrescentar outros livros, o que permite uma movimentação fácil de capítulos e páginas entre livros. Opcionalmente, uma regra de organização automática pode ser definida para classificar automaticamente o conteúdo deste livro após alterações.',
+    'books_sort_auto_sort' => '',
+    'books_sort_auto_sort_active' => 'Ordenação automática ativada: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'As regras da opção de ordenação automática podem ser criadas na área de configurações "Listas e Ordenação" por um utilizador com as permissões necessárias.',
     'books_sort_named' => 'Ordenar Livro :bookName',
     'books_sort_name' => 'Ordenar por Nome',
     'books_sort_created' => 'Ordenar por Data de Criação',
@@ -234,7 +235,7 @@
     'pages_delete_draft' => 'Eliminar Rascunho de Página',
     'pages_delete_success' => 'Página eliminada',
     'pages_delete_draft_success' => 'Rascunho de página eliminado',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
+    'pages_delete_warning_template' => 'Esta página é atualmente utilizada como modelo de página predefinido para livros ou capítulos. Após a eliminação desta página, estes livros ou capítulos deixarão de ter um modelo de página predefinido atribuído.',
     'pages_delete_confirm' => 'Tem certeza que deseja eliminar a página?',
     'pages_delete_draft_confirm' => 'Tem certeza que deseja eliminar o rascunho de página?',
     'pages_editing_named' => 'A Editar a Página :pageName',
@@ -251,8 +252,8 @@
     'pages_edit_switch_to_markdown_clean' => '(Conteúdo Limitado)',
     'pages_edit_switch_to_markdown_stable' => '(Conteúdo Estável)',
     'pages_edit_switch_to_wysiwyg' => 'Alternar para o editor WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Mudar para o novo WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(Em fase de testes beta)',
     'pages_edit_set_changelog' => 'Relatar Alterações',
     'pages_edit_enter_changelog_desc' => 'Digite uma breve descrição das alterações efetuadas por si',
     'pages_edit_enter_changelog' => 'Inserir Alterações',
@@ -272,7 +273,7 @@
     'pages_md_insert_drawing' => 'Inserir Desenho',
     'pages_md_show_preview' => 'Mostrar pré-visualização',
     'pages_md_sync_scroll' => 'Sincronizar pré-visualização',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_plain_editor' => 'Editor de texto simples',
     'pages_drawing_unsaved' => 'Encontrado um rascunho não guardado',
     'pages_drawing_unsaved_confirm' => 'Dados de um rascunho não guardado foi encontrado de um tentativa anteriormente falhada. Deseja restaurar e continuar a edição desse rascunho?',
     'pages_not_in_chapter' => 'A página não está dentro de um capítulo',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Alternar barra lateral',
+    'page_contents' => 'Conteúdo da Página',
+    'page_contents_none' => 'Não foram encontrados títulos no conteúdo da página.',
+    'page_contents_info' => 'O índice é gerado a partir dos formatos de título utilizados na página.',
     'page_tags' => 'Etiquetas de Página',
     'chapter_tags' => 'Etiquetas do Capítulo',
     'book_tags' => 'Etiquetas do Livro',
@@ -397,11 +401,11 @@
     'comment' => 'Comentário',
     'comments' => 'Comentários',
     'comment_add' => 'Adicionar Comentário',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Não há comentários para apresentar',
     'comment_placeholder' => 'Digite aqui os seus comentários',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count Tópico de comentários|:count Tópicos de comentários',
+    'comment_archived_count' => ':count Arquivado',
+    'comment_archived_threads' => 'Tópicos Arquivados',
     'comment_save' => 'Guardar comentário',
     'comment_new' => 'Comentário Novo',
     'comment_created' => 'comentado :createDiff',
@@ -410,14 +414,14 @@
     'comment_deleted_success' => 'Comentário removido',
     'comment_created_success' => 'Comentário adicionado',
     'comment_updated_success' => 'Comentário editado',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Comentário arquivado',
+    'comment_unarchive_success' => 'Comentário não arquivado',
+    'comment_view' => 'Ver comentário',
+    'comment_jump_to_thread' => 'Ir para o tópico',
     'comment_delete_confirm' => 'Tem a certeza de que deseja eliminar este comentário?',
     'comment_in_reply_to' => 'Em resposta à :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Referência',
+    'comment_reference_outdated' => '(Desatualizado)',
     'comment_editor_explain' => 'Aqui estão os comentários que foram deixados nesta página. Comentários podem ser adicionados e geridos ao visualizar a página guardada.',
 
     // Revision
@@ -448,7 +452,7 @@
     // References
     'references' => 'Referências',
     'references_none' => 'Não há referências registadas para este item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'A seguir, encontra-se uma lista de todo o conteúdo conhecido no sistema associado a este item.',
 
     // Watch Options
     'watch' => 'Ver',
@@ -466,11 +470,11 @@
     'watch_desc_comments_page' => 'Notificar sobre alterações na página e novos comentários.',
     'watch_change_default' => 'Alterar preferências padrão de notificação',
     'watch_detail_ignore' => 'Ignorar notificações',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
+    'watch_detail_new' => 'A observar novas páginas',
+    'watch_detail_updates' => 'A observar novas páginas e atualizações',
+    'watch_detail_comments' => 'A observar novas páginas, atualizações e comentários',
+    'watch_detail_parent_book' => 'A observar via livro pai',
     'watch_detail_parent_book_ignore' => 'A ignorar através do livro pai',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_detail_parent_chapter' => 'A observar via capítulo pai',
+    'watch_detail_parent_chapter_ignore' => 'A ignorar via capítulo pai',
 ];
diff --git a/lang/pt/errors.php b/lang/pt/errors.php
index b337005e14f..d6e92290cd4 100644
--- a/lang/pt/errors.php
+++ b/lang/pt/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'Um utilizador com o endereço de e-mail :email já existe mas com credenciais diferentes.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Não foi possível registar a conta de utilizador com os detalhes fornecidos',
     'email_already_confirmed' => 'E-mail já foi confirmado. Tente iniciar sessão.',
     'email_confirmation_invalid' => 'Este token de confirmação não é válido ou já foi utilizado. Por favor, tente registar-se novamente.',
     'email_confirmation_expired' => 'O token de confirmação já expirou. Um novo e-mail foi enviado.',
@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Social driver não encontrado',
     'social_driver_not_configured' => 'Os seus parâmetros sociais de :socialAccount não estão corretamente configurados.',
     'invite_token_expired' => 'Este link de convite expirou. Alternativamente, pode tentar redefinir a senha da sua conta.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'Não foi possível encontrar um utilizador para esta ação.',
 
     // System
     'path_not_writable' => 'O caminho do arquivo :filePath não pôde ser carregado. Certifique-se de que tem permissões de escrita no servidor.',
@@ -51,9 +51,9 @@
     'image_upload_error' => 'Ocorreu um erro no carregamento da imagem',
     'image_upload_type_error' => 'O tipo de imagem enviada é inválida',
     'image_upload_replace_type' => 'A imagem de substituição deverá ser do mesmo tipo que a anterior',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
+    'image_upload_memory_limit' => 'Não foi possível processar o carregamento da imagem e/ou criar miniaturas devido a limites de recursos do sistema.',
+    'image_thumbnail_memory_limit' => 'Não foi possível criar variações de tamanho de imagem devido a limites de recursos do sistema.',
+    'image_gallery_thumbnail_memory_limit' => 'Não foi possível criar miniaturas da galeria devido a limites de recursos do sistema.',
     'drawing_data_not_found' => 'Dados de desenho não puderam ser carregados. Talvez o arquivo de desenho não exista mais ou não tenha permissão para aceder-lhe.',
 
     // Attachments
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Não pode excluir o único administrador',
     'users_cannot_delete_guest' => 'Não pode excluir o usuário convidado',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Não foi possível criar o utilizador, pois o envio do endereço eletrónico de convite falhou',
 
     // Roles
     'role_cannot_be_edited' => 'Este cargo não pode ser editado',
@@ -106,16 +106,17 @@
     'back_soon' => 'Voltaremos em breve.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Não foi possível ler o ficheiro ZIP.',
+    'import_zip_cant_decode_data' => 'Não foi possível encontrar nem descodificar o conteúdo do ficheiro ZIP data.json.',
+    'import_zip_no_data' => 'Os dados do ficheiro ZIP não contêm o conteúdo esperado de livro, capítulo ou página.',
+    'import_zip_data_too_large' => 'O conteúdo do ficheiro ZIP data.json excede o tamanho máximo de upload definido para a aplicação.',
+    'import_validation_failed' => 'A importação do ficheiro ZIP não foi validada devido a erros:',
+    'import_zip_failed_notification' => 'Não foi possível importar o ficheiro ZIP.',
+    'import_perms_books' => 'Não dispõe das permissões necessárias para criar livros.',
+    'import_perms_chapters' => 'Não dispõe das permissões necessárias para criar capítulos.',
+    'import_perms_pages' => 'Não dispõe das permissões necessárias para criar páginas.',
+    'import_perms_images' => 'Não dispõe das permissões necessárias para criar imagens.',
+    'import_perms_attachments' => 'Não dispõe das permissões necessárias para criar anexos.',
 
     // API errors
     'api_no_authorization_found' => 'Nenhum token de autorização encontrado na requisição',
@@ -124,10 +125,11 @@
     'api_incorrect_token_secret' => 'O segredo fornecido para o token de API usado está incorreto',
     'api_user_no_api_permission' => 'O proprietário do token de API utilizado não tem permissão para fazer requisições de API',
     'api_user_token_expired' => 'O token de autenticação expirou',
+    'api_cookie_auth_only_get' => 'Ao utilizar a API com autenticação baseada em “cookies”, apenas são permitidos pedidos GET',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Erro lançado ao enviar um e-mail de teste:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'O URL não corresponde aos "hosts" SSR permitidos configurados',
 ];
diff --git a/lang/pt/notifications.php b/lang/pt/notifications.php
index 1243c6680f4..14beff712eb 100644
--- a/lang/pt/notifications.php
+++ b/lang/pt/notifications.php
@@ -11,9 +11,11 @@
     'updated_page_subject' => 'Página atualizada: :pageName',
     'updated_page_intro' => 'Uma página foi atualizada em :appName:',
     'updated_page_debounce' => 'Para evitar um grande volume de notificações, durante algum tempo não serão enviadas notificações de edições futuras para esta página através do mesmo editor.',
+    'comment_mention_subject' => 'Foi mencionado num comentário na página: :pageName',
+    'comment_mention_intro' => 'Foi mencionado num comentário no :appName:',
 
     'detail_page_name' => 'Nome da Página:',
-    'detail_page_path' => 'Page Path:',
+    'detail_page_path' => 'Caminho da página:',
     'detail_commenter' => 'Comentador:',
     'detail_comment' => 'Comentário:',
     'detail_created_by' => 'Criado Por:',
diff --git a/lang/pt/preferences.php b/lang/pt/preferences.php
index 860eec645bc..6a6e3570d9a 100644
--- a/lang/pt/preferences.php
+++ b/lang/pt/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'As suas preferências de atalhos foram guardadas!',
     'shortcuts_overview_desc' => 'Gerir atalhos do teclado que podem ser usados para navegar pela interface do utilizador.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Preferências das Notificações',
     'notifications_desc' => 'Controlar as notificações via correio eletrónico quando certas atividades são executadas pelo sistema.',
     'notifications_opt_own_page_changes' => 'Notificar quando páginas que possuo sofrem alterações',
     'notifications_opt_own_page_comments' => 'Notificar quando comentam páginas que possuo',
+    'notifications_opt_comment_mentions' => 'Notificar-me quando for mencionado num comentário',
     'notifications_opt_comment_replies' => 'Notificar respostas aos meus comentários',
     'notifications_save' => 'Guardar preferências',
     'notifications_update_success' => 'Preferências de notificação foram atualizadas!',
@@ -42,7 +64,7 @@
     'profile_email_no_permission' => 'Infelizmente você não tem permissão para alterar seu correio eletrônico. Se você quiser mudar isso, você precisa pedir a um administrador para alterar por você.',
     'profile_avatar_desc' => 'Selecione uma imagem que será usada para lhe representar aos outros usuários do sistema. Idealmente, esta imagem deve ser quadrada e sobre 256px em largura e altura.',
     'profile_admin_options' => 'Opções de administrador',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile_admin_options_desc' => 'Poderá encontrar opções adicionais de nível de administrador, como as destinadas a gerir a atribuição de funções, na sua conta de utilizador, na secção "Definições > Utilizadores" da aplicação.',
 
     'delete_account' => 'Excluir Conta',
     'delete_my_account' => 'Excluir a Minha Conta',
diff --git a/lang/pt/settings.php b/lang/pt/settings.php
index 0c765fb9851..b687d301f6d 100644
--- a/lang/pt/settings.php
+++ b/lang/pt/settings.php
@@ -75,34 +75,36 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nenhuma restrição definida',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
+    'sorting' => 'Listas e ordenação',
+    'sorting_book_default' => 'Regra de ordenação padrão dos livros',
+    'sorting_book_default_desc' => 'Selecione a regra de ordenação predefinida a aplicar aos novos livros. Isto não afetará os livros existentes e pode ser substituído individualmente para cada livro.',
+    'sorting_rules' => 'Regras de Ordenação',
+    'sorting_rules_desc' => 'Trata-se de operações de ordenação predefinidas que podem ser aplicadas ao conteúdo do sistema.',
+    'sort_rule_assigned_to_x_books' => 'Atribuído a: :count Livro|Atribuído a: :count Livros',
+    'sort_rule_create' => 'Criar Regra de Ordenação',
+    'sort_rule_edit' => 'Editar Regra de Ordenação',
+    'sort_rule_delete' => 'Eliminar Regra de Ordenação',
+    'sort_rule_delete_desc' => 'Remova esta regra de ordenação do sistema. Os livros que utilizam esta ordenação voltarão a ser ordenados manualmente.',
+    'sort_rule_delete_warn_books' => 'Esta regra de ordenação é atualmente utilizada em :count livro(s). Tem a certeza de que deseja eliminar isto?',
+    'sort_rule_delete_warn_default' => 'Esta regra de ordenação é atualmente utilizada em livros. Tem a certeza de que deseja eliminar isto?',
+    'sort_rule_details' => 'Detalhes de Regras de Ordenação',
+    'sort_rule_details_desc' => 'Defina um nome para esta regra de ordenação, que aparecerá nas listas quando os utilizadores selecionarem uma opção de ordenação.',
+    'sort_rule_operations' => 'Operações de Ordenação',
+    'sort_rule_operations_desc' => 'Configure as ações de ordenação a executar, selecionando-as na lista de operações disponíveis. Quando utilizadas, as operações serão aplicadas por ordem, de cima para baixo. Quaisquer alterações efetuadas aqui serão aplicadas a todos os livros atribuídos quando se guardar.',
+    'sort_rule_available_operations' => 'Operações Disponíveis',
+    'sort_rule_available_operations_empty' => 'Não há operações pendentes',
+    'sort_rule_configured_operations' => 'Operações Configuradas',
+    'sort_rule_configured_operations_empty' => 'Operações de arrastar/adicionar a partir da lista "Operações Disponíveis"',
     'sort_rule_op_asc' => '(Asc)',
     'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_name' => 'Nome - Alfabético',
+    'sort_rule_op_name_numeric' => 'Nome - Numérico',
+    'sort_rule_op_created_date' => 'Data de criação',
+    'sort_rule_op_updated_date' => 'Data de atualização',
+    'sort_rule_op_chapters_first' => 'Capítulos: Primeiro',
+    'sort_rule_op_chapters_last' => 'Capítulos: Últimos',
+    'sorting_page_limits' => 'Limites de Exibição por Página',
+    'sorting_page_limits_desc' => 'Defina o número de itens a apresentar por página nas várias listas do sistema. Normalmente, um número mais baixo proporciona melhor desempenho, enquanto um número mais elevado evita a necessidade de percorrer várias páginas. É recomendado utilizar um múltiplo de 6.',
 
     // Maintenance settings
     'maint' => 'Manutenção',
@@ -139,7 +141,7 @@
     'recycle_bin_contents_empty' => 'A reciclagem está atualmente vazia',
     'recycle_bin_empty' => 'Esvaziar Reciclagem',
     'recycle_bin_empty_confirm' => 'Isto irá destruir permanentemente todos os itens na reciclagem inclusive o conteúdo de cada item. Tem certeza de que a deseja esvaziar?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Esta ação irá eliminar definitivamente este item do sistema, com quaisquer elementos secundários listados abaixo, e não será possível recuperar este conteúdo. Tem a certeza de que deseja eliminar definitivamente este item?',
     'recycle_bin_destroy_list' => 'Itens a serem Destruídos',
     'recycle_bin_restore_list' => 'Itens a serem Restaurados',
     'recycle_bin_restore_confirm' => 'Esta ação irá restaurar o item excluído, inclusive quaisquer elementos filhos, para o seu local original. Se a localização original tiver, entretanto, sido eliminada e estiver agora na reciclagem, o item pai também precisará de ser restaurado.',
@@ -192,17 +194,21 @@
     'role_access_api' => 'Aceder à API do sistema',
     'role_manage_settings' => 'Gerir as configurações da aplicação',
     'role_export_content' => 'Exportar conteúdo',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importar conteúdo',
     'role_editor_change' => 'Alterar editor de página',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => 'Receber e gerir notificações',
+    'role_permission_note_users_and_roles' => 'Tecnicamente, estas permissões também permitirão visualizar e pesquisar utilizadores e papéis no sistema.',
     'role_asset' => 'Permissões de Ativos',
     'roles_system_warning' => 'Esteja ciente de que o acesso a qualquer uma das três permissões acima pode permitir que um utilizador altere os seus próprios privilégios ou privilégios de outros no sistema. Apenas atribua cargos com essas permissões a utilizadores de confiança.',
     'role_asset_desc' => 'Estas permissões controlam o acesso padrão para os ativos dentro do sistema. Permissões em Livros, Capítulos e Páginas serão sobrescritas por estas permissões.',
     'role_asset_admins' => 'Os administradores recebem automaticamente acesso a todo o conteúdo, mas estas opções podem mostrar ou ocultar as opções da Interface de Usuário.',
     'role_asset_image_view_note' => 'Isto está relacionado com a visibilidade do gerenciador de imagens. O acesso real dos arquivos de imagem enviados dependerá da opção de armazenamento de imagens do sistema.',
+    'role_asset_users_note' => 'Tecnicamente, estas permissões também permitirão visualizar e pesquisar utilizadores no sistema.',
     'role_all' => 'Todos',
     'role_own' => 'Próprio',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlado pelo ativo para o qual eles são enviados',
+    'role_controlled_by_page_delete' => 'Controlado pelas permissões de eliminação de páginas',
     'role_save' => 'Guardar Cargo',
     'role_users' => 'Utilizadores com este cargo',
     'role_users_none' => 'Nenhum utilizador está atualmente vinculado a este cargo',
@@ -224,8 +230,8 @@
     'users_send_invite_text' => 'Pode escolher enviar a este utilizador um convite por e-mail que o possibilitará definir a sua própria palavra-passe, ou defina você mesmo uma.',
     'users_send_invite_option' => 'Enviar convite por e-mail',
     'users_external_auth_id' => 'ID de Autenticação Externa',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'Quando se utiliza um sistema de autenticação externo (como SAML2, OIDC ou LDAP), este é o ID que associa este utilizador do BookStack à conta do sistema de autenticação. Pode ignorar este campo se estiver a utilizar a autenticação padrão baseada no e-mail.',
+    'users_password_warning' => 'Preencha os campos abaixo apenas se pretender alterar a palavra-passe deste utilizador.',
     'users_system_public' => 'Este utilizador representa quaisquer convidados que visitam a aplicação. Não pode ser utilizado para efetuar autenticação, mas é automaticamente atribuído.',
     'users_delete' => 'Eliminar Utilizador',
     'users_delete_named' => 'Eliminar :userName',
@@ -241,7 +247,7 @@
     'users_preferred_language' => 'Linguagem de Preferência',
     'users_preferred_language_desc' => 'Esta opção irá alterar o idioma utilizado para a interface de utilizador da aplicação. Isto não afetará nenhum conteúdo criado por utilizadores.',
     'users_social_accounts' => 'Contas Sociais',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Ver o estado das contas sociais associadas a este utilizador. As contas sociais podem ser utilizadas em complemento ao sistema de autenticação principal para aceder ao sistema.',
     'users_social_accounts_info' => 'Aqui pode ligar outras contas para acesso mais rápido. Desligar uma conta não retira a possibilidade de acesso usando-a. Para revogar o acesso ao perfil através da conta social, você deverá fazê-lo na sua conta social.',
     'users_social_connect' => 'Contas Associadas',
     'users_social_disconnect' => 'Dissociar Conta',
@@ -250,7 +256,7 @@
     'users_social_connected' => 'A conta:socialAccount foi associada com sucesso ao seu perfil.',
     'users_social_disconnected' => 'A conta:socialAccount foi dissociada com sucesso de seu perfil.',
     'users_api_tokens' => 'Tokens de API',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'Crie e faça a gestão dos tokens de acesso utilizados para autenticação na API REST do BookStack. As permissões para a API são geridas através do utilizador a quem o token pertence.',
     'users_api_tokens_none' => 'Nenhum token de API foi criado para este utilizador',
     'users_api_tokens_create' => 'Criar Token',
     'users_api_tokens_expires' => 'Expira',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Configure a autenticação multi-fatores como uma camada extra de segurança para sua conta de utilizador.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar Métodos',
+    'users_mfa_reset' => 'Redefinir métodos de autenticação multifator',
+    'users_mfa_reset_desc' => 'Isto irá reiniciar e eliminar todos os métodos de autenticação multifator configurados para este utilizador. Se a autenticação multifator for exigida por alguma das suas funções, ser-lhe-á solicitado que configure novos métodos no seu próximo início de sessão.',
+    'users_mfa_reset_confirm' => 'Tem a certeza de que deseja repor a autenticação multifator para este utilizador?',
 
     // API Tokens
     'user_api_token_create' => 'Criar Token de API',
@@ -308,13 +317,13 @@
     'webhooks_last_error_message' => 'Última mensagem de erro:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Licenças',
+    'licenses_desc' => 'Esta página apresenta informações sobre as licenças do BookStack, bem como sobre os projetos e bibliotecas utilizados no BookStack. Muitos dos projetos aqui listados só podem ser utilizados num contexto de desenvolvimento.',
+    'licenses_bookstack' => 'Licença de BookStack',
+    'licenses_php' => 'Licenças de Bibliotecas PHP',
+    'licenses_js' => 'Licenças de Bibliotecas de JavaScript',
+    'licenses_other' => 'Outras Licenças',
+    'license_details' => 'Detalhes de Licença',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/pt/validation.php b/lang/pt/validation.php
index df414c992e2..a53b16d019b 100644
--- a/lang/pt/validation.php
+++ b/lang/pt/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'O campo :attribute deve conter apenas letras e números.',
     'array'                => 'O campo :attribute deve ser uma lista(array).',
     'backup_codes'         => 'O código fornecido não é válido ou já foi utilizado.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'O campo :attribute deve ser uma data anterior à data :date.',
     'between'              => [
         'numeric' => 'O campo :attribute deve estar entre :min e :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'O campo :attribute deve ser verdadeiro ou falso.',
     'confirmed'            => 'O campo :attribute não é igual à sua confirmação.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'O campo :attribute não está num formato de data válido.',
     'date_format'          => 'O campo :attribute não tem a formatação :format.',
     'different'            => 'O campo :attribute e o campo :other devem ser diferentes.',
@@ -105,10 +107,11 @@
     'url'                  => 'O formato da URL :attribute é inválido.',
     'uploaded'             => 'O arquivo não pôde ser carregado. O servidor pode não aceitar arquivos deste tamanho.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => 'O :attribute deve referenciar um ficheiro dentro do ZIP.',
+    'zip_file_size' => 'O ficheiro :attribute não deve exceder :size MB.',
+    'zip_file_mime' => 'O :attribute deve referenciar um ficheiro do tipo :validTypes, encontrado em :foundType.',
+    'zip_model_expected' => 'Era esperado um objeto de dados, mas foi encontrado “:type”.',
+    'zip_unique' => 'O :attribute deve ser único para o tipo de objeto dentro do ficheiro ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/pt_BR/activities.php b/lang/pt_BR/activities.php
index 2a2d173c790..dbadcf1cc22 100644
--- a/lang/pt_BR/activities.php
+++ b/lang/pt_BR/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Usuário atualizado com sucesso',
     'user_delete' => 'usuário excluído',
     'user_delete_notification' => 'Usuário removido com sucesso',
+    'user_mfa_reset' => 'redefinir MFA para usuário',
+    'user_mfa_reset_notification' => 'Redefinir métodos de autenticação de múltiplos fatores',
 
     // API Tokens
     'api_token_create' => 'token de API criado',
diff --git a/lang/pt_BR/auth.php b/lang/pt_BR/auth.php
index b5fd974aa20..f5ae0cd550c 100644
--- a/lang/pt_BR/auth.php
+++ b/lang/pt_BR/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'As credenciais fornecidas não puderam ser validadas em nossos registros.',
     'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.',
+    'mfa_throttle' => 'Muitas tentativas de verificação de multifatores. Por favor tente novamente em :seconds segundos.',
 
     // Login & Register
     'sign_up' => 'Criar Conta',
@@ -20,6 +21,9 @@
     'username' => 'Nome de Usuário',
     'email' => 'E-mail',
     'password' => 'Senha',
+    'password_new' => 'Nova Senha',
+    'password_new_confirm' => 'Confirme a Nova Senha',
+    'password_current' => 'Confirme a Senha Atual',
     'password_confirm' => 'Confirmar Senha',
     'password_hint' => 'Deve conter pelo menos 8 caracteres',
     'forgot_password' => 'Esqueceu a senha?',
@@ -89,7 +93,7 @@
     'mfa_setup_action' => 'Configurações',
     'mfa_backup_codes_usage_limit_warning' => 'Você tem menos de 5 códigos de backup restantes, Por favor, gere e armazene um novo conjunto antes de esgotar suas opções de códigos de backup para evitar estar bloqueado para fora da sua conta.',
     'mfa_option_totp_title' => 'Aplicativo Móvel',
-    'mfa_option_totp_desc' => 'Para usar a autenticação multi-fator, você precisará de um aplicativo móvel que suporte TOTP como o Google Authenticator, Authy ou o Microsoft Authenticator.',
+    'mfa_option_totp_desc' => 'Para usar a autenticação multi-fator, você precisará de um aplicativo móvel que suporte TOTP como o Google Authenticator, Authy, Microsoft Authenticator ou Proton Authenticator.',
     'mfa_option_backup_codes_title' => 'Códigos de backup',
     'mfa_option_backup_codes_desc' => 'Gera um conjunto de códigos de backup de uso único que você inserirá no login para verificar sua identidade. Certifique-se de armazená-los em um local seguro e protegido.',
     'mfa_gen_confirm_and_enable' => 'Confirmar e habilitar',
diff --git a/lang/pt_BR/common.php b/lang/pt_BR/common.php
index b4ff95e99ed..d0edb74dca6 100644
--- a/lang/pt_BR/common.php
+++ b/lang/pt_BR/common.php
@@ -89,6 +89,8 @@
     'status_inactive' => 'Inativo',
     'never' => 'Nunca',
     'none' => 'Nenhum',
+    'move_left' => 'Mover para Esquerda',
+    'move_right' => 'Mover para Direita',
 
     // Header
     'homepage' => 'Página inicial',
diff --git a/lang/pt_BR/entities.php b/lang/pt_BR/entities.php
index 5a948c8dcd8..fafdb80d5ff 100644
--- a/lang/pt_BR/entities.php
+++ b/lang/pt_BR/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Mova capítulos e páginas de um livro para reorganizar seu conteúdo. É possível acrescentar outros livros, o que permite uma movimentação fácil de capítulos e páginas entre livros. Opcionalmente, uma regra de ordenação automática pode ser definida para ordenar automaticamente o conteúdo deste livro após alterações.',
     'books_sort_auto_sort' => 'Opção de ordenação automática',
     'books_sort_auto_sort_active' => 'Ordenação automática ativa: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Regras de ordenação automática podem ser criadas na área de configurações "Lista e Classificação" por um usuário com as permissões relevantes.',
     'books_sort_named' => 'Ordenar Livro :bookName',
     'books_sort_name' => 'Ordernar por Nome',
     'books_sort_created' => 'Ordenar por Data de Criação',
@@ -218,7 +219,7 @@
     'chapters_permissions_active' => 'Permissões de Capítulo Ativas',
     'chapters_permissions_success' => 'Permissões de Capítulo Atualizadas',
     'chapters_search_this' => 'Pesquisar neste Capítulo',
-    'chapter_sort_book' => 'Classificar livro',
+    'chapter_sort_book' => 'Ordenar livro',
 
     // Pages
     'page' => 'Página',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '',
+    'page_contents' => 'Conteúdos da página',
+    'page_contents_none' => 'Nenhum título foi encontrado no conteúdo da página.',
+    'page_contents_info' => 'O menu de conteúdo é gerado a partir de qualquer formato de cabeçalho usado na página.',
     'page_tags' => 'Marcadores de Página',
     'chapter_tags' => 'Marcadores de Capítulo',
     'book_tags' => 'Marcadores de Livro',
diff --git a/lang/pt_BR/errors.php b/lang/pt_BR/errors.php
index 8dab893c799..3287154331b 100644
--- a/lang/pt_BR/errors.php
+++ b/lang/pt_BR/errors.php
@@ -110,6 +110,7 @@
     'import_zip_cant_read' => 'Não foi possível ler o arquivo ZIP.',
     'import_zip_cant_decode_data' => 'Não foi possível encontrar e decodificar o conteúdo ZIP data.json.',
     'import_zip_no_data' => 'Os dados do arquivo ZIP não têm o conteúdo esperado livro, capítulo ou página.',
+    'import_zip_data_too_large' => 'O conteúdo ZIP data.json excede o tamanho máximo de upload configurado para a aplicação.',
     'import_validation_failed' => 'Falhou na validação da importação do ZIP com erros:',
     'import_zip_failed_notification' => 'Falhou ao importar arquivo ZIP.',
     'import_perms_books' => 'Você não tem as permissões necessárias para criar livros.',
@@ -125,6 +126,7 @@
     'api_incorrect_token_secret' => 'O segredo fornecido para o código de API usado está incorreto',
     'api_user_no_api_permission' => 'O proprietário do código de API utilizado não tem permissão para fazer requisições de API',
     'api_user_token_expired' => 'O código de autenticação expirou',
+    'api_cookie_auth_only_get' => 'Somente solicitações GET são permitidas ao usar a API com autenticação baseada em cookies',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Erro encontrado ao enviar uma mensagem eletrônica de teste:',
diff --git a/lang/pt_BR/notifications.php b/lang/pt_BR/notifications.php
index 6397b20e5fe..7f6c100b1d3 100644
--- a/lang/pt_BR/notifications.php
+++ b/lang/pt_BR/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Página atualizada: :pageName',
     'updated_page_intro' => 'Uma página foi atualizada em :appName:',
     'updated_page_debounce' => 'Para prevenir notificações em massa, por enquanto notificações não serão enviadas para você para próximas edições nessa página pelo mesmo editor.',
+    'comment_mention_subject' => 'Você foi mencionado em um comentário na página: :pageName',
+    'comment_mention_intro' => 'Você foi mencionado em um comentário sobre :appName:',
 
     'detail_page_name' => 'Nome da Página:',
     'detail_page_path' => 'Caminho da Página:',
diff --git a/lang/pt_BR/preferences.php b/lang/pt_BR/preferences.php
index e0b79ff0644..876ed25e58d 100644
--- a/lang/pt_BR/preferences.php
+++ b/lang/pt_BR/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'As preferências de atalho foram atualizadas!',
     'shortcuts_overview_desc' => 'Gerencie os atalhos de teclado que você pode usar para navegar na interface de usuário do sistema.',
 
+    'interface' => 'Preferências da interface',
+    'interface_desc' => 'Aqui você pode encontrar opções para personalizar a aparência da interface do usuário do aplicativo.',
+    'interface_display_mode' => 'Modo de Exibição',
+    'interface_display_mode_desc' => 'Escolha se o aplicativo deve mostrar no modo escuro ou claro. Isso também pode ser alternado na tela inicial ou através do menu de perfil na barra de cabeçalho.',
+    'layouts' => 'Preferências de Leiaute UI',
+    'layouts_desc' => 'Personalize o layout das seções mostradas na interface do usuário para uma gama de visualizações.',
+    'layout_edit' => 'Editar Leiaute',
+    'layout_edit_desc' => 'Arraste e solte seções, ou use o menu de ação encontrado em cada, para reconfigurar quais seções são mostradas dentro deste leiaute na interface e onde elas são exibidas.',
+    'layout_edit_column_hint' => 'Quando visualizado em tamanhos de tela menores, seções de colunas à direita serão empilhadas nas seções superiores das colunas à esquerda.',
+    'layout_edit_save' => 'Salvar Leiaute',
+    'layout_edit_layouts' => 'Leiautes',
+    'layout_edit_back_to_preferences' => 'Voltar para preferências',
+    'layout_edit_left' => 'Esquerda',
+    'layout_edit_right' => 'Direita',
+    'layout_edit_center' => 'Centro',
+    'layout_edit_unused' => 'Não usado',
+    'layout_edit_empty' => 'Nenhuma seção para exibir',
+    'layout_edit_reset_to_defaults' => 'Restaurar padrão',
+    'layout_update_success' => 'As preferências de leiaute foram atualizadas!',
+    'layout_reset_success' => 'As preferências de leiaute foram redefinidas!',
+
     'notifications' => 'Preferências de notificação',
     'notifications_desc' => 'Controle as notificações por e-mail que você recebe quando uma determinada atividade é executada no sistema.',
     'notifications_opt_own_page_changes' => 'Notificar quando houver alterações em páginas que eu possuo',
     'notifications_opt_own_page_comments' => 'Notificar comentários nas páginas que eu possuo',
+    'notifications_opt_comment_mentions' => 'Notificar quando eu for mencionado em um comentário',
     'notifications_opt_comment_replies' => 'Notificar ao responder aos meus comentários',
     'notifications_save' => 'Salvar Preferências',
     'notifications_update_success' => 'Preferências de notificação foram atualizadas!',
diff --git a/lang/pt_BR/settings.php b/lang/pt_BR/settings.php
index b940e57d4c0..dc062b34e2d 100644
--- a/lang/pt_BR/settings.php
+++ b/lang/pt_BR/settings.php
@@ -16,7 +16,7 @@
     'app_customization' => 'Customização',
     'app_features_security' => 'Recursos & Segurança',
     'app_name' => 'Nome da Aplicação',
-    'app_name_desc' => 'Esse nome será mostrado no cabeçalho e em e-mails.',
+    'app_name_desc' => 'Esse nome será mostrado no cabeçalho e nos e-mails.',
     'app_name_header' => 'Mostrar o nome no cabeçalho',
     'app_public_access' => 'Acesso Público',
     'app_public_access_desc' => 'Habilitar esta opção irá permitir que visitantes, que não estão logados, acessem o conteúdo em sua instância do BookStack.',
@@ -29,14 +29,14 @@
     'app_default_editor' => 'Editor de Página Padrão',
     'app_default_editor_desc' => 'Selecione qual editor será usado por padrão ao editar novas páginas. Isso pode ser substituído em um nível de página onde é permitido.',
     'app_custom_html' => 'Conteúdo customizado para <head> HTML',
-    'app_custom_html_desc' => 'Quaisquer conteúdos aqui adicionados serão inseridos no final da seção <head> de cada página. Essa é uma maneira útil de sobrescrever estilos e adicionar códigos de análise de site.',
-    'app_custom_html_disabled_notice' => 'O conteúdo customizado do <head> HTML está desabilitado nesta página de configurações, para garantir que quaisquer alterações danosas possam ser revertidas.',
+    'app_custom_html_desc' => 'Qualquer conteúdo adicionado aqui será inserido ao final do <head> HTML de todas as páginas. Isso é útil para sobrescrever estilos e adicionar códigos de análise e estatística do site.',
+    'app_custom_html_disabled_notice' => 'O conteúdo customizado do <head> HTML está desabilitado nesta página de configurações para garantir que quaisquer alterações danosas possam ser revertidas.',
     'app_logo' => 'Logo da Aplicação',
     'app_logo_desc' => 'Isto é usado na barra de cabeçalho do aplicativo, entre outras áreas. Esta imagem deve ter 86px de altura. Imagens grandes serão reduzidas.',
     'app_icon' => 'Ícone do Aplicativo',
     'app_icon_desc' => 'Este ícone é usado para guias e ícones de atalhos do navegador. Deve ser uma imagem PNG quadrada de 256px.',
     'app_homepage' => 'Página Inicial',
-    'app_homepage_desc' => 'Selecione uma opção para ser exibida como página inicial em vez da padrão. Permissões de página serão ignoradas para as páginas selecionadas.',
+    'app_homepage_desc' => 'Selecione uma opção para ser exibida como página inicial no lugar da página padrão. Permissões de página serão ignoradas para as páginas selecionadas.',
     'app_homepage_select' => 'Selecione uma página',
     'app_footer_links' => 'Links do Rodapé',
     'app_footer_links_desc' => 'Adicionar links para mostrar dentro do rodapé do site. Estes serão exibidos na parte inferior da maioria das páginas, incluindo aqueles que não necessitam de login. Você pode usar uma etiqueta de "trans::<key>" para usar traduções definidas pelo sistema. Por exemplo: Usando "trans::common.privacy_policy" fornecerá o texto traduzido "Política de Privacidade" e "trans::common.terms_of_service" fornecerá o texto traduzido "Termos de Serviço".',
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nenhuma restrição definida',
 
     // Sorting Settings
-    'sorting' => 'Ordenação',
-    'sorting_book_default' => 'Ordenação padrão de livros',
+    'sorting' => 'Listas e classificações',
+    'sorting_book_default' => 'Regra padrão de classificação de livros',
     'sorting_book_default_desc' => 'Selecione a regra de ordenação padrão a ser aplicada a novos livros. Isso não afetará os livros existentes e pode ser substituído para cada livro individualmente.',
     'sorting_rules' => 'Regras de ordenação',
     'sorting_rules_desc' => 'Estas são operações de ordenação pré-definidas que podem ser aplicadas a conteúdos no sistema.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Data de Atualização',
     'sort_rule_op_chapters_first' => 'Capítulos Primeiro',
     'sort_rule_op_chapters_last' => 'Capítulos por Último',
+    'sorting_page_limits' => 'Limites de exibição por página',
+    'sorting_page_limits_desc' => 'Defina quantos itens mostrar por página em várias listas no sistema. Normalmente, uma quantidade menor será mais eficiente, enquanto uma quantidade maior evita a necessidade de clicar em várias páginas. Recomenda-se usar um múltiplo de 6.',
 
     // Maintenance settings
     'maint' => 'Manutenção',
@@ -181,7 +183,7 @@
     'role_details' => 'Detalhes do Perfil',
     'role_name' => 'Nome do Perfil',
     'role_desc' => 'Breve Descrição do Perfil',
-    'role_mfa_enforced' => 'Requer Autenticação Multi-fator',
+    'role_mfa_enforced' => 'Requer Autenticação Multifator',
     'role_external_auth_id' => 'IDs de Autenticação Externa',
     'role_system' => 'Permissões do Sistema',
     'role_manage_users' => 'Gerenciar usuários',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Importar conteúdo',
     'role_editor_change' => 'Alterar página de edição',
     'role_notifications' => 'Receber e gerenciar notificações',
+    'role_permission_note_users_and_roles' => 'Essas permissões tecnicamente também fornecerão visibilidade e busca de usuários e perfis no sistema.',
     'role_asset' => 'Permissões de Ativos',
     'roles_system_warning' => 'Esteja ciente de que o acesso a qualquer uma das três permissões acima pode permitir que um usuário altere seus próprios privilégios ou privilégios de outros usuários no sistema. Apenas atribua perfis com essas permissões para usuários confiáveis.',
     'role_asset_desc' => 'Essas permissões controlam o acesso padrão para os ativos dentro do sistema. Permissões em Livros, Capítulos e Páginas serão sobrescritas por essas permissões.',
     'role_asset_admins' => 'Administradores recebem automaticamente acesso a todo o conteúdo, mas essas opções podem mostrar ou ocultar as opções da Interface de Usuário.',
     'role_asset_image_view_note' => 'Isso está relacionado à visibilidade no gerenciador de imagens. O acesso real dos arquivos de imagem carregados dependerá da opção de armazenamento de imagem do sistema.',
+    'role_asset_users_note' => 'Essas permissões tecnicamente também fornecerão visibilidade e busca de usuários do sistema.',
     'role_all' => 'Todos',
     'role_own' => 'Próprio',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlado pelos ativos nos quais o upload foi realizado',
+    'role_controlled_by_page_delete' => 'Controlado pelas permissões de exclusão de página',
     'role_save' => 'Salvar Perfil',
     'role_users' => 'Usuários com este perfil',
     'role_users_none' => 'Nenhum usuário está atualmente vinculado a este perfil',
@@ -255,10 +261,13 @@
     'users_api_tokens_create' => 'Criar Token',
     'users_api_tokens_expires' => 'Expira',
     'users_api_tokens_docs' => 'Documentação da API',
-    'users_mfa' => 'Autenticação de Múltiplos Fatores',
-    'users_mfa_desc' => 'A autenticação multi-fator adiciona outra camada de segurança à sua conta.',
+    'users_mfa' => 'Autenticação Multifator',
+    'users_mfa_desc' => 'A autenticação multifator adiciona uma camada extra de segurança à sua conta.',
     'users_mfa_x_methods' => ':count método configurado|:count métodos configurados',
     'users_mfa_configure' => 'Configurar Métodos',
+    'users_mfa_reset' => 'Redefiner Métodos de Autenticação Multifator',
+    'users_mfa_reset_desc' => 'Isto irá redefinir e limpar todos os métodos de autenticação multifator configurados para este usuário. Se a autenticação multifator for exigida por qualquer uma de suas funções, você será solicitado a configurar novos métodos em seu próximo login.',
+    'users_mfa_reset_confirm' => 'Você tem certeza que deseja remover o método de autenticação multifator?',
 
     // API Tokens
     'user_api_token_create' => 'Criar Token de API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/pt_BR/validation.php b/lang/pt_BR/validation.php
index 9ddfdf2a566..205f117cfce 100644
--- a/lang/pt_BR/validation.php
+++ b/lang/pt_BR/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'O campo :attribute deve conter apenas letras e números.',
     'array'                => 'O campo :attribute deve ser uma array.',
     'backup_codes'         => 'O código fornecido não é válido ou já foi usado.',
+    'base64_uri_mime'      => 'O :attribute deve ser um URI base64 válido contendo dados de tipo :mime mime type .',
     'before'               => 'O campo :attribute deve ser uma data anterior à data :date.',
     'between'              => [
         'numeric' => 'O campo :attribute deve estar entre :min e :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'O campo :attribute deve ser verdadeiro ou falso.',
     'confirmed'            => 'O campo :attribute não é igual à sua confirmação.',
+    'current_password'     => 'Isso não corresponde à sua senha atual.',
     'date'                 => 'O campo :attribute não está em um formato de data válido.',
     'date_format'          => 'O campo :attribute não tem a formatação :format.',
     'different'            => 'O campo :attribute e o campo :other devem ser diferentes.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'O arquivo não pôde ser carregado. O servidor pode não aceitar arquivos deste tamanho.',
 
     'zip_file' => 'O :attribute precisa fazer referência a um arquivo do ZIP.',
+    'zip_file_size' => 'O arquivo :attribute não deve exceder :size MB.',
     'zip_file_mime' => 'O :attribute precisa fazer referência a um arquivo do tipo :validTypes, encontrado :foundType.',
     'zip_model_expected' => 'Objeto de dados esperado, mas ":type" encontrado.',
     'zip_unique' => 'O :attribute deve ser único para o tipo de objeto dentro do ZIP.',
diff --git a/lang/ro/activities.php b/lang/ro/activities.php
index eed5cc0832f..c00976cf710 100644
--- a/lang/ro/activities.php
+++ b/lang/ro/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Utilizator actualizat cu succes',
     'user_delete' => 'utilizator șters',
     'user_delete_notification' => 'Utilizator eliminat cu succes',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/ro/auth.php b/lang/ro/auth.php
index e02eeb4c1ba..64f4fffc25e 100644
--- a/lang/ro/auth.php
+++ b/lang/ro/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Aceste credenţiale nu se potrivesc cu înregistrările noastre.',
     'throttle' => 'Prea multe încercări de conectare. Vă rugăm să încercați din nou în :seconds secunde.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Inregistrează-te',
@@ -20,6 +21,9 @@
     'username' => 'Nume utilizator',
     'email' => 'E-mail',
     'password' => 'Parolă',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirmă parola',
     'password_hint' => 'Trebuie să aibă cel puțin 8 caractere',
     'forgot_password' => 'Ai uitat parola?',
diff --git a/lang/ro/common.php b/lang/ro/common.php
index fe4bfe8b9dd..d5afc66d608 100644
--- a/lang/ro/common.php
+++ b/lang/ro/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactiv',
     'never' => 'Niciodată',
     'none' => 'Niciunul',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Acasă',
diff --git a/lang/ro/entities.php b/lang/ro/entities.php
index ac8c9d32609..18ffd30c9e8 100644
--- a/lang/ro/entities.php
+++ b/lang/ro/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sortează cartea :bookName',
     'books_sort_name' => 'Sortează după nume',
     'books_sort_created' => 'Sortează după data creării',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Comutați bara laterală',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Etichete pagină',
     'chapter_tags' => 'Etichete capitol',
     'book_tags' => 'Etichete carte',
diff --git a/lang/ro/errors.php b/lang/ro/errors.php
index 07c295b0785..550c9c5d588 100644
--- a/lang/ro/errors.php
+++ b/lang/ro/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Secretul furnizat pentru token-ul API folosit este incorect',
     'api_user_no_api_permission' => 'Proprietarul token-ului API folosit nu are permisiunea de a efectua apeluri API',
     'api_user_token_expired' => 'Token-ul de autorizare utilizat a expirat',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Eroare la trimiterea unui e-mail de test:',
diff --git a/lang/ro/notifications.php b/lang/ro/notifications.php
index 676eeb814e8..da7f590fd71 100644
--- a/lang/ro/notifications.php
+++ b/lang/ro/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Pagina actualizată: :pageName',
     'updated_page_intro' => 'O nouă pagină a fost creată în :appName:',
     'updated_page_debounce' => 'Pentru a preveni notificări în masă, pentru un timp nu veți primi notificări suplimentare la această pagină de către același editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Nume pagină:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/ro/preferences.php b/lang/ro/preferences.php
index f7529305c82..047f7c9d761 100644
--- a/lang/ro/preferences.php
+++ b/lang/ro/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Preferințele dumneavoastră au fost actualizate!',
     'shortcuts_overview_desc' => 'Gestionați scurtăturile de tastatură pe care le puteți utiliza pentru a naviga prin interfața.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Preferințe de notificare',
     'notifications_desc' => 'Controlați notificările prin e-mail pe care le primiți atunci când o anumită activitate este efectuată în sistem.',
     'notifications_opt_own_page_changes' => 'Notifică la comentarii pe paginile pe care le dețin',
     'notifications_opt_own_page_comments' => 'Notifică la comentarii pe paginile pe care le dețin',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notifică la răspunsurile la comentariile mele',
     'notifications_save' => 'Salvează Preferințe',
     'notifications_update_success' => 'Preferințele de notificare au fost actualizate!',
diff --git a/lang/ro/settings.php b/lang/ro/settings.php
index a28dca22c57..304289df984 100644
--- a/lang/ro/settings.php
+++ b/lang/ro/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nicio restricție setată',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Mentenanţă',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Schimbă editorul de pagină',
     'role_notifications' => 'Primire și gestionare notificări',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Permisiuni active',
     'roles_system_warning' => 'Fi conștient de faptul că accesul la oricare dintre cele trei permisiuni de mai sus poate permite unui utilizator să își modifice propriile privilegii sau privilegiile altor persoane din sistem. Atribuie doar roluri cu aceste permisiuni utilizatorilor de încredere.',
     'role_asset_desc' => 'Aceste permisiuni controlează accesul implicit la activele din sistem. Permisiunile pe Cărți, Capitole și Pagini vor suprascrie aceste permisiuni.',
     'role_asset_admins' => 'Administratorilor li se acordă automat acces la tot conținutul, dar aceste opțiuni pot afișa sau ascunde opțiunile UI.',
     'role_asset_image_view_note' => 'Acest lucru se referă la vizibilitatea în managerul de imagini. Accesul efectiv al fișierelor de imagine încărcate va depinde de opțiunea de stocare a imaginilor din sistem.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Tot',
     'role_own' => 'Propriu',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlat de activele pe care sunt încărcate',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Salvare rol',
     'role_users' => 'Utilizatori cu acest rol',
     'role_users_none' => 'Nici un utilizator nu este asociat acestui rol',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Configurare autentificarea multi-factor ca un nivel suplimentar de securitate pentru contul tău de utilizator.',
     'users_mfa_x_methods' => ':count metodă configurată|:count metode configurate',
     'users_mfa_configure' => 'Configurare metode',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Creare token API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ro/validation.php b/lang/ro/validation.php
index 56a3e2e05d1..0b7ef1cf58a 100644
--- a/lang/ro/validation.php
+++ b/lang/ro/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute poate conține doar litere și cifre.',
     'array'                => ':attribute trebuie să fie un array.',
     'backup_codes'         => 'Codul furnizat nu este valid sau a fost deja folosit.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute trebuie să fie o dată înainte de :date.',
     'between'              => [
         'numeric' => ':attribute trebuie să fie între :min şi :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Câmpul :attribute trebuie să fie adevărat sau fals.',
     'confirmed'            => 'Confirmarea :attribute nu se potrivește.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nu este o dată validă.',
     'date_format'          => ':attribute nu se potrivește cu formatul :format.',
     'different'            => ':attribute și :other trebuie să fie diferite.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Fişierul nu a putut fi încărcat. Serverul nu poate accepta fişiere de această dimensiune.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/ru/activities.php b/lang/ru/activities.php
index d353b7a7640..9d08d1d4a19 100644
--- a/lang/ru/activities.php
+++ b/lang/ru/activities.php
@@ -85,12 +85,12 @@
     'webhook_delete_notification' => 'Вебхук успешно удален',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
+    'import_create' => 'создал импорт',
+    'import_create_notification' => 'Импорт успешно добавлен',
     'import_run' => 'обновлен импорт',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_run_notification' => 'Контент успешно импортирован',
+    'import_delete' => 'удалил импорт',
+    'import_delete_notification' => 'Импорт успешно удален',
 
     // Users
     'user_create' => 'создал пользователя',
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Пользователь успешно обновлен',
     'user_delete' => 'удалил пользователя',
     'user_delete_notification' => 'Пользователь успешно удален',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'создан API токен',
diff --git a/lang/ru/auth.php b/lang/ru/auth.php
index d39da119dea..b1eff23f229 100644
--- a/lang/ru/auth.php
+++ b/lang/ru/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Введенные вами данные не найдены в нашей базе.',
     'throttle' => 'Слишком много попыток входа. Пожалуйста, повторите попытку через :seconds секунд.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Регистрация',
@@ -20,6 +21,9 @@
     'username' => 'Логин',
     'email' => 'Адрес электронной почты',
     'password' => 'Пароль',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Подтверждение пароля',
     'password_hint' => 'Не менее 8 символов',
     'forgot_password' => 'Забыли пароль?',
diff --git a/lang/ru/common.php b/lang/ru/common.php
index fa9969c32af..b12a248a1b9 100644
--- a/lang/ru/common.php
+++ b/lang/ru/common.php
@@ -30,8 +30,8 @@
     'create' => 'Создание',
     'update' => 'Обновление',
     'edit' => 'Редактировать',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Архивировать',
+    'unarchive' => 'Вернуть из архива',
     'sort' => 'Сортировать',
     'move' => 'Переместить',
     'copy' => 'Скопировать',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Неактивен',
     'never' => 'Никогда',
     'none' => 'Нет',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Главная страница',
diff --git a/lang/ru/editor.php b/lang/ru/editor.php
index d26f7edfe08..da661559bd9 100644
--- a/lang/ru/editor.php
+++ b/lang/ru/editor.php
@@ -149,7 +149,7 @@
     'url' => 'URL-адрес',
     'text_to_display' => 'Текст для отображения',
     'title' => 'Заголовок',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Просмотр ссылки',
     'open_link' => 'Открыть ссылку',
     'open_link_in' => 'Открыть ссылку в...',
     'open_link_current' => 'В текущем окне',
@@ -166,8 +166,8 @@
     'about' => 'О редакторе',
     'about_title' => 'О редакторе WYSIWYG',
     'editor_license' => 'Лицензия редактора и авторские права',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Этот редактор создан с помощью :lexicalLink, распространяемый под лицензией MIT.',
+    'editor_lexical_license_link' => 'Здесь вы можете найти полную информацию о лицензии.',
     'editor_tiny_license' => 'Этот редактор собран с помощью :tinyLink, который предоставляется под MIT лицензией.',
     'editor_tiny_license_link' => 'Авторские права и подробности лицензии TinyMCE вы можете найти здесь.',
     'save_continue' => 'Сохранить страницу и продолжить',
diff --git a/lang/ru/entities.php b/lang/ru/entities.php
index 50f061115d9..d3c4230acd2 100644
--- a/lang/ru/entities.php
+++ b/lang/ru/entities.php
@@ -39,30 +39,30 @@
     'export_pdf' => 'PDF файл',
     'export_text' => 'Текстовый файл',
     'export_md' => 'Файл Markdown',
-    'export_zip' => 'Portable ZIP',
+    'export_zip' => 'Портативный ZIP',
     'default_template' => 'Шаблон страницы по умолчанию',
     'default_template_explain' => 'Назначить шаблон страницы, который будет использоваться в качестве содержимого по умолчанию для всех страниц, созданных в этом элементе. Имейте в виду, что это будет работать, только если создатель страницы имеет доступ к выбранной странице шаблона.',
     'default_template_select' => 'Выберите страницу шаблона',
     'import' => 'Импорт',
-    'import_validate' => 'Validate Import',
+    'import_validate' => 'Проверка импорта',
     'import_desc' => 'Импортировать книги, главы и страницы с помощью ZIP-файла, экспортированного из этого или другого источника. Выберите ZIP-файл, чтобы продолжить. После загрузки и проверки файла вы сможете настроить и подтвердить импорт в следующем окне.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
+    'import_zip_select' => 'Выберите ZIP файл для загрузки',
+    'import_zip_validation_errors' => 'Были обнаружены ошибки при проверке предоставленного ZIP файла:',
+    'import_pending' => 'Ожидается импорт',
+    'import_pending_none' => 'Импорт не был запущен.',
+    'import_continue' => 'Продолжить импорт',
+    'import_continue_desc' => 'Проверьте содержимое, которое должно быть импортировано из загруженного ZIP-файла. Если все готово, выполните импорт, чтобы добавить его содержимое в эту систему. Загруженный ZIP файл будет автоматически удален при успешном импорте.',
+    'import_details' => 'Детали загрузки',
+    'import_run' => 'Запустить импорт',
     'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
+    'import_uploaded_at' => 'Загружено :relativeTime',
+    'import_uploaded_by' => 'Загружено пользователем',
     'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
+    'import_location_desc' => 'Выберите целевое местоположение для импортированного содержимого. Для создания в выбранном месте необходимы соответствующие разрешения.',
     'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
+    'import_delete_desc' => 'Это приведет к удалению загруженного ZIP файла и не может быть отменено.',
+    'import_errors' => 'Ошибки импорта',
+    'import_errors_desc' => 'Во время попытки импорта произошла следующая ошибка:',
     'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
     'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
     'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
@@ -170,9 +170,10 @@
     'books_search_this' => 'Поиск в этой книге',
     'books_navigation' => 'Навигация по книге',
     'books_sort' => 'Сортировка содержимого книги',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_desc' => 'Переместите разделы и страницы в книге, чтобы изменить содержание книги. Могут быть добавлены другие книги, что позволяет легко перемещать разделы и страницы между книгами. При желании правило автоматической сортировки может быть установлено для автоматической сортировки содержимого этой книги после изменений.',
+    'books_sort_auto_sort' => 'Автосортировка',
+    'books_sort_auto_sort_active' => 'Автосортировка активна: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Правила автоматической сортировки могут быть созданы в области настроек «Список и Сортировка» пользователем с соответствующими разрешениями.',
     'books_sort_named' => 'Сортировка книги :bookName',
     'books_sort_name' => 'По имени',
     'books_sort_created' => 'По дате создания',
@@ -251,8 +252,8 @@
     'pages_edit_switch_to_markdown_clean' => 'Только Markdown (с возможными потерями форматирования)',
     'pages_edit_switch_to_markdown_stable' => 'Полное сохранение форматирования (HTML)',
     'pages_edit_switch_to_wysiwyg' => 'Переключиться в WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg' => 'Переключиться на новый WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(В бета-тестировании)',
     'pages_edit_set_changelog' => 'Задать список изменений',
     'pages_edit_enter_changelog_desc' => 'Введите краткое описание внесенных изменений',
     'pages_edit_enter_changelog' => 'Введите список изменений',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Переключить боковую панель',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Теги страницы',
     'chapter_tags' => 'Теги главы',
     'book_tags' => 'Теги книги',
@@ -397,11 +401,11 @@
     'comment' => 'Комментарий',
     'comments' => 'Комментарии',
     'comment_add' => 'Комментировать',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Нет комментариев для отображения',
     'comment_placeholder' => 'Оставить комментарий здесь',
     'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_archived_count' => ':count архивировано',
+    'comment_archived_threads' => 'Архивированные темы',
     'comment_save' => 'Сохранить комментарий',
     'comment_new' => 'Новый комментарий',
     'comment_created' => 'прокомментировал :createDiff',
@@ -410,14 +414,14 @@
     'comment_deleted_success' => 'Комментарий удален',
     'comment_created_success' => 'Комментарий добавлен',
     'comment_updated_success' => 'Комментарий обновлен',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
+    'comment_archive_success' => 'Комментарий заархивирован',
+    'comment_unarchive_success' => 'Комментарий разархивирован',
+    'comment_view' => 'Просмотреть комментарий',
+    'comment_jump_to_thread' => 'Перейти к теме',
     'comment_delete_confirm' => 'Удалить этот комментарий?',
     'comment_in_reply_to' => 'В ответ на :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
+    'comment_reference' => 'Ссылка',
+    'comment_reference_outdated' => '(Устаревшее)',
     'comment_editor_explain' => 'Вот комментарии, которые были оставлены на этой странице. Комментарии могут быть добавлены и управляться при просмотре сохраненной страницы.',
 
     // Revision
diff --git a/lang/ru/errors.php b/lang/ru/errors.php
index e87c9093629..aba67adf084 100644
--- a/lang/ru/errors.php
+++ b/lang/ru/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'У вас недостаточно прав для создания книг.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Секрет, предоставленный для данного использованного API токена неверен',
     'api_user_no_api_permission' => 'Владелец используемого API токена не имеет прав на выполнение вызовов API',
     'api_user_token_expired' => 'Срок действия используемого токена авторизации истек',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Ошибка при отправке тестового письма:',
diff --git a/lang/ru/notifications.php b/lang/ru/notifications.php
index c5e98da80ef..ea885d910b9 100644
--- a/lang/ru/notifications.php
+++ b/lang/ru/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Обновлена страница: :pageName',
     'updated_page_intro' => 'Страница была обновлена в :appName:',
     'updated_page_debounce' => 'Чтобы предотвратить массовые уведомления, в течение некоторого времени вы не будете получать уведомления о дальнейших правках этой страницы этим же редактором.',
+    'comment_mention_subject' => 'Вы были упомянуты в комментарии на странице: :pageName',
+    'comment_mention_intro' => 'Вы были упомянуты в комментариях к :appName:',
 
     'detail_page_name' => 'Имя страницы:',
     'detail_page_path' => 'Путь страницы:',
diff --git a/lang/ru/preferences.php b/lang/ru/preferences.php
index 27217815d13..0478aec16ae 100644
--- a/lang/ru/preferences.php
+++ b/lang/ru/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Настройки горячих клавиш были обновлены!',
     'shortcuts_overview_desc' => 'Управление клавишами быстрого доступа, которые можно использовать для навигации по системному интерфейсу.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Настройки уведомлений',
     'notifications_desc' => 'Управляйте полученными по электронной почте уведомлениями при выполнении определенных действий в системе.',
     'notifications_opt_own_page_changes' => 'Уведомлять об изменениях в собственных страницах',
     'notifications_opt_own_page_comments' => 'Уведомлять о комментариях на собственных страницах',
+    'notifications_opt_comment_mentions' => 'Уведомлять, когда меня упоминали в комментарии',
     'notifications_opt_comment_replies' => 'Уведомлять об ответах на мои комментарии',
     'notifications_save' => 'Сохранить настройки',
     'notifications_update_success' => 'Настройки уведомлений были обновлены!',
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
index 69c13e46dd3..e79dd460d45 100644
--- a/lang/ru/settings.php
+++ b/lang/ru/settings.php
@@ -75,34 +75,36 @@
     'reg_confirm_restrict_domain_placeholder' => 'Без ограничений',
 
     // Sorting Settings
-    'sorting' => 'Сортировка',
-    'sorting_book_default' => 'Сортировка книг по умолчанию',
+    'sorting' => 'Списки и сортировка',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Выберите правило сортировки по умолчанию для новых книг. Это не повлияет на существующие книги, и может быть изменено для каждой книги отдельно.',
     'sorting_rules' => 'Правила сортировки',
     'sorting_rules_desc' => 'Выберите правило сортировки по умолчанию для новых книг. Это не повлияет на существующие книги и может быть изменено для каждой книги отдельно.',
     'sort_rule_assigned_to_x_books' => 'Используется в :count книгах',
     'sort_rule_create' => 'Создать правило сортировки',
-    'sort_rule_edit' => 'Edit Sort Rule',
+    'sort_rule_edit' => 'Изменить правило сортировки',
     'sort_rule_delete' => 'Удалить правило сортировки',
     'sort_rule_delete_desc' => 'Удалить это правило сортировки из системы. Книги, использующие эту сортировку, вернутся к ручной сортировке.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
+    'sort_rule_delete_warn_books' => 'Это правило сортировки в настоящее время используется в :count book(s). Вы уверены, что хотите удалить его?',
     'sort_rule_delete_warn_default' => 'Это правило сортировки используется по умолчанию для книг. Вы уверены, что хотите удалить его?',
     'sort_rule_details' => 'Детали правила сортировки',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
+    'sort_rule_details_desc' => 'Задайте имя для этого правила сортировки, оно будет отображаться в списках, когда пользователи выбирают сортировку.',
     'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_operations_desc' => 'Настройка сортировки выполняемых действий путем перемещения их из списка доступных операций. После использования операции будут выполняться по порядку сверху вниз. Любые изменения, внесенные здесь, будут применены ко всем назначенным книгам после сохранения.',
     'sort_rule_available_operations' => 'Доступные операции',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
+    'sort_rule_available_operations_empty' => 'Операций не осталось',
     'sort_rule_configured_operations' => 'Configured Operations',
     'sort_rule_configured_operations_empty' => 'Перетащите/добавьте операции из списка "Доступные операции"',
     'sort_rule_op_asc' => '(Возрастание)',
     'sort_rule_op_desc' => '(Убывание)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
+    'sort_rule_op_name' => 'Имя - по алфавиту',
     'sort_rule_op_name_numeric' => 'По нумерации',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
+    'sort_rule_op_created_date' => 'По дате создания',
+    'sort_rule_op_updated_date' => 'По дате обновления',
+    'sort_rule_op_chapters_first' => 'Главы в начале',
     'sort_rule_op_chapters_last' => 'Главы в конце',
+    'sorting_page_limits' => 'Ограничения показа на странице',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Обслуживание',
@@ -192,17 +194,21 @@
     'role_access_api' => 'Доступ к системному API',
     'role_manage_settings' => 'Управление настройками приложения',
     'role_export_content' => 'Экспорт контента',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Импортировать содержимое',
     'role_editor_change' => 'Изменение редактора страниц',
     'role_notifications' => 'Получение и управление уведомлениями',
+    'role_permission_note_users_and_roles' => 'Эти разрешения также обеспечивают видимость и поиск пользователей и ролей в системе.',
     'role_asset' => 'Права доступа к материалам',
     'roles_system_warning' => 'Имейте в виду, что доступ к любому из указанных выше трех разрешений может позволить пользователю изменить свои собственные привилегии или привилегии других пользователей системы. Назначать роли с этими правами можно только доверенным пользователям.',
     'role_asset_desc' => 'Эти разрешения контролируют доступ по умолчанию к параметрам внутри системы. Разрешения на книги, главы и страницы перезапишут эти разрешения.',
     'role_asset_admins' => 'Администраторы автоматически получают доступ ко всему контенту, но эти опции могут отображать или скрывать параметры пользовательского интерфейса.',
     'role_asset_image_view_note' => 'Это относится к видимости в менеджере изображений. Фактический доступ к загруженным файлам изображений будет зависеть от опции хранения системных изображений.',
+    'role_asset_users_note' => 'Эти разрешения также обеспечивают видимость и поиск пользователей в системе.',
     'role_all' => 'Все',
     'role_own' => 'Владелец',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Контролируется активом, в который они загружены',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Сохранить роль',
     'role_users' => 'Пользователи с данной ролью',
     'role_users_none' => 'Нет пользователей с данной ролью',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Многофакторная аутентификация повышает степень безопасности вашей учетной записи.',
     'users_mfa_x_methods' => 'методов настроено :count|методов сконфигурировано :count',
     'users_mfa_configure' => 'Настройка методов',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Создать токен',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/ru/validation.php b/lang/ru/validation.php
index 156a05fe678..c1ef2f81052 100644
--- a/lang/ru/validation.php
+++ b/lang/ru/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute должен содержать только буквы и цифры.',
     'array'                => ':attribute должен быть массивом.',
     'backup_codes'         => 'Указанный код недействителен или уже использован.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute дата должна быть до :date.',
     'between'              => [
         'numeric' => ':attribute должен быть между :min и :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute поле может быть только true или false.',
     'confirmed'            => ':attribute подтверждение не совпадает.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute некорректные данные.',
     'date_format'          => ':attribute не соответствует формату :format.',
     'different'            => ':attribute и :other должны быть различны.',
@@ -105,10 +107,11 @@
     'url'                  => 'Формат :attribute некорректен.',
     'uploaded'             => 'Не удалось загрузить файл. Сервер не может принимать файлы такого размера.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute должен ссылаться на файл внутри ZIP.',
+    'zip_file_size' => 'Файл :attribute не должен превышать :size МБ.',
+    'zip_file_mime' => ':attribute должен ссылаться на файл типа :validTypes, найден :foundType.',
+    'zip_model_expected' => 'Ожидался объект данных, но найдено ":type".',
+    'zip_unique' => 'Значение :attribute должно быть уникальным для типа объекта внутри ZIP.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/sk/activities.php b/lang/sk/activities.php
index 65542fbe2a1..b9a532e2e05 100644
--- a/lang/sk/activities.php
+++ b/lang/sk/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Používateľ úspešne upravený',
     'user_delete' => 'odstránený používateľ',
     'user_delete_notification' => 'Používateľ úspešne zmazaný',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/sk/auth.php b/lang/sk/auth.php
index 11ccdc8893f..f5410b16f7c 100644
--- a/lang/sk/auth.php
+++ b/lang/sk/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Tieto údaje sa nezhodujú s našimi záznamami.',
     'throttle' => 'Priveľa pokusov o prihlásenie. Skúste znova o :seconds sekúnd.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registrácia',
@@ -20,6 +21,9 @@
     'username' => 'Používateľské meno',
     'email' => 'E-mail',
     'password' => 'Heslo',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Potvrdiť heslo',
     'password_hint' => 'Musí obsahovať aspoň 8 znakov',
     'forgot_password' => 'Zabudli ste heslo?',
diff --git a/lang/sk/common.php b/lang/sk/common.php
index 6f116006b12..65e91db043b 100644
--- a/lang/sk/common.php
+++ b/lang/sk/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Neaktívny',
     'never' => 'Nikdy',
     'none' => 'Žiadne',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Domovská stránka',
diff --git a/lang/sk/entities.php b/lang/sk/entities.php
index eb52545357c..697aef0b875 100644
--- a/lang/sk/entities.php
+++ b/lang/sk/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Zoradiť knihu :bookName',
     'books_sort_name' => 'Zoradiť podľa mena',
     'books_sort_created' => 'Zoradiť podľa dátumu vytvorenia',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Štítky stránok',
     'chapter_tags' => 'Štítky kapitol',
     'book_tags' => 'Štítky kníh',
diff --git a/lang/sk/errors.php b/lang/sk/errors.php
index 143259f3ad4..bfd921d0683 100644
--- a/lang/sk/errors.php
+++ b/lang/sk/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Secret poskytnutý pre daný token API je nesprávny',
     'api_user_no_api_permission' => 'Vlastník použitého tokenu API nemá povolenie na uskutočňovanie volaní rozhrania API',
     'api_user_token_expired' => 'Platnosť použitého autorizačného tokenu vypršala',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Chyba pri odosielaní testovacieho e-mailu:',
diff --git a/lang/sk/notifications.php b/lang/sk/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/sk/notifications.php
+++ b/lang/sk/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/sk/preferences.php b/lang/sk/preferences.php
index 85da4f331f7..ae227b9c65b 100644
--- a/lang/sk/preferences.php
+++ b/lang/sk/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Predvoľby skratiek boli aktualizované!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/sk/settings.php b/lang/sk/settings.php
index 2731fd01a2b..54a3752c645 100644
--- a/lang/sk/settings.php
+++ b/lang/sk/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Nie sú nastavené žiadne obmedzenia',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Údržba',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Zmeniť editor stránky',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Oprávnenia majetku',
     'roles_system_warning' => 'Uvedomte si, že prístup ku ktorémukoľvek z vyššie uvedených troch povolení môže používateľovi umožniť zmeniť svoje vlastné privilégiá alebo privilégiá ostatných v systéme. Roly s týmito povoleniami priraďujte iba dôveryhodným používateľom.',
     'role_asset_desc' => 'Tieto oprávnenia regulujú prednastavený prístup k zdroju v systéme. Oprávnenia pre knihy, kapitoly a stránky majú vyššiu prioritu.',
     'role_asset_admins' => 'Správcovia majú automaticky prístup ku všetkému obsahu, ale tieto možnosti môžu zobraziť alebo skryť možnosti používateľského rozhrania.',
     'role_asset_image_view_note' => 'Toto sa týka viditeľnosti v rámci správcu obrázkov. Skutočný prístup k nahratým súborom obrázkov bude závisieť od možnosti ukladania obrázkov systému.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Všetko',
     'role_own' => 'Vlastné',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Regulované zdrojom, do ktorého sú nahrané',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Uložiť rolu',
     'role_users' => 'Používatelia s touto rolou',
     'role_users_none' => 'Žiadni používatelia nemajú priradenú túto rolu',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Pre vyššiu úroveň bezpečnosti si nastavte viacúrovňové prihlasovanie.',
     'users_mfa_x_methods' => ':count nakonfigurované metódy|:count nakonfigurovaných metód',
     'users_mfa_configure' => 'Konfigurovať metódy',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Vytvoriť API token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/sk/validation.php b/lang/sk/validation.php
index 415f7cf05b9..30268585583 100644
--- a/lang/sk/validation.php
+++ b/lang/sk/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute môže obsahovať iba písmená a čísla.',
     'array'                => ':attribute musí byť pole.',
     'backup_codes'         => 'Poskytnutý kód nie je platný alebo už bol použitý.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute musí byť dátum pred :date.',
     'between'              => [
         'numeric' => ':attribute musí byť medzi :min a :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute pole musí byť true alebo false.',
     'confirmed'            => ':attribute potvrdenie nesedí.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute nie je platný dátum.',
     'date_format'          => ':attribute nesedí s formátom :format.',
     'different'            => ':attribute a :other musia byť rozdielne.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Súbor sa nepodarilo nahrať. Server nemusí akceptovať súbory tejto veľkosti.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/sl/activities.php b/lang/sl/activities.php
index 117c73ca186..3b8977c2f9a 100644
--- a/lang/sl/activities.php
+++ b/lang/sl/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Uporabnik uspešno posodobljen',
     'user_delete' => 'uporabnik izbrisan',
     'user_delete_notification' => 'Uporabnik uspešno izbrisan',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'ustvarjen žeton API',
diff --git a/lang/sl/auth.php b/lang/sl/auth.php
index e06d823e7cd..f01c846046e 100644
--- a/lang/sl/auth.php
+++ b/lang/sl/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Poverilnice se ne ujemajo s podatki v naši bazi.',
     'throttle' => 'Prekoračili ste število možnih prijav. Poskusite znova čez :seconds sekund.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Registracija',
@@ -20,6 +21,9 @@
     'username' => 'Uporabniško ime',
     'email' => 'E-pošta',
     'password' => 'Geslo',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Potrdi geslo',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Pozabljeno geslo?',
diff --git a/lang/sl/common.php b/lang/sl/common.php
index 0309237a973..eea434a4a7a 100644
--- a/lang/sl/common.php
+++ b/lang/sl/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/sl/entities.php b/lang/sl/entities.php
index 00ac991811e..0efbc6d17c9 100644
--- a/lang/sl/entities.php
+++ b/lang/sl/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Razvrsti knjigo :bookName',
     'books_sort_name' => 'Razvrsti po imenu',
     'books_sort_created' => 'Razvrsti po datumu nastanka',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Oznake strani',
     'chapter_tags' => 'Oznake poglavja',
     'book_tags' => 'Oznake knjige',
diff --git a/lang/sl/errors.php b/lang/sl/errors.php
index da80fd3910e..5d018bcbef0 100644
--- a/lang/sl/errors.php
+++ b/lang/sl/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Skrivnost, ki je bila dana za uporabljeni žeton API, je napačna',
     'api_user_no_api_permission' => 'Lastnik API nima pravic za klicanje API',
     'api_user_token_expired' => 'Avtorizacijski žeton je pretečen',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Napaka se je pojavila pri pošiljanju testne e-pošte:',
diff --git a/lang/sl/notifications.php b/lang/sl/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/sl/notifications.php
+++ b/lang/sl/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/sl/preferences.php b/lang/sl/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/sl/preferences.php
+++ b/lang/sl/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/sl/settings.php b/lang/sl/settings.php
index 904978f4705..01878d4814c 100644
--- a/lang/sl/settings.php
+++ b/lang/sl/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Brez omejitev',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Vzdrževanje',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Sistemska dovoljenja',
     'roles_system_warning' => 'Zavedajte se, da lahko dostop do kateregakoli od zgornjih treh dovoljenj uporabniku omogoči, da spremeni lastne privilegije ali privilegije drugih v sistemu. Vloge s temi dovoljenji dodelite samo zaupanja vrednim uporabnikom.',
     'role_asset_desc' => 'Ta dovoljenja nadzorujejo privzeti dostop do sredstev v sistemu. Dovoljenja za knjige, poglavja in strani bodo razveljavila ta dovoljenja.',
     'role_asset_admins' => 'Skrbniki samodejno pridobijo dostop do vseh vsebin, vendar lahko te možnosti prikažejo ali pa skrijejo možnosti uporabniškega vmesnika.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Vse',
     'role_own' => 'Lasten',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Nadzira ga sredstvo, v katerega so naloženi',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Shrani vlogo',
     'role_users' => 'Uporabniki v tej vlogi',
     'role_users_none' => 'Tej vlogi trenutno ni dodeljen noben uporabnik',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Ustvari žeton',
@@ -359,7 +368,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/sl/validation.php b/lang/sl/validation.php
index 0d9b56c1019..ff64871c444 100644
--- a/lang/sl/validation.php
+++ b/lang/sl/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute lahko vsebuje samo črke in številke.',
     'array'                => ':attribute mora biti niz.',
     'backup_codes'         => 'Podana koda ni veljavna ali je že uporabljena.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute mora biti datum pred :date.',
     'between'              => [
         'numeric' => ':attribute mora biti med :min in :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute polje mora biti pravilno ali napačno.',
     'confirmed'            => ':attribute potrditev se ne ujema.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute ni veljaven datum.',
     'date_format'          => ':attribute se ne ujema z obliko :format.',
     'different'            => ':attribute in :other morata biti različna.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Datoteke ni bilo mogoče naložiti. Strežnik morda ne sprejema datotek te velikosti.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/sq/activities.php b/lang/sq/activities.php
index 9296d1759ca..2d41a11218b 100644
--- a/lang/sq/activities.php
+++ b/lang/sq/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Përdoruesi u përditësua me sukses',
     'user_delete' => 'fshi përdorues',
     'user_delete_notification' => 'Përdoruesi u fshi me sukses',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'Krijoi token API',
diff --git a/lang/sq/auth.php b/lang/sq/auth.php
index 6fdc4ee4a6d..320b47c7f7a 100644
--- a/lang/sq/auth.php
+++ b/lang/sq/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Këto kredenciale nuk përputhen me të dhënat tona.',
     'throttle' => 'Shumë përpjekje për hyrje. Ju lutemi provoni përsëri në :seconds sekonda.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Regjistrohu',
@@ -20,6 +21,9 @@
     'username' => 'Emri i përdoruesit',
     'email' => 'Email',
     'password' => 'Fjalkalimi',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Konfirmo fjalëkalimin',
     'password_hint' => 'Duhet të jetë të paktën 8 karaktere',
     'forgot_password' => 'Keni harruar fjalëkalimin?',
diff --git a/lang/sq/common.php b/lang/sq/common.php
index 06a9e855ce3..2f62c6834c5 100644
--- a/lang/sq/common.php
+++ b/lang/sq/common.php
@@ -84,13 +84,15 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
     'header_menu_expand' => 'Expand Header Menu',
     'profile_menu' => 'Profile Menu',
-    'view_profile' => 'View Profile',
-    'edit_profile' => 'Edit Profile',
+    'view_profile' => 'Shiko profilin',
+    'edit_profile' => 'Ndrysho profilin',
     'dark_mode' => 'Dark Mode',
     'light_mode' => 'Light Mode',
     'global_search' => 'Global Search',
diff --git a/lang/sq/entities.php b/lang/sq/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/sq/entities.php
+++ b/lang/sq/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/sq/errors.php b/lang/sq/errors.php
index 9d738379648..20537d59f0c 100644
--- a/lang/sq/errors.php
+++ b/lang/sq/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/sq/notifications.php b/lang/sq/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/sq/notifications.php
+++ b/lang/sq/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/sq/preferences.php b/lang/sq/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/sq/preferences.php
+++ b/lang/sq/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/sq/settings.php b/lang/sq/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/sq/settings.php
+++ b/lang/sq/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/sq/validation.php b/lang/sq/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/sq/validation.php
+++ b/lang/sq/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/sr/activities.php b/lang/sr/activities.php
index ad594a2204e..bf6573e9718 100644
--- a/lang/sr/activities.php
+++ b/lang/sr/activities.php
@@ -77,20 +77,20 @@
     'maintenance_action_run' => 'покренуо акцију одржавања',
 
     // Webhooks
-    'webhook_create' => 'креиран вебхоок',
-    'webhook_create_notification' => 'Вебхоок је успешно креиран',
-    'webhook_update' => 'ажуриран вебхоок',
-    'webhook_update_notification' => 'Вебхоок је успешно ажуриран',
-    'webhook_delete' => 'обрисан вебхоок',
-    'webhook_delete_notification' => 'Вебхоок је успешно обрисан',
+    'webhook_create' => 'креирана веб закачка',
+    'webhook_create_notification' => 'Веб закачка је успешно креирана',
+    'webhook_update' => 'ажурирана веб закачка',
+    'webhook_update_notification' => 'Веб закачка је успешно ажурирана',
+    'webhook_delete' => 'обрисана веб закачка',
+    'webhook_delete_notification' => 'Веб закачка је успешно обрисана',
 
     // Imports
-    'import_create' => 'created import',
-    'import_create_notification' => 'Import successfully uploaded',
-    'import_run' => 'updated import',
-    'import_run_notification' => 'Content successfully imported',
-    'import_delete' => 'deleted import',
-    'import_delete_notification' => 'Import successfully deleted',
+    'import_create' => 'креиран увоз',
+    'import_create_notification' => 'Увоз је успешно отпремљен',
+    'import_run' => 'ажуриран увоз',
+    'import_run_notification' => 'Садржај је успешно увезен',
+    'import_delete' => 'обрисан увоз',
+    'import_delete_notification' => 'Увоз је успешно обрисан',
 
     // Users
     'user_create' => 'креирао корисника',
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Корисник је успешно ажуриран',
     'user_delete' => 'избрисан корисника',
     'user_delete_notification' => 'Корисник је успешно уклоњен',
+    'user_mfa_reset' => 'поништи МФА за корисника',
+    'user_mfa_reset_notification' => 'Поништавања начина мултифакторске аутентификације',
 
     // API Tokens
     'api_token_create' => 'креирао апи токен',
@@ -128,12 +130,12 @@
     'comment_delete'              => 'обрисан коментар',
 
     // Sort Rules
-    'sort_rule_create' => 'created sort rule',
-    'sort_rule_create_notification' => 'Sort rule successfully created',
-    'sort_rule_update' => 'updated sort rule',
-    'sort_rule_update_notification' => 'Sort rule successfully updated',
-    'sort_rule_delete' => 'deleted sort rule',
-    'sort_rule_delete_notification' => 'Sort rule successfully deleted',
+    'sort_rule_create' => 'направљено је правило слагања',
+    'sort_rule_create_notification' => 'Правило слагања је успешно направљено',
+    'sort_rule_update' => 'ажурирано је правило слагања',
+    'sort_rule_update_notification' => 'Правило слагања је успешно ажурирано',
+    'sort_rule_delete' => 'избрисано је правило слагања',
+    'sort_rule_delete_notification' => 'Правило слагања је успешно избрисано',
 
     // Other
     'permissions_update'          => 'ажуриране дозволе',
diff --git a/lang/sr/auth.php b/lang/sr/auth.php
index 0100e666fa3..07c8635e94d 100644
--- a/lang/sr/auth.php
+++ b/lang/sr/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Ови акредитиви се не поклапају са нашом евиденцијом.',
     'throttle' => 'Превише покушаја пријаве. Покушајте поново за :seconds секунди.',
+    'mfa_throttle' => 'Превише покушаја потврђивања вишефакторском аутентификацијом. Молим вас покушајте поново за :seconds секунди.',
 
     // Login & Register
     'sign_up' => 'Региструј се',
@@ -20,6 +21,9 @@
     'username' => 'Корисничко име',
     'email' => 'Е-пошта',
     'password' => 'Лозинка',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Потврди лозинку',
     'password_hint' => 'Мора да има најмање 8 знакова',
     'forgot_password' => 'Заборавили сте лозинку?',
@@ -88,13 +92,13 @@
     'mfa_setup_remove_confirmation' => 'Да ли сте сигурни да желите да уклоните овај метод вишефакторске аутентификације?',
     'mfa_setup_action' => 'Подешавање',
     'mfa_backup_codes_usage_limit_warning' => 'Преостало вам је мање од 5 резервних кодова. Генеришите и сачувајте нови сет пре него што вам понестане кодова како бисте спречили да останете без налога.',
-    'mfa_option_totp_title' => 'Aplikacije za mobilne uređaje',
+    'mfa_option_totp_title' => 'Апликација за мобилне уређаје',
     'mfa_option_totp_desc' => 'Да бисте користили вишефакторску аутентификацију, биће вам потребна мобилна апликација која подржава ТОТП, као што јеGoogle Authenticator, Authy или Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Резервни кодови',
     'mfa_option_backup_codes_desc' => 'Генерише скуп резервних кодова за једнократну употребу које ћете унети приликом пријављивања да бисте потврдили свој идентитет. Обавезно их чувајте на безбедном и безбедном месту.',
     'mfa_gen_confirm_and_enable' => 'Потврдите и омогућите',
     'mfa_gen_backup_codes_title' => 'Подешавање резервних кодова',
-    'mfa_gen_backup_codes_desc' => 'Чувајте доњу листу кодова на безбедном месту. Када приступате систему, моћи ћете да користите један од кодова као други механизам за аутентификацију.',
+    'mfa_gen_backup_codes_desc' => 'Сачувајте списак кодова испод на безбедном месту. Када приступате систему, моћи ћете да користите један од кодова као други механизам за аутентификацију.',
     'mfa_gen_backup_codes_download' => 'Преузми кодове',
     'mfa_gen_backup_codes_usage_warning' => 'Сваки код се може искористити једном',
     'mfa_gen_totp_title' => 'Подешавање мобилне апликације',
diff --git a/lang/sr/common.php b/lang/sr/common.php
index e185c99f5bf..5c726f37d89 100644
--- a/lang/sr/common.php
+++ b/lang/sr/common.php
@@ -12,7 +12,7 @@
     'save' => 'Сачувај',
     'continue' => 'Настави',
     'select' => 'Изабери',
-    'toggle_all' => 'Сакриј/Прикажи све',
+    'toggle_all' => 'Укључи све/ништа',
     'more' => 'Више',
 
     // Form Labels
@@ -20,18 +20,18 @@
     'description' => 'Опис',
     'role' => 'Улога',
     'cover_image' => 'Насловна слика',
-    'cover_image_description' => 'Ова слика би требало да буде приближно 440к250px иако ће бити флексибилно скалирана и исечена како би одговарала корисничком интерфејсу у различитим сценаријима по потреби, тако да ће се стварне димензије приказа разликовати.',
+    'cover_image_description' => 'Ова слика би требало да буде приближно 440х250px иако ће бити флексибилно скалирана и исечена како би одговарала корисничком интерфејсу у различитим сценаријима по потреби, тако да ће се стварне димензије приказа разликовати.',
 
     // Actions
     'actions' => 'Радње',
-    'view' => 'Преглед',
+    'view' => 'Прегледај',
     'view_all' => 'Прикажи све',
     'new' => 'Ново',
     'create' => 'Креирај',
-    'update' => 'Ажурирање',
+    'update' => 'Ажурирај',
     'edit' => 'Уреди',
-    'archive' => 'Archive',
-    'unarchive' => 'Un-Archive',
+    'archive' => 'Архивирај',
+    'unarchive' => 'Деархивирај',
     'sort' => 'Разврстај',
     'move' => 'Премести',
     'copy' => 'Умножи',
@@ -40,7 +40,7 @@
     'delete_confirm' => 'Потврди брисање',
     'search' => 'Претражи',
     'search_clear' => 'Обриши претрагу',
-    'reset' => 'Ресетуј',
+    'reset' => 'Поништи',
     'remove' => 'Уклони',
     'add' => 'Додај',
     'configure' => 'Конфигуриши',
@@ -81,15 +81,17 @@
     'breadcrumb' => 'Навигација',
     'status' => 'Стање',
     'status_active' => 'Активан',
-    'status_inactive' => 'Неактивно',
+    'status_inactive' => 'Неактиван',
     'never' => 'Никад',
     'none' => 'Ништа',
+    'move_left' => 'Помери лево',
+    'move_right' => 'Помери десно',
 
     // Header
     'homepage' => 'Почетна страна',
     'header_menu_expand' => 'Проширите мени заглавља',
     'profile_menu' => 'Мени профила',
-    'view_profile' => 'Погледај Профил',
+    'view_profile' => 'Погледај профил',
     'edit_profile' => 'Измени профил',
     'dark_mode' => 'Тамни режим',
     'light_mode' => 'Светли режим',
@@ -111,5 +113,5 @@
     'terms_of_service' => 'Услови коришћења',
 
     // OpenSearch
-    'opensearch_description' => 'Search :appName',
+    'opensearch_description' => 'Претражи :appName',
 ];
diff --git a/lang/sr/editor.php b/lang/sr/editor.php
index e5052595ceb..0f64e1272ef 100644
--- a/lang/sr/editor.php
+++ b/lang/sr/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'Поништи',
     'save' => 'Сачувај',
     'close' => 'Затвори',
-    'apply' => 'Apply',
+    'apply' => 'Примени',
     'undo' => 'Опозови',
     'redo' => 'Понови',
     'left' => 'Лево',
@@ -48,8 +48,8 @@
     'superscript' => 'Надскрипт',
     'subscript' => 'Субкрипт',
     'text_color' => 'Боја текста',
-    'highlight_color' => 'Highlight color',
-    'custom_color' => 'Боја текста',
+    'highlight_color' => 'Боја наглашавања',
+    'custom_color' => 'Прилагођена боја',
     'remove_color' => 'Уклоните боју',
     'background_color' => 'Боја позадине',
     'align_left' => 'Поравнај лево',
@@ -61,7 +61,7 @@
     'list_task' => 'Листа задатака',
     'indent_increase' => 'Повећај увлачење',
     'indent_decrease' => 'Умањи увлачење',
-    'table' => 'Tabela',
+    'table' => 'Табела',
     'insert_image' => 'Уметни слику',
     'insert_image_title' => 'Убаци/уреди слику',
     'insert_link' => 'Убаци/измени везу',
@@ -149,11 +149,11 @@
     'url' => 'УРЛ',
     'text_to_display' => 'Текст за приказ',
     'title' => 'Наслов',
-    'browse_links' => 'Browse links',
+    'browse_links' => 'Потражи везе',
     'open_link' => 'Отвори везу',
     'open_link_in' => 'Отвори везу у...',
     'open_link_current' => 'Тренутни прозор',
-    'open_link_new' => 'Нови Прозор',
+    'open_link_new' => 'Нови прозор',
     'remove_link' => 'Уклони везу',
     'insert_collapsible' => 'Уредите склопиви блок',
     'collapsible_unwrap' => 'Одмотати',
@@ -166,8 +166,8 @@
     'about' => 'О уређивачу',
     'about_title' => 'О уређивачу WYSIWYG',
     'editor_license' => 'Уредничка лиценца и ауторска права',
-    'editor_lexical_license' => 'This editor is built as a fork of :lexicalLink which is distributed under the MIT license.',
-    'editor_lexical_license_link' => 'Full license details can be found here.',
+    'editor_lexical_license' => 'Уређивач је изграђен као копија :lexicalLink који се дистрибуира под MIT лиценцом.',
+    'editor_lexical_license_link' => 'Комплетни детаљи лиценце се могу пронаћи овде.',
     'editor_tiny_license' => 'Овај уређивач је направљен помоћу :tinyLink који је обезбеђен под МИТ лиценцом.',
     'editor_tiny_license_link' => 'Детаље о ауторским правима и лиценци за ТиниМЦЕ можете пронаћи овде.',
     'save_continue' => 'Сачувај страницу и настави',
diff --git a/lang/sr/entities.php b/lang/sr/entities.php
index 456a76ceb17..1c872f546fc 100644
--- a/lang/sr/entities.php
+++ b/lang/sr/entities.php
@@ -24,7 +24,7 @@
     'meta_updated_name' => 'Ажурирано :timeLength од :user',
     'meta_owned_name' => 'Власништво :user',
     'meta_reference_count' => 'Референтна од :count item|Референтна од :count items',
-    'entity_select' => 'Избор ентитета',
+    'entity_select' => 'Избор ставке',
     'entity_select_lack_permission' => 'Немате потребне дозволе да изаберете ову ставку',
     'images' => 'Слике',
     'my_recent_drafts' => 'Моји недавни нацрти',
@@ -38,39 +38,39 @@
     'export_html' => 'Садржана веб датотека',
     'export_pdf' => 'PDF датотека',
     'export_text' => 'Датотеке чистог текста',
-    'export_md' => 'Markdown File',
-    'export_zip' => 'Portable ZIP',
+    'export_md' => 'Markdown датотека',
+    'export_zip' => 'Портабилан ZIP',
     'default_template' => 'Подразумевани шаблон странице',
     'default_template_explain' => 'Доделите шаблон странице који ће се користити као подразумевани садржај за све странице креиране у оквиру ове ставке. Имајте на уму да ће се ово користити само ако креатор странице има приступ за преглед изабране странице шаблона.',
     'default_template_select' => 'Изаберите страницу са шаблоном',
-    'import' => 'Import',
-    'import_validate' => 'Validate Import',
-    'import_desc' => 'Import books, chapters & pages using a portable zip export from the same, or a different, instance. Select a ZIP file to proceed. After the file has been uploaded and validated you\'ll be able to configure & confirm the import in the next view.',
-    'import_zip_select' => 'Select ZIP file to upload',
-    'import_zip_validation_errors' => 'Errors were detected while validating the provided ZIP file:',
-    'import_pending' => 'Pending Imports',
-    'import_pending_none' => 'No imports have been started.',
-    'import_continue' => 'Continue Import',
-    'import_continue_desc' => 'Review the content due to be imported from the uploaded ZIP file. When ready, run the import to add its contents to this system. The uploaded ZIP import file will be automatically removed on successful import.',
-    'import_details' => 'Import Details',
-    'import_run' => 'Run Import',
-    'import_size' => ':size Import ZIP Size',
-    'import_uploaded_at' => 'Uploaded :relativeTime',
-    'import_uploaded_by' => 'Uploaded by',
-    'import_location' => 'Import Location',
-    'import_location_desc' => 'Select a target location for your imported content. You\'ll need the relevant permissions to create within the location you choose.',
-    'import_delete_confirm' => 'Are you sure you want to delete this import?',
-    'import_delete_desc' => 'This will delete the uploaded import ZIP file, and cannot be undone.',
-    'import_errors' => 'Import Errors',
-    'import_errors_desc' => 'The follow errors occurred during the import attempt:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'import' => 'Увоз',
+    'import_validate' => 'Потврди увоз',
+    'import_desc' => 'Увезите књиге, поглавља и стране користећи портабилан zip извоз из исте или друге инстанце. Изаберите ZIP датотеку за наставак. Након што је датотека постављена и потврђена од ваше стране, моћи ћете да подесите и потврдите увоз у следећем приказу.',
+    'import_zip_select' => 'Изаберите ZIP датотеку за постављање',
+    'import_zip_validation_errors' => 'Откривене су грешке током провере достављене ZIP датотеке:',
+    'import_pending' => 'Увози на чекању',
+    'import_pending_none' => 'Ниједан увоз није започет.',
+    'import_continue' => 'Настави увоз',
+    'import_continue_desc' => 'Проверите садржај који ће бити увезен из отпремљене ZIP датотеке. Када сте спремни, покрените увоз да би сте додали садржај у систем. Отпремљена ZIP датотека ће аутоматски бити уклоњена по успешном увозу.',
+    'import_details' => 'Детаљи увоза',
+    'import_run' => 'Покрени увоз',
+    'import_size' => ':size величина увозног ZIP-а',
+    'import_uploaded_at' => 'Отпремљено :relativeTime',
+    'import_uploaded_by' => 'Отпремио',
+    'import_location' => 'Локација увоза',
+    'import_location_desc' => 'Изаберите одредишну локацију за ваш увезени садржај. Биће вам потребне одговарајуће дозволе за прављење на локацији коју изаберете.',
+    'import_delete_confirm' => 'Да ли заиста желите да обришете овај увоз?',
+    'import_delete_desc' => 'Ово ће обрисати отпремљену ZIP датотеку, и није могућ опозив.',
+    'import_errors' => 'Грешке увоза',
+    'import_errors_desc' => 'Следеће грешке су се појавиле током покушаја увоза:',
+    'breadcrumb_siblings_for_page' => 'Истражи сроднике стране',
+    'breadcrumb_siblings_for_chapter' => 'Истражи сроднике поглавља',
+    'breadcrumb_siblings_for_book' => 'Истражи сроднике књиге',
+    'breadcrumb_siblings_for_bookshelf' => 'Истражи сроднике полице',
 
     // Permissions and restrictions
     'permissions' => 'Дозволе',
-    'permissions_desc' => 'Подесите дозволе овде да бисте заменили подразумеване дозволе које дају корисничке улоге.',
+    'permissions_desc' => 'Овде подесите дозволе да бисте заменили подразумеване дозволе које дају корисничке улоге.',
     'permissions_book_cascade' => 'Дозволе постављене за књиге ће се аутоматски пребацивати на подређена поглавља и странице, осим ако немају дефинисане сопствене дозволе.',
     'permissions_chapter_cascade' => 'Дозволе постављене на поглављима ће се аутоматски каскадно пребацивати на подређене странице, осим ако немају дефинисане сопствене дозволе.',
     'permissions_save' => 'Сачувај дозволе',
@@ -84,393 +84,397 @@
     'search_results' => 'Резултати претраге',
     'search_total_results_found' => ':count пронађених резултата|:count укупно пронађених резултата',
     'search_clear' => 'Обриши претрагу',
-    'search_no_pages' => 'No pages matched this search',
-    'search_for_term' => 'Search for :term',
-    'search_more' => 'More Results',
-    'search_advanced' => 'Advanced Search',
-    'search_terms' => 'Search Terms',
-    'search_content_type' => 'Content Type',
-    'search_exact_matches' => 'Exact Matches',
-    'search_tags' => 'Tag Searches',
-    'search_options' => 'Options',
-    'search_viewed_by_me' => 'Viewed by me',
-    'search_not_viewed_by_me' => 'Not viewed by me',
-    'search_permissions_set' => 'Permissions set',
-    'search_created_by_me' => 'Created by me',
-    'search_updated_by_me' => 'Updated by me',
-    'search_owned_by_me' => 'Owned by me',
-    'search_date_options' => 'Date Options',
-    'search_updated_before' => 'Updated before',
-    'search_updated_after' => 'Updated after',
-    'search_created_before' => 'Created before',
-    'search_created_after' => 'Created after',
-    'search_set_date' => 'Set Date',
-    'search_update' => 'Update Search',
+    'search_no_pages' => 'Ниједна страна се не поклапа са претрагом',
+    'search_for_term' => 'Претражи :term',
+    'search_more' => 'Више резултата',
+    'search_advanced' => 'Напредна претрага',
+    'search_terms' => 'Термини претраге',
+    'search_content_type' => 'Тип садржаја',
+    'search_exact_matches' => 'Тачно поклапање',
+    'search_tags' => 'Претрага ознака',
+    'search_options' => 'Опције',
+    'search_viewed_by_me' => 'Гледао сам',
+    'search_not_viewed_by_me' => 'Нисам гледао',
+    'search_permissions_set' => 'Скуп дозвола',
+    'search_created_by_me' => 'Направио сам',
+    'search_updated_by_me' => 'Ажурирао сам',
+    'search_owned_by_me' => 'Ја сам власник',
+    'search_date_options' => 'Опције датума',
+    'search_updated_before' => 'Ажурирано пре',
+    'search_updated_after' => 'Ажурирано после',
+    'search_created_before' => 'Направљено пре',
+    'search_created_after' => 'Направљено после',
+    'search_set_date' => 'Подеси датум',
+    'search_update' => 'Ажурирај претрагу',
 
     // Shelves
-    'shelf' => 'Shelf',
-    'shelves' => 'Shelves',
-    'x_shelves' => ':count Shelf|:count Shelves',
-    'shelves_empty' => 'No shelves have been created',
-    'shelves_create' => 'Create New Shelf',
-    'shelves_popular' => 'Popular Shelves',
-    'shelves_new' => 'New Shelves',
-    'shelves_new_action' => 'New Shelf',
-    'shelves_popular_empty' => 'The most popular shelves will appear here.',
-    'shelves_new_empty' => 'The most recently created shelves will appear here.',
-    'shelves_save' => 'Save Shelf',
-    'shelves_books' => 'Books on this shelf',
-    'shelves_add_books' => 'Add books to this shelf',
-    'shelves_drag_books' => 'Drag books below to add them to this shelf',
-    'shelves_empty_contents' => 'This shelf has no books assigned to it',
-    'shelves_edit_and_assign' => 'Edit shelf to assign books',
-    'shelves_edit_named' => 'Edit Shelf :name',
-    'shelves_edit' => 'Edit Shelf',
-    'shelves_delete' => 'Delete Shelf',
-    'shelves_delete_named' => 'Delete Shelf :name',
-    'shelves_delete_explain' => "This will delete the shelf with the name ':name'. Contained books will not be deleted.",
-    'shelves_delete_confirmation' => 'Are you sure you want to delete this shelf?',
-    'shelves_permissions' => 'Shelf Permissions',
-    'shelves_permissions_updated' => 'Shelf Permissions Updated',
-    'shelves_permissions_active' => 'Shelf Permissions Active',
-    'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.',
-    'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.',
-    'shelves_copy_permissions_to_books' => 'Copy Permissions to Books',
-    'shelves_copy_permissions' => 'Copy Permissions',
-    'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.',
-    'shelves_copy_permission_success' => 'Shelf permissions copied to :count books',
+    'shelf' => 'Полица',
+    'shelves' => 'Полице',
+    'x_shelves' => ':count полица|:count полице',
+    'shelves_empty' => 'Није направљена ниједна полица',
+    'shelves_create' => 'Направи нову полицу',
+    'shelves_popular' => 'Популарне полице',
+    'shelves_new' => 'Нове полице',
+    'shelves_new_action' => 'Нова полица',
+    'shelves_popular_empty' => 'Најпопуларније полице ће се појавити овде.',
+    'shelves_new_empty' => 'Најскорије направљене полице ће се појавити овде.',
+    'shelves_save' => 'Сачувај полицу',
+    'shelves_books' => 'Књиге на овој полици',
+    'shelves_add_books' => 'Додајте књиге на ову полицу',
+    'shelves_drag_books' => 'Превуците књиге испод да их додате на ову полицу',
+    'shelves_empty_contents' => 'Ова полица нема додељених књига',
+    'shelves_edit_and_assign' => 'Уредите полицу да би сте доделили књиге',
+    'shelves_edit_named' => 'Измени полицу :name',
+    'shelves_edit' => 'Измени полицу',
+    'shelves_delete' => 'Обриши полицу',
+    'shelves_delete_named' => 'Обриши полицу :name',
+    'shelves_delete_explain' => "Ово ће обрисати полицу са називом ':name'. Садржане књиге неће бити обрисане.",
+    'shelves_delete_confirmation' => 'Да ли заиста желите да обришете ову полицу?',
+    'shelves_permissions' => 'Дозволе полице',
+    'shelves_permissions_updated' => 'Дозволе полице су ажуриране',
+    'shelves_permissions_active' => 'Дозволе полице су активне',
+    'shelves_permissions_cascade_warning' => 'Дозволе на полицама се не преносе аутоматски на садржане књиге. Ово је зато што књига може да постоји на вишеструко полица. Дозволе се међутим могу умножити на књиге наследнице користећи опцију испод.',
+    'shelves_permissions_create' => 'Дозволе за прављење полица се користе само за дозволе умножавања на књиге наследнице користећи радњу испод. Оне не контролишу могућност прављења књига.',
+    'shelves_copy_permissions_to_books' => 'Умножи дозволе на књиге',
+    'shelves_copy_permissions' => 'Умножи дозволе',
+    'shelves_copy_permissions_explain' => 'Ово ће применити тренутне поставке дозвола ове полице на све књиге садржане на њој. Пре активирања, потврдите да су сачуване све измене над дозволама ове полице.',
+    'shelves_copy_permission_success' => 'Дозволе полице су умножене на :count књиге',
 
     // Books
-    'book' => 'Book',
-    'books' => 'Books',
-    'x_books' => ':count Book|:count Books',
-    'books_empty' => 'No books have been created',
-    'books_popular' => 'Popular Books',
-    'books_recent' => 'Recent Books',
-    'books_new' => 'New Books',
-    'books_new_action' => 'New Book',
-    'books_popular_empty' => 'The most popular books will appear here.',
-    'books_new_empty' => 'The most recently created books will appear here.',
-    'books_create' => 'Create New Book',
-    'books_delete' => 'Delete Book',
-    'books_delete_named' => 'Delete Book :bookName',
-    'books_delete_explain' => 'This will delete the book with the name \':bookName\'. All pages and chapters will be removed.',
-    'books_delete_confirmation' => 'Are you sure you want to delete this book?',
-    'books_edit' => 'Edit Book',
-    'books_edit_named' => 'Edit Book :bookName',
-    'books_form_book_name' => 'Book Name',
-    'books_save' => 'Save Book',
-    'books_permissions' => 'Book Permissions',
-    'books_permissions_updated' => 'Book Permissions Updated',
-    'books_empty_contents' => 'No pages or chapters have been created for this book.',
-    'books_empty_create_page' => 'Create a new page',
-    'books_empty_sort_current_book' => 'Sort the current book',
-    'books_empty_add_chapter' => 'Add a chapter',
-    'books_permissions_active' => 'Book Permissions Active',
-    'books_search_this' => 'Search this book',
-    'books_navigation' => 'Book Navigation',
-    'books_sort' => 'Sort Book Contents',
-    'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
-    'books_sort_auto_sort' => 'Auto Sort Option',
-    'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
-    'books_sort_named' => 'Sort Book :bookName',
-    'books_sort_name' => 'Sort by Name',
-    'books_sort_created' => 'Sort by Created Date',
-    'books_sort_updated' => 'Sort by Updated Date',
-    'books_sort_chapters_first' => 'Chapters First',
-    'books_sort_chapters_last' => 'Chapters Last',
-    'books_sort_show_other' => 'Show Other Books',
-    'books_sort_save' => 'Save New Order',
-    'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
-    'books_sort_move_up' => 'Move Up',
-    'books_sort_move_down' => 'Move Down',
-    'books_sort_move_prev_book' => 'Move to Previous Book',
-    'books_sort_move_next_book' => 'Move to Next Book',
-    'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
-    'books_sort_move_next_chapter' => 'Move Into Next Chapter',
-    'books_sort_move_book_start' => 'Move to Start of Book',
-    'books_sort_move_book_end' => 'Move to End of Book',
-    'books_sort_move_before_chapter' => 'Move to Before Chapter',
-    'books_sort_move_after_chapter' => 'Move to After Chapter',
-    'books_copy' => 'Copy Book',
-    'books_copy_success' => 'Book successfully copied',
+    'book' => 'Књига',
+    'books' => 'Књиге',
+    'x_books' => ':count књига|:count књиге',
+    'books_empty' => 'Није направљена ниједна књига',
+    'books_popular' => 'Популарне књиге',
+    'books_recent' => 'Недавне књиге',
+    'books_new' => 'Нове књиге',
+    'books_new_action' => 'Нова књига',
+    'books_popular_empty' => 'Најпопуларније књиге ће се појавити овде.',
+    'books_new_empty' => 'Најскорије направљене књиге ће се појавити овде.',
+    'books_create' => 'Направи нову књигу',
+    'books_delete' => 'Обриши књигу',
+    'books_delete_named' => 'Обриши књигу :bookName',
+    'books_delete_explain' => 'Ово ће обрисати књигу под називом \':bookName\'. Све стране и поглавља ће такође бити уклоњени.',
+    'books_delete_confirmation' => 'Да ли заиста желите да обришете ову књигу?',
+    'books_edit' => 'Измени књигу',
+    'books_edit_named' => 'Измени књигу :bookName',
+    'books_form_book_name' => 'Назив књиге',
+    'books_save' => 'Сачувај књигу',
+    'books_permissions' => 'Дозволе књиге',
+    'books_permissions_updated' => 'Ажуриране су дозволе књиге',
+    'books_empty_contents' => 'Нису направљене стране нити поглавља за ову књигу.',
+    'books_empty_create_page' => 'Направи нову страну',
+    'books_empty_sort_current_book' => 'Разврстај тренутну књигу',
+    'books_empty_add_chapter' => 'Додај поглавље',
+    'books_permissions_active' => 'Дозволе књиге су активне',
+    'books_search_this' => 'Претражи ову књигу',
+    'books_navigation' => 'Навигација књиге',
+    'books_sort' => 'Разврстај садржај књиге',
+    'books_sort_desc' => 'Преместите поглавља и стране унутар књиге да би сте реорганизовали њен садржај. Друге књиге се могу додати што омогућава лако премештање поглавља и страна међу књигама. Опционо се може подесити правило за аутоматско разврставање садржаја ове књиге након измена.',
+    'books_sort_auto_sort' => 'Опције аутоматског разврставања',
+    'books_sort_auto_sort_active' => 'Активно је аутоматско разврставање: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Правила опција аутоматског разврставања могу бити направљена под поставкама "Спискови и разврставање" од стране корисника са одговарајућим дозволама.',
+    'books_sort_named' => 'Разврстај књигу :bookName',
+    'books_sort_name' => 'Разврстај по називу',
+    'books_sort_created' => 'Разврстај по датуму прављења',
+    'books_sort_updated' => 'Разврстај по датуму ажурирања',
+    'books_sort_chapters_first' => 'Прво поглавља',
+    'books_sort_chapters_last' => 'Последње поглавља',
+    'books_sort_show_other' => 'Прикажи друге књиге',
+    'books_sort_save' => 'Сачувај нови редослед',
+    'books_sort_show_other_desc' => 'Овде додајте друге књиге да би сте их уврстили у операцију разврставања и омогућили лаку реорганизацију међу књигама.',
+    'books_sort_move_up' => 'Помери горе',
+    'books_sort_move_down' => 'Помери доле',
+    'books_sort_move_prev_book' => 'Помери до претходне књиге',
+    'books_sort_move_next_book' => 'Помери до следеће књиге',
+    'books_sort_move_prev_chapter' => 'Помери у претходно поглавље',
+    'books_sort_move_next_chapter' => 'Помери у следеће поглавље',
+    'books_sort_move_book_start' => 'Помери на почетак књиге',
+    'books_sort_move_book_end' => 'Помери на крај књиге',
+    'books_sort_move_before_chapter' => 'Помери пре поглавља',
+    'books_sort_move_after_chapter' => 'Помери после поглавља',
+    'books_copy' => 'Умножи књигу',
+    'books_copy_success' => 'Књига је успешно умножена',
 
     // Chapters
-    'chapter' => 'Chapter',
-    'chapters' => 'Chapters',
-    'x_chapters' => ':count Chapter|:count Chapters',
-    'chapters_popular' => 'Popular Chapters',
-    'chapters_new' => 'New Chapter',
-    'chapters_create' => 'Create New Chapter',
-    'chapters_delete' => 'Delete Chapter',
-    'chapters_delete_named' => 'Delete Chapter :chapterName',
-    'chapters_delete_explain' => 'This will delete the chapter with the name \':chapterName\'. All pages that exist within this chapter will also be deleted.',
-    'chapters_delete_confirm' => 'Are you sure you want to delete this chapter?',
-    'chapters_edit' => 'Edit Chapter',
-    'chapters_edit_named' => 'Edit Chapter :chapterName',
-    'chapters_save' => 'Save Chapter',
-    'chapters_move' => 'Move Chapter',
-    'chapters_move_named' => 'Move Chapter :chapterName',
-    'chapters_copy' => 'Copy Chapter',
-    'chapters_copy_success' => 'Chapter successfully copied',
-    'chapters_permissions' => 'Chapter Permissions',
-    'chapters_empty' => 'No pages are currently in this chapter.',
-    'chapters_permissions_active' => 'Chapter Permissions Active',
-    'chapters_permissions_success' => 'Chapter Permissions Updated',
-    'chapters_search_this' => 'Search this chapter',
-    'chapter_sort_book' => 'Sort Book',
+    'chapter' => 'Поглавље',
+    'chapters' => 'Поглавља',
+    'x_chapters' => ':count поглавље|:count поглавља',
+    'chapters_popular' => 'Популарна поглавља',
+    'chapters_new' => 'Ново поглавље',
+    'chapters_create' => 'Направи ново поглавље',
+    'chapters_delete' => 'Обриши поглавље',
+    'chapters_delete_named' => 'Обриши поглавље :chapterName',
+    'chapters_delete_explain' => 'Ово ће обрисати поглавље са називом \':chapterName\'. Све стране које постоје унутар овог поглавља ће такође бити обрисане.',
+    'chapters_delete_confirm' => 'Да ли заиста желите да обришете ово поглавље?',
+    'chapters_edit' => 'Измени поглавље',
+    'chapters_edit_named' => 'Измени поглавље :chapterName',
+    'chapters_save' => 'Сачувај поглавље',
+    'chapters_move' => 'Премести поглавље',
+    'chapters_move_named' => 'Премести поглавље :chapterName',
+    'chapters_copy' => 'Умножи поглавље',
+    'chapters_copy_success' => 'Поглавље успешно умножено',
+    'chapters_permissions' => 'Дозволе поглавља',
+    'chapters_empty' => 'Тренутно нема страница у овом поглављу.',
+    'chapters_permissions_active' => 'Активне су дозволе поглавља',
+    'chapters_permissions_success' => 'Дозволе поглавља су ажуриране',
+    'chapters_search_this' => 'Претражи ово поглавље',
+    'chapter_sort_book' => 'Разврстај књигу',
 
     // Pages
-    'page' => 'Page',
-    'pages' => 'Pages',
-    'x_pages' => ':count Page|:count Pages',
-    'pages_popular' => 'Popular Pages',
-    'pages_new' => 'New Page',
-    'pages_attachments' => 'Attachments',
-    'pages_navigation' => 'Page Navigation',
-    'pages_delete' => 'Delete Page',
-    'pages_delete_named' => 'Delete Page :pageName',
-    'pages_delete_draft_named' => 'Delete Draft Page :pageName',
-    'pages_delete_draft' => 'Delete Draft Page',
-    'pages_delete_success' => 'Page deleted',
-    'pages_delete_draft_success' => 'Draft page deleted',
-    'pages_delete_warning_template' => 'This page is in active use as a book or chapter default page template. These books or chapters will no longer have a default page template assigned after this page is deleted.',
-    'pages_delete_confirm' => 'Are you sure you want to delete this page?',
-    'pages_delete_draft_confirm' => 'Are you sure you want to delete this draft page?',
-    'pages_editing_named' => 'Editing Page :pageName',
-    'pages_edit_draft_options' => 'Draft Options',
-    'pages_edit_save_draft' => 'Save Draft',
-    'pages_edit_draft' => 'Edit Page Draft',
-    'pages_editing_draft' => 'Editing Draft',
-    'pages_editing_page' => 'Editing Page',
-    'pages_edit_draft_save_at' => 'Draft saved at ',
-    'pages_edit_delete_draft' => 'Delete Draft',
-    'pages_edit_delete_draft_confirm' => 'Are you sure you want to delete your draft page changes? All of your changes, since the last full save, will be lost and the editor will be updated with the latest page non-draft save state.',
-    'pages_edit_discard_draft' => 'Discard Draft',
-    'pages_edit_switch_to_markdown' => 'Switch to Markdown Editor',
-    'pages_edit_switch_to_markdown_clean' => '(Clean Content)',
-    'pages_edit_switch_to_markdown_stable' => '(Stable Content)',
-    'pages_edit_switch_to_wysiwyg' => 'Switch to WYSIWYG Editor',
-    'pages_edit_switch_to_new_wysiwyg' => 'Switch to new WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
-    'pages_edit_set_changelog' => 'Set Changelog',
-    'pages_edit_enter_changelog_desc' => 'Enter a brief description of the changes you\'ve made',
-    'pages_edit_enter_changelog' => 'Enter Changelog',
-    'pages_editor_switch_title' => 'Switch Editor',
-    'pages_editor_switch_are_you_sure' => 'Are you sure you want to change the editor for this page?',
-    'pages_editor_switch_consider_following' => 'Consider the following when changing editors:',
-    'pages_editor_switch_consideration_a' => 'Once saved, the new editor option will be used by any future editors, including those that may not be able to change editor type themselves.',
-    'pages_editor_switch_consideration_b' => 'This can potentially lead to a loss of detail and syntax in certain circumstances.',
-    'pages_editor_switch_consideration_c' => 'Tag or changelog changes, made since last save, won\'t persist across this change.',
-    'pages_save' => 'Save Page',
-    'pages_title' => 'Page Title',
-    'pages_name' => 'Page Name',
-    'pages_md_editor' => 'Editor',
-    'pages_md_preview' => 'Preview',
-    'pages_md_insert_image' => 'Insert Image',
-    'pages_md_insert_link' => 'Insert Entity Link',
-    'pages_md_insert_drawing' => 'Insert Drawing',
-    'pages_md_show_preview' => 'Show preview',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_md_plain_editor' => 'Plaintext editor',
-    'pages_drawing_unsaved' => 'Unsaved Drawing Found',
-    'pages_drawing_unsaved_confirm' => 'Unsaved drawing data was found from a previous failed drawing save attempt. Would you like to restore and continue editing this unsaved drawing?',
-    'pages_not_in_chapter' => 'Page is not in a chapter',
-    'pages_move' => 'Move Page',
-    'pages_copy' => 'Copy Page',
-    'pages_copy_desination' => 'Copy Destination',
-    'pages_copy_success' => 'Page successfully copied',
-    'pages_permissions' => 'Page Permissions',
-    'pages_permissions_success' => 'Page permissions updated',
-    'pages_revision' => 'Revision',
-    'pages_revisions' => 'Page Revisions',
-    'pages_revisions_desc' => 'Listed below are all the past revisions of this page. You can look back upon, compare, and restore old page versions if permissions allow. The full history of the page may not be fully reflected here since, depending on system configuration, old revisions could be auto-deleted.',
-    'pages_revisions_named' => 'Page Revisions for :pageName',
-    'pages_revision_named' => 'Page Revision for :pageName',
-    'pages_revision_restored_from' => 'Restored from #:id; :summary',
-    'pages_revisions_created_by' => 'Created By',
-    'pages_revisions_date' => 'Revision Date',
+    'page' => 'Страна',
+    'pages' => 'Стране',
+    'x_pages' => ':count страна|:count стране',
+    'pages_popular' => 'Популарне стране',
+    'pages_new' => 'Нова страна',
+    'pages_attachments' => 'Прилози',
+    'pages_navigation' => 'Навигација стране',
+    'pages_delete' => 'Обриши страну',
+    'pages_delete_named' => 'Обриши страну :pageName',
+    'pages_delete_draft_named' => 'Обриши нацрт стране :pageName',
+    'pages_delete_draft' => 'Обриши нацрт стране',
+    'pages_delete_success' => 'Страна је обрисана',
+    'pages_delete_draft_success' => 'Нацрт стране је обрисан',
+    'pages_delete_warning_template' => 'Ова страна је у активној употреби као подразумевани шаблон књиге или поглавља. Ове књиге или поглавља више неће имати додељен подразумевани шаблон стране након обришете ову страну.',
+    'pages_delete_confirm' => 'Да ли заиста желите да обришете ову страну?',
+    'pages_delete_draft_confirm' => 'Да ли заиста желите да обришете овај нацрт?',
+    'pages_editing_named' => 'Уређивање стране :pageName',
+    'pages_edit_draft_options' => 'Опције нацрта',
+    'pages_edit_save_draft' => 'Сачувај нацрт',
+    'pages_edit_draft' => 'Измени нацрт стране',
+    'pages_editing_draft' => 'Уређивање нацрта',
+    'pages_editing_page' => 'Уређивање стране',
+    'pages_edit_draft_save_at' => 'Нацрт сачуван у ',
+    'pages_edit_delete_draft' => 'Обриши нацрт',
+    'pages_edit_delete_draft_confirm' => 'Да ли заиста желите да обришете ваш нацрт стране? Све ваше измене, од последњег пуног снимања ће бити изгубљене и уређивач ће бити ажуриран на последње сачувано стање стране без нацрта.',
+    'pages_edit_discard_draft' => 'Одбаци нацрт',
+    'pages_edit_switch_to_markdown' => 'Пребаци се на Маркдаун уређивач',
+    'pages_edit_switch_to_markdown_clean' => '(чист садржај)',
+    'pages_edit_switch_to_markdown_stable' => '(стабилан садржај)',
+    'pages_edit_switch_to_wysiwyg' => 'Пребаци на WYSIWYG уређивач',
+    'pages_edit_switch_to_new_wysiwyg' => 'Пребаци на нови WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(у бета тестирању)',
+    'pages_edit_set_changelog' => 'Напомена о изменама',
+    'pages_edit_enter_changelog_desc' => 'Унесите кратак опис измена које сте извршили',
+    'pages_edit_enter_changelog' => 'Упишите запис о променама',
+    'pages_editor_switch_title' => 'Промени уређивач',
+    'pages_editor_switch_are_you_sure' => 'Да ли заиста желите да промените уређивач за ову страну?',
+    'pages_editor_switch_consider_following' => 'Размотрите следеће када мењате уређиваче:',
+    'pages_editor_switch_consideration_a' => 'Једном сачуване, опције новог уређивача ће се користити за све будуће уреднике, укључујући оне који немају могућност да сами мењају тип уређивача.',
+    'pages_editor_switch_consideration_b' => 'Ово потенцијално може довести до губитка детаља и синтаксе у одређеним случајевима.',
+    'pages_editor_switch_consideration_c' => 'Ознаке или записи промена, начињени након последњег снимања, неће се задржати преко ове измене.',
+    'pages_save' => 'Сачувај страну',
+    'pages_title' => 'Наслов стране',
+    'pages_name' => 'Назив стране',
+    'pages_md_editor' => 'Уређивач',
+    'pages_md_preview' => 'Преглед',
+    'pages_md_insert_image' => 'Уметни слику',
+    'pages_md_insert_link' => 'Уметни везу до ентитета',
+    'pages_md_insert_drawing' => 'Уметни цртеж',
+    'pages_md_show_preview' => 'Прикажи преглед',
+    'pages_md_sync_scroll' => 'Синхронизуј положај прегледа',
+    'pages_md_plain_editor' => 'Уређивач чистог текста',
+    'pages_drawing_unsaved' => 'Пронађен је несачуван цртеж',
+    'pages_drawing_unsaved_confirm' => 'Пронађени су подаци о несачуваном цртежу од претходног неуспелог покушаја снимања. Да ли желите да га повратите и наставите са уређивањем овог несачуваног цртежа?',
+    'pages_not_in_chapter' => 'Страна није у поглављу',
+    'pages_move' => 'Премести страну',
+    'pages_copy' => 'Умножи страну',
+    'pages_copy_desination' => 'Умножи одредиште',
+    'pages_copy_success' => 'Страна је успешно умножена',
+    'pages_permissions' => 'Дозволе стране',
+    'pages_permissions_success' => 'Ажуриране су дозволе стране',
+    'pages_revision' => 'Ревизија',
+    'pages_revisions' => 'Ревизије стране',
+    'pages_revisions_desc' => 'спод су наведене све ревизије ове стране. Можете их погледати, упоредити и вратити старе верзије стране ако имате дозвола за то. Пуна историја стране се можда не може сагледати овде с обзиром да, у зависности од подешавања система, старе ревизије су можда аутоматски обрисане.',
+    'pages_revisions_named' => 'Ревизије стране за :pageName',
+    'pages_revision_named' => 'Ревизија стране за :pageName',
+    'pages_revision_restored_from' => 'Враћено из #:id; :summary',
+    'pages_revisions_created_by' => 'Направио',
+    'pages_revisions_date' => 'Датум ревизије',
     'pages_revisions_number' => '#',
-    'pages_revisions_sort_number' => 'Revision Number',
-    'pages_revisions_numbered' => 'Revision #:id',
-    'pages_revisions_numbered_changes' => 'Revision #:id Changes',
-    'pages_revisions_editor' => 'Editor Type',
-    'pages_revisions_changelog' => 'Changelog',
-    'pages_revisions_changes' => 'Changes',
-    'pages_revisions_current' => 'Current Version',
-    'pages_revisions_preview' => 'Preview',
-    'pages_revisions_restore' => 'Restore',
-    'pages_revisions_none' => 'This page has no revisions',
-    'pages_copy_link' => 'Copy Link',
-    'pages_edit_content_link' => 'Jump to section in editor',
-    'pages_pointer_enter_mode' => 'Enter section select mode',
-    'pages_pointer_label' => 'Page Section Options',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
-    'pages_permissions_active' => 'Page Permissions Active',
-    'pages_initial_revision' => 'Initial publish',
-    'pages_references_update_revision' => 'System auto-update of internal links',
-    'pages_initial_name' => 'New Page',
-    'pages_editing_draft_notification' => 'You are currently editing a draft that was last saved :timeDiff.',
-    'pages_draft_edited_notification' => 'This page has been updated by since that time. It is recommended that you discard this draft.',
-    'pages_draft_page_changed_since_creation' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+    'pages_revisions_sort_number' => 'Број ревизије',
+    'pages_revisions_numbered' => 'Ревизија #:id',
+    'pages_revisions_numbered_changes' => 'Промене ревизије #:id',
+    'pages_revisions_editor' => 'Тип уређивача',
+    'pages_revisions_changelog' => 'Запис промене',
+    'pages_revisions_changes' => 'Промене',
+    'pages_revisions_current' => 'Тренутна верзија',
+    'pages_revisions_preview' => 'Преглед',
+    'pages_revisions_restore' => 'Враћање',
+    'pages_revisions_none' => 'Ова страна нема ревизија',
+    'pages_copy_link' => 'Умножи везу',
+    'pages_edit_content_link' => 'Скочи на секцију у уређивачу',
+    'pages_pointer_enter_mode' => 'Уђите у режим избора секције',
+    'pages_pointer_label' => 'Опције секције стране',
+    'pages_pointer_permalink' => 'Стална веза секције стране',
+    'pages_pointer_include_tag' => 'Секција стране садржи ознаку',
+    'pages_pointer_toggle_link' => 'Режим сталне везе. Притисните за приказ садржане ознаке',
+    'pages_pointer_toggle_include' => 'Режим садржане ознаке. Притисните за приказ сталне везе',
+    'pages_permissions_active' => 'Активне су дозволе стране',
+    'pages_initial_revision' => 'Прва објава',
+    'pages_references_update_revision' => 'Системско аутоматско ажурирање интерних веза',
+    'pages_initial_name' => 'Нова страна',
+    'pages_editing_draft_notification' => 'Тренутно уређујете нацрт који је сачуван :timeDiff.',
+    'pages_draft_edited_notification' => 'Ова страна је ажурирана од тада. Препоручује се да одбаците овај нацрт.',
+    'pages_draft_page_changed_since_creation' => 'Ова страна је ажурирана након прављења овог нацрта. Препоручује се да обаците овај нацрт или да се потрудите да не препишете било какве измене на страни.',
     'pages_draft_edit_active' => [
-        'start_a' => ':count users have started editing this page',
-        'start_b' => ':userName has started editing this page',
-        'time_a' => 'since the page was last updated',
-        'time_b' => 'in the last :minCount minutes',
-        'message' => ':start :time. Take care not to overwrite each other\'s updates!',
+        'start_a' => ':count корисника је започело уређивање ове стране',
+        'start_b' => ':userName је започео уређивање ове стране',
+        'time_a' => 'од када је страна последи пут ажурирана',
+        'time_b' => 'у последњих:minCount минута',
+        'message' => ':start :time. Водите рачуна да једни другима не препишете измене!',
     ],
-    'pages_draft_discarded' => 'Draft discarded! The editor has been updated with the current page content',
-    'pages_draft_deleted' => 'Draft deleted! The editor has been updated with the current page content',
-    'pages_specific' => 'Specific Page',
-    'pages_is_template' => 'Page Template',
+    'pages_draft_discarded' => 'Нацрт је одбачен! Уређивач је ажуриран са тренутним садржајем стране',
+    'pages_draft_deleted' => 'Нацрт је обисан! Уређивач је ажуриран са тренутним садржајем стране',
+    'pages_specific' => 'Одређена страна',
+    'pages_is_template' => 'Шаблон стране',
 
     // Editor Sidebar
-    'toggle_sidebar' => 'Toggle Sidebar',
-    'page_tags' => 'Page Tags',
-    'chapter_tags' => 'Chapter Tags',
-    'book_tags' => 'Book Tags',
-    'shelf_tags' => 'Shelf Tags',
-    'tag' => 'Tag',
-    'tags' =>  'Tags',
-    'tags_index_desc' => 'Tags can be applied to content within the system to apply a flexible form of categorization. Tags can have both a key and value, with the value being optional. Once applied, content can then be queried using the tag name and value.',
-    'tag_name' =>  'Tag Name',
-    'tag_value' => 'Tag Value (Optional)',
-    'tags_explain' => "Add some tags to better categorise your content. \n You can assign a value to a tag for more in-depth organisation.",
-    'tags_add' => 'Add another tag',
-    'tags_remove' => 'Remove this tag',
-    'tags_usages' => 'Total tag usages',
-    'tags_assigned_pages' => 'Assigned to Pages',
-    'tags_assigned_chapters' => 'Assigned to Chapters',
-    'tags_assigned_books' => 'Assigned to Books',
-    'tags_assigned_shelves' => 'Assigned to Shelves',
-    'tags_x_unique_values' => ':count unique values',
-    'tags_all_values' => 'All values',
-    'tags_view_tags' => 'View Tags',
-    'tags_view_existing_tags' => 'View existing tags',
-    'tags_list_empty_hint' => 'Tags can be assigned via the page editor sidebar or while editing the details of a book, chapter or shelf.',
-    'attachments' => 'Attachments',
-    'attachments_explain' => 'Upload some files or attach some links to display on your page. These are visible in the page sidebar.',
-    'attachments_explain_instant_save' => 'Changes here are saved instantly.',
-    'attachments_upload' => 'Upload File',
-    'attachments_link' => 'Attach Link',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
-    'attachments_set_link' => 'Set Link',
-    'attachments_delete' => 'Are you sure you want to delete this attachment?',
-    'attachments_dropzone' => 'Drop files here to upload',
-    'attachments_no_files' => 'No files have been uploaded',
-    'attachments_explain_link' => 'You can attach a link if you\'d prefer not to upload a file. This can be a link to another page or a link to a file in the cloud.',
-    'attachments_link_name' => 'Link Name',
-    'attachment_link' => 'Attachment link',
-    'attachments_link_url' => 'Link to file',
-    'attachments_link_url_hint' => 'Url of site or file',
-    'attach' => 'Attach',
-    'attachments_insert_link' => 'Add Attachment Link to Page',
-    'attachments_edit_file' => 'Edit File',
-    'attachments_edit_file_name' => 'File Name',
-    'attachments_edit_drop_upload' => 'Drop files or click here to upload and overwrite',
-    'attachments_order_updated' => 'Attachment order updated',
-    'attachments_updated_success' => 'Attachment details updated',
-    'attachments_deleted' => 'Attachment deleted',
-    'attachments_file_uploaded' => 'File successfully uploaded',
-    'attachments_file_updated' => 'File successfully updated',
-    'attachments_link_attached' => 'Link successfully attached to page',
-    'templates' => 'Templates',
-    'templates_set_as_template' => 'Page is a template',
-    'templates_explain_set_as_template' => 'You can set this page as a template so its contents be utilized when creating other pages. Other users will be able to use this template if they have view permissions for this page.',
-    'templates_replace_content' => 'Replace page content',
-    'templates_append_content' => 'Append to page content',
-    'templates_prepend_content' => 'Prepend to page content',
+    'toggle_sidebar' => 'Приказ помоћне траке',
+    'page_contents' => 'Садржај стране',
+    'page_contents_none' => 'Није пронађено ниједно заглавље у садржају стране.',
+    'page_contents_info' => 'Мени садржаја се генерише према форматима заглавља коришћеним на овој страни.',
+    'page_tags' => 'Ознаке стране',
+    'chapter_tags' => 'Ознаке поглавља',
+    'book_tags' => 'Ознаке књиге',
+    'shelf_tags' => 'Ознаке полице',
+    'tag' => 'Ознака',
+    'tags' =>  'Ознаке',
+    'tags_index_desc' => 'Ознаке се могу придодати садржају унутар система како би се применио флексибилан облик категоризације. Ознаке могу имати кључ и вредност, док је вредност опциона. Када су примењене, садржај се може претраживати коришћењем назива ознаке и вредности.',
+    'tag_name' =>  'Назив ознаке',
+    'tag_value' => 'Вредност ознаке (опционо)',
+    'tags_explain' => "Додај неке ознаке за бољу категоризацију вашег садржаја. \n Можете доделити вредност ознаци за још прецизнију организацију.",
+    'tags_add' => 'Додај још једну ознаку',
+    'tags_remove' => 'Уклони ову ознаку',
+    'tags_usages' => 'Укупна употреба ознака',
+    'tags_assigned_pages' => 'Додељено странама',
+    'tags_assigned_chapters' => 'Додељено поглављима',
+    'tags_assigned_books' => 'Додељено књигама',
+    'tags_assigned_shelves' => 'Додељено полицама',
+    'tags_x_unique_values' => ':count јединствених вредности',
+    'tags_all_values' => 'Све вредности',
+    'tags_view_tags' => 'Преглед ознака',
+    'tags_view_existing_tags' => 'Погледај постојеће ознаке',
+    'tags_list_empty_hint' => 'Ознаке се могу доделити путем траке са стране у уређивачу стране док се уређују детаљи о књизи, поглавља или полице.',
+    'attachments' => 'Прилози',
+    'attachments_explain' => 'Отпремите неке датотеке или прикачите неке везе за приказ на вашој страни. Оне су видљиве на помоћној траци стране.',
+    'attachments_explain_instant_save' => 'Измене овде су моментално сачуване.',
+    'attachments_upload' => 'Постави датотеку',
+    'attachments_link' => 'Закачи везу',
+    'attachments_upload_drop' => 'Алтернативно можете превући и отпустити датотеку овде да би сте је отпремили као прилог.',
+    'attachments_set_link' => 'Подеси везу',
+    'attachments_delete' => 'Да ли заиста желите да обришете овај прилог?',
+    'attachments_dropzone' => 'Отпустите датотеке овде да их отпремите',
+    'attachments_no_files' => 'Ниједна датотека није постављена',
+    'attachments_explain_link' => 'Можете закачити везу ако не желите да отпремате датотеку. Ово може бити веза ка другој страни или датотека у облаку.',
+    'attachments_link_name' => 'Назив везе',
+    'attachment_link' => 'Веза прилога',
+    'attachments_link_url' => 'Веза до датотеке',
+    'attachments_link_url_hint' => 'Адреса сајта или датотеке',
+    'attach' => 'Закачи',
+    'attachments_insert_link' => 'Додај везу прилога на страну',
+    'attachments_edit_file' => 'Измени датотеку',
+    'attachments_edit_file_name' => 'Назив датотеке',
+    'attachments_edit_drop_upload' => 'Отпустите датотеке или кликните овде да отпремите и препишете',
+    'attachments_order_updated' => 'Ажуриран је редослед прилога',
+    'attachments_updated_success' => 'Ажурирани су детаљи прилога',
+    'attachments_deleted' => 'Прилог је обрисан',
+    'attachments_file_uploaded' => 'Датотека је успешно отпремљена',
+    'attachments_file_updated' => 'Датотека је успешно ажурирана',
+    'attachments_link_attached' => 'Веза је успешно закачена на страну',
+    'templates' => 'Шаблони',
+    'templates_set_as_template' => 'Страна је шаблон',
+    'templates_explain_set_as_template' => 'Можете подесити ову страну као шаблон како би њен садржај био искоришћен при прављењу других страна. Други корисници ће моћи да користе овај шаблон ако имају дозволу да прегледају ову страну.',
+    'templates_replace_content' => 'Замени садржај стране',
+    'templates_append_content' => 'Придодај садржају стране',
+    'templates_prepend_content' => 'Уметни пре садржаја стране',
 
     // Profile View
-    'profile_user_for_x' => 'User for :time',
-    'profile_created_content' => 'Created Content',
-    'profile_not_created_pages' => ':userName has not created any pages',
-    'profile_not_created_chapters' => ':userName has not created any chapters',
-    'profile_not_created_books' => ':userName has not created any books',
-    'profile_not_created_shelves' => ':userName has not created any shelves',
+    'profile_user_for_x' => 'Корисник последњих :time',
+    'profile_created_content' => 'Направљени садржај',
+    'profile_not_created_pages' => ':userName није направио ниједну страницу',
+    'profile_not_created_chapters' => ':userName није направио ниједно поглавље',
+    'profile_not_created_books' => ':userName није направио ниједну књигу',
+    'profile_not_created_shelves' => ':userName није направио ниједну полицу',
 
     // Comments
-    'comment' => 'Comment',
-    'comments' => 'Comments',
-    'comment_add' => 'Add Comment',
-    'comment_none' => 'No comments to display',
-    'comment_placeholder' => 'Leave a comment here',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
-    'comment_save' => 'Save Comment',
-    'comment_new' => 'New Comment',
-    'comment_created' => 'commented :createDiff',
-    'comment_updated' => 'Updated :updateDiff by :username',
-    'comment_updated_indicator' => 'Updated',
-    'comment_deleted_success' => 'Comment deleted',
-    'comment_created_success' => 'Comment added',
-    'comment_updated_success' => 'Comment updated',
-    'comment_archive_success' => 'Comment archived',
-    'comment_unarchive_success' => 'Comment un-archived',
-    'comment_view' => 'View comment',
-    'comment_jump_to_thread' => 'Jump to thread',
-    'comment_delete_confirm' => 'Are you sure you want to delete this comment?',
-    'comment_in_reply_to' => 'In reply to :commentId',
-    'comment_reference' => 'Reference',
-    'comment_reference_outdated' => '(Outdated)',
-    'comment_editor_explain' => 'Here are the comments that have been left on this page. Comments can be added & managed when viewing the saved page.',
+    'comment' => 'Коментар',
+    'comments' => 'Коментари',
+    'comment_add' => 'Додај коментар',
+    'comment_none' => 'Нема коментара за приказ',
+    'comment_placeholder' => 'Оставите коментар овде',
+    'comment_thread_count' => ':count коментар у разговору|:count коментара у разговору',
+    'comment_archived_count' => ':count архивирано',
+    'comment_archived_threads' => 'Архивиране приче',
+    'comment_save' => 'Сачувај коментар',
+    'comment_new' => 'Нови коментар',
+    'comment_created' => 'коментарисао :createDiff',
+    'comment_updated' => 'Измењено :updateDiff од стране :username',
+    'comment_updated_indicator' => 'Ажурирано',
+    'comment_deleted_success' => 'Коментар обрисан',
+    'comment_created_success' => 'Коментар додат',
+    'comment_updated_success' => 'Коментар измењен',
+    'comment_archive_success' => 'Коментар архиивиран',
+    'comment_unarchive_success' => 'Коментар деархивиран',
+    'comment_view' => 'Погледај коментар',
+    'comment_jump_to_thread' => 'Пређи на разговор',
+    'comment_delete_confirm' => 'Да ли заиста желите да обришете овај коментар?',
+    'comment_in_reply_to' => 'Као одговор на :commentId',
+    'comment_reference' => 'Референца',
+    'comment_reference_outdated' => '(застарело)',
+    'comment_editor_explain' => 'Ево коментара који су остављени на овој страни. Коментари се могу додавати и може им се управљати при прегледу сачуване стране.',
 
     // Revision
-    'revision_delete_confirm' => 'Are you sure you want to delete this revision?',
-    'revision_restore_confirm' => 'Are you sure you want to restore this revision? The current page contents will be replaced.',
-    'revision_cannot_delete_latest' => 'Cannot delete the latest revision.',
+    'revision_delete_confirm' => 'Да ли заиста желите да обришете ову ревизију?',
+    'revision_restore_confirm' => 'Да ли заиста желите да вратите ову ревизију? Садржај тренутне стране ће бити замењен.',
+    'revision_cannot_delete_latest' => 'Није могуће обрисати последњу ревизију.',
 
     // Copy view
-    'copy_consider' => 'Please consider the below when copying content.',
-    'copy_consider_permissions' => 'Custom permission settings will not be copied.',
-    'copy_consider_owner' => 'You will become the owner of all copied content.',
-    'copy_consider_images' => 'Page image files will not be duplicated & the original images will retain their relation to the page they were originally uploaded to.',
-    'copy_consider_attachments' => 'Page attachments will not be copied.',
-    'copy_consider_access' => 'A change of location, owner or permissions may result in this content being accessible to those previously without access.',
+    'copy_consider' => 'Узмите у обзир следеће када умножавате садржај.',
+    'copy_consider_permissions' => 'Поставке прилагођених дозвола неће бити умножене.',
+    'copy_consider_owner' => 'Постаћете власник свег умноженог садржаја.',
+    'copy_consider_images' => 'Датотеке слика стране неће бити умножене и оригиналне слике ће задржати однос према страни на коју су оригинално отпремљене.',
+    'copy_consider_attachments' => 'Прилози стране неће бити умножени.',
+    'copy_consider_access' => 'Промена локације, власника или дозвола може проузроковати да садржај постане доступан онима који раније нису имали приступ.',
 
     // Conversions
-    'convert_to_shelf' => 'Convert to Shelf',
-    'convert_to_shelf_contents_desc' => 'You can convert this book to a new shelf with the same contents. Chapters contained within this book will be converted to new books. If this book contains any pages, that are not in a chapter, this book will be renamed and contain such pages, and this book will become part of the new shelf.',
-    'convert_to_shelf_permissions_desc' => 'Any permissions set on this book will be copied to the new shelf and to all new child books that don\'t have their own permissions enforced. Note that permissions on shelves do not auto-cascade to content within, as they do for books.',
-    'convert_book' => 'Convert Book',
-    'convert_book_confirm' => 'Are you sure you want to convert this book?',
-    'convert_undo_warning' => 'This cannot be as easily undone.',
-    'convert_to_book' => 'Convert to Book',
-    'convert_to_book_desc' => 'You can convert this chapter to a new book with the same contents. Any permissions set on this chapter will be copied to the new book but any inherited permissions, from the parent book, will not be copied which could lead to a change of access control.',
-    'convert_chapter' => 'Convert Chapter',
-    'convert_chapter_confirm' => 'Are you sure you want to convert this chapter?',
+    'convert_to_shelf' => 'Претвори у полицу',
+    'convert_to_shelf_contents_desc' => 'Можете претворити ову књигу у нову полицу са истим садржајем. Поглавља садржана унутар ове књиге ће бити претворена у нове књиге. Ако ова књига садржи икакве стране, које нису у поглављу, ова књига ће бити преименована и садржаће те стане и та књига ће постати део нове полице.',
+    'convert_to_shelf_permissions_desc' => 'Све дозволе подешене над овом књигом ће бити умножене на нову полицу и на све нове књиге наследнике које немају приморане сопствене дозволе. Напомена да се дозволе на полицама на преносе на њихов садржај, као што је то случај са књигама.',
+    'convert_book' => 'Претвори књигу',
+    'convert_book_confirm' => 'Да ли заиста желите да претворите ову књигу?',
+    'convert_undo_warning' => 'Ово не може лако бити повраћено.',
+    'convert_to_book' => 'Претвори у књигу',
+    'convert_to_book_desc' => 'Можете да претворите ово поглавље у нову књигу са истим садржајем. Све дозволе подешене над овим поглављем ће бити умножене на нову књигу али све наслеђене дозволе, од књиге родитеља, неће бити умножене што ће довести д промене у контрол приступа.',
+    'convert_chapter' => 'Претвори поглавље',
+    'convert_chapter_confirm' => 'Да ли заиста желите да претворите ово поглавље?',
 
     // References
-    'references' => 'References',
-    'references_none' => 'There are no tracked references to this item.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references' => 'Референце',
+    'references_none' => 'Нема праћених референци ка овој ставки.',
+    'references_to_desc' => 'Испод је наведен сав познати садржај у систему који је повезан са овом ставком.',
 
     // Watch Options
-    'watch' => 'Watch',
-    'watch_title_default' => 'Default Preferences',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
-    'watch_title_ignore' => 'Ignore',
-    'watch_desc_ignore' => 'Ignore all notifications, including those from user-level preferences.',
-    'watch_title_new' => 'New Pages',
-    'watch_desc_new' => 'Notify when any new page is created within this item.',
-    'watch_title_updates' => 'All Page Updates',
-    'watch_desc_updates' => 'Notify upon all new pages and page changes.',
-    'watch_desc_updates_page' => 'Notify upon all page changes.',
-    'watch_title_comments' => 'All Page Updates & Comments',
-    'watch_desc_comments' => 'Notify upon all new pages, page changes and new comments.',
-    'watch_desc_comments_page' => 'Notify upon page changes and new comments.',
-    'watch_change_default' => 'Change default notification preferences',
-    'watch_detail_ignore' => 'Ignoring notifications',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch' => 'Прати',
+    'watch_title_default' => 'Подразумевана подешавања',
+    'watch_desc_default' => 'Вратите праћење на ваша подразумевана подешавања обавештавања.',
+    'watch_title_ignore' => 'Игнориши',
+    'watch_desc_ignore' => 'Игнориши сва обавештења, укључујући она из подешавања на корисничком нивоу.',
+    'watch_title_new' => 'Нове стране',
+    'watch_desc_new' => 'Обавести када се направи икаква нова страна унутар ове ставке.',
+    'watch_title_updates' => 'Све измене странице',
+    'watch_desc_updates' => 'Обавести при прављењу свих нових страна и измена страна.',
+    'watch_desc_updates_page' => 'Обавести при свим изменама на страни.',
+    'watch_title_comments' => 'Све измене странице и коментари',
+    'watch_desc_comments' => 'Обавести за све нове стране, измене страна и новим коментарима.',
+    'watch_desc_comments_page' => 'Обавести при измени стране и новим коментарима.',
+    'watch_change_default' => 'Измени подразумевана подешавања обавештавања',
+    'watch_detail_ignore' => 'Игнорисање обавештења',
+    'watch_detail_new' => 'Праћење нових страна',
+    'watch_detail_updates' => 'Праћење нових страна и измена',
+    'watch_detail_comments' => 'Праћење нових страна, измена и коментара',
+    'watch_detail_parent_book' => 'Праћење кроз родитељску књигу',
+    'watch_detail_parent_book_ignore' => 'Игнорисање кроз родитељску књигу',
+    'watch_detail_parent_chapter' => 'Праћење кроз родитељско поглавље',
+    'watch_detail_parent_chapter_ignore' => 'Игнорисање кроз родитељско поглавље',
 ];
diff --git a/lang/sr/errors.php b/lang/sr/errors.php
index ee8443461c3..38928ccc6e9 100644
--- a/lang/sr/errors.php
+++ b/lang/sr/errors.php
@@ -9,125 +9,127 @@
     'permissionJson' => 'Немате овлашћење да извршите ову акцију.',
 
     // Auth
-    'error_user_exists_different_creds' => 'Корисник са е-мејл адресом :email већ постоји са другим приступним подацима.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
-    'email_already_confirmed' => 'Email has already been confirmed, Try logging in.',
-    'email_confirmation_invalid' => 'This confirmation token is not valid or has already been used, Please try registering again.',
-    'email_confirmation_expired' => 'The confirmation token has expired, A new confirmation email has been sent.',
-    'email_confirmation_awaiting' => 'The email address for the account in use needs to be confirmed',
-    'ldap_fail_anonymous' => 'LDAP access failed using anonymous bind',
-    'ldap_fail_authed' => 'LDAP access failed using given dn & password details',
-    'ldap_extension_not_installed' => 'LDAP PHP extension not installed',
-    'ldap_cannot_connect' => 'Cannot connect to ldap server, Initial connection failed',
-    'saml_already_logged_in' => 'Already logged in',
-    'saml_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
-    'saml_invalid_response_id' => 'The request from the external authentication system is not recognised by a process started by this application. Navigating back after a login could cause this issue.',
-    'saml_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
-    'oidc_already_logged_in' => 'Already logged in',
-    'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
-    'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
-    'social_no_action_defined' => 'No action defined',
-    'social_login_bad_response' => "Error received during :socialAccount login: \n:error",
-    'social_account_in_use' => 'This :socialAccount account is already in use, Try logging in via the :socialAccount option.',
-    'social_account_email_in_use' => 'The email :email is already in use. If you already have an account you can connect your :socialAccount account from your profile settings.',
-    'social_account_existing' => 'This :socialAccount is already attached to your profile.',
-    'social_account_already_used_existing' => 'This :socialAccount account is already used by another user.',
-    'social_account_not_used' => 'This :socialAccount account is not linked to any users. Please attach it in your profile settings. ',
-    'social_account_register_instructions' => 'If you do not yet have an account, You can register an account using the :socialAccount option.',
-    'social_driver_not_found' => 'Social driver not found',
-    'social_driver_not_configured' => 'Your :socialAccount social settings are not configured correctly.',
-    'invite_token_expired' => 'This invitation link has expired. You can instead try to reset your account password.',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'error_user_exists_different_creds' => 'Корисник са адресом е-поште :email већ постоји са другим приступним подацима.',
+    'auth_pre_register_theme_prevention' => 'Кориснички налог није могао бити регистрован са достављеним подацима',
+    'email_already_confirmed' => 'Е-пошта је већ потврђена. Покушајте да се пријавите.',
+    'email_confirmation_invalid' => 'Овај потврдни токен није исправан или је већ искоришћен. Покушајте да се поново региструјете.',
+    'email_confirmation_expired' => 'Потврдни токен је истекао. Послата је нова е-порука за потврду.',
+    'email_confirmation_awaiting' => 'Адреса е-поште за налог у употреби мора бити потврђен',
+    'ldap_fail_anonymous' => 'LDAP приступ није успео користећи анонимно спајање',
+    'ldap_fail_authed' => 'LDAP приступ није успео са наведеним dn и лозинка подацима',
+    'ldap_extension_not_installed' => 'LDAP PHP проширење није инсталирано',
+    'ldap_cannot_connect' => 'Није могуће повезати се на ldap сервер. Иницијално повезивање није успело',
+    'saml_already_logged_in' => 'Већ пријављен',
+    'saml_no_email_address' => 'Нисмо могли да пронађемо адресу е-поште за овог корисника у достављеним подацима од стране екстерног система за аутентификацију',
+    'saml_invalid_response_id' => 'Захтев од екстерног система за аутентификацију није препознат од стране процеса започетког овом апликацијом. Повратак након пријаве може бити узрок овог проблема.',
+    'saml_fail_authed' => 'Пријава користећи :system није успела, систем није доставио успешну ауторизацију',
+    'oidc_already_logged_in' => 'Већ пријављен',
+    'oidc_no_email_address' => 'Нисмо могли да пронађемо адресу е-поште за овог корисника у достављеним подацима од стране екстерног система за аутентификацију',
+    'oidc_fail_authed' => 'Пријава користећи :system није успела, систем није доставио успешну ауторизацију',
+    'social_no_action_defined' => 'Није дефинисана радња',
+    'social_login_bad_response' => "Добијена је грешка током :socialAccount пријаве: \n:error",
+    'social_account_in_use' => 'Овај :socialAccount налог је већ у употреби. Покушајте пријаву са :socialAccount опцијом.',
+    'social_account_email_in_use' => 'Ова е-пошта :email је већ у употреби. Ако већ имате налог можете повезати ваш :socialAccount налог у поставкама вашег профила.',
+    'social_account_existing' => 'Овај :socialAccount је већ повезан са вашим профилом.',
+    'social_account_already_used_existing' => 'Овај :socialAccount налог је већ у употреби од стране другог корисника.',
+    'social_account_not_used' => 'Овај :socialAccount налог није повезан ни са једним корисником. Молим вас повежите га у поставкама вашег профила. ',
+    'social_account_register_instructions' => 'Ако већ немате налог, можете регистровати налог користећи :socialAccount опцију.',
+    'social_driver_not_found' => 'Друштвени прикључак није пронађен',
+    'social_driver_not_configured' => 'Ваше поставке за :socialAccount нису исправно подешене.',
+    'invite_token_expired' => 'Ова веза позивнице је истекла. Можете покушати да поништите лозинку вашег налога.',
+    'login_user_not_found' => 'Корисник за ову радњу није могао бити пронађен.',
 
     // System
-    'path_not_writable' => 'File path :filePath could not be uploaded to. Ensure it is writable to the server.',
-    'cannot_get_image_from_url' => 'Cannot get image from :url',
-    'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
-    'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
-    'server_post_limit' => 'The server cannot receive the provided amount of data. Try again with less data or a smaller file.',
-    'uploaded'  => 'The server does not allow uploads of this size. Please try a smaller file size.',
+    'path_not_writable' => 'На путању :filePath није се могло отпремити. Потврдите да је уписива на серверу.',
+    'cannot_get_image_from_url' => 'Није могуће добити слику из :url',
+    'cannot_create_thumbs' => 'Сервер не може да прави сличице. Молим вас проверите да је GD PHP проширење инсталирано.',
+    'server_upload_limit' => 'Сервер не дозвољава отпремање ове величине. Молим вас покушајте са мањом датотеком.',
+    'server_post_limit' => 'Сервер не може да прими достављену количину података. Покушајте поново са мање података или са мањом датотеком.',
+    'uploaded'  => 'Сервер не дозвољава отпремање ове величине. Молим вас покушајте са мањом датотеком.',
 
     // Drawing & Images
-    'image_upload_error' => 'An error occurred uploading the image',
-    'image_upload_type_error' => 'The image type being uploaded is invalid',
-    'image_upload_replace_type' => 'Image file replacements must be of the same type',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
-    'image_gallery_thumbnail_memory_limit' => 'Failed to create gallery thumbnails due to system resource limits.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'image_upload_error' => 'Појавила се грешка током отпремања датотеке',
+    'image_upload_type_error' => 'Тип датотеке слике која се отпрема није исправна',
+    'image_upload_replace_type' => 'Датотека заменске слике мора бити истог типа',
+    'image_upload_memory_limit' => 'Неуспело завршавање отпремања слика и/или прављења сличица због ограничења системских ресурса.',
+    'image_thumbnail_memory_limit' => 'Није успело прављење варијација величина слике због ограничења системских ресурса.',
+    'image_gallery_thumbnail_memory_limit' => 'Није успело прављење сличица галерије због ограничења системских ресурса.',
+    'drawing_data_not_found' => 'Цртеж није могао бити учитан. Датотека цртежа можда више не постоји или ви можда немате дозволе да јој приступите.',
 
     // Attachments
-    'attachment_not_found' => 'Attachment not found',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_not_found' => 'Прилог није пронађен',
+    'attachment_upload_error' => 'Појавила се грешка током отпремања датотеке прилога',
 
     // Pages
-    'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
-    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
+    'page_draft_autosave_fail' => 'Није успело чување нацрта. Потврдите да имате везу са интернетом пре снимања ове стране',
+    'page_draft_delete_fail' => 'Није успело брисање нацрта стране и добављања сачуваног садржаја',
+    'page_custom_home_deletion' => 'Није могуће брисање стране док је она подешена као почетна',
 
     // Entities
-    'entity_not_found' => 'Entity not found',
-    'bookshelf_not_found' => 'Shelf not found',
+    'entity_not_found' => 'Ентитет није пронађен',
+    'bookshelf_not_found' => 'Полица није пронађена',
     'book_not_found' => 'Књига није пронађена',
     'page_not_found' => 'Страница није пронађена',
     'chapter_not_found' => 'Поглавље није пронађено',
     'selected_book_not_found' => 'Одабрана књига није пронађена',
-    'selected_book_chapter_not_found' => 'The selected Book or Chapter was not found',
+    'selected_book_chapter_not_found' => 'Одабрана књига или поглавље није пронађено',
     'guests_cannot_save_drafts' => 'Гости не могу сачувати нацрте',
 
     // Users
     'users_cannot_delete_only_admin' => 'Не можете обрисати јединог администратора',
     'users_cannot_delete_guest' => 'Не можете обрисати госта',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Корисник није могао бити направљен јер позивница е-поруком није послата',
 
     // Roles
     'role_cannot_be_edited' => 'Ова улога се не може мењати',
     'role_system_cannot_be_deleted' => 'Ово је системска улога и не може се мењати',
-    'role_registration_default_cannot_delete' => 'This role cannot be deleted while set as the default registration role',
-    'role_cannot_remove_only_admin' => 'This user is the only user assigned to the administrator role. Assign the administrator role to another user before attempting to remove it here.',
+    'role_registration_default_cannot_delete' => 'Ова улога се не може обрисати док је подешена као подразумевана улога за регистрацију',
+    'role_cannot_remove_only_admin' => 'Овај корисник је једини коме је додељена улога администратора. Доделите ову улогу другом кориснику пре покушаја да га уклоните овде.',
 
     // Comments
-    'comment_list' => 'An error occurred while fetching the comments.',
-    'cannot_add_comment_to_draft' => 'You cannot add comments to a draft.',
-    'comment_add' => 'An error occurred while adding / updating the comment.',
-    'comment_delete' => 'An error occurred while deleting the comment.',
-    'empty_comment' => 'Cannot add an empty comment.',
+    'comment_list' => 'Појавила се грешка током добављања коментара.',
+    'cannot_add_comment_to_draft' => 'Не можете додати коментаре нацрту.',
+    'comment_add' => 'Појавила се грешка током додавања / измене коментара.',
+    'comment_delete' => 'Појавила се грешка током брисања коментара.',
+    'empty_comment' => 'Није могуће додати празан коментар.',
 
     // Error pages
-    '404_page_not_found' => 'Page Not Found',
-    'sorry_page_not_found' => 'Sorry, The page you were looking for could not be found.',
-    'sorry_page_not_found_permission_warning' => 'If you expected this page to exist, you might not have permission to view it.',
-    'image_not_found' => 'Image Not Found',
-    'image_not_found_subtitle' => 'Sorry, The image file you were looking for could not be found.',
-    'image_not_found_details' => 'If you expected this image to exist it might have been deleted.',
-    'return_home' => 'Return to home',
+    '404_page_not_found' => 'Страна није пронађена',
+    'sorry_page_not_found' => 'Извините, страна коју сте тражили није могла бити пронађена.',
+    'sorry_page_not_found_permission_warning' => 'Ако сте очекивали да ова страна постоји, можда немате дозволу да је прегледате.',
+    'image_not_found' => 'Слика није пронађена',
+    'image_not_found_subtitle' => 'Извините, слика коју сте тражили није могла бити пронађена.',
+    'image_not_found_details' => 'Ако сте очекивали да ова слика постоји, можда је обрисана.',
+    'return_home' => 'Повратак на почетну',
     'error_occurred' => 'Догодила се грешка',
-    'app_down' => ':appName is down right now',
-    'back_soon' => 'It will be back up soon.',
+    'app_down' => ':appName тренутно није дотупно',
+    'back_soon' => 'Вратиће се ускоро.',
 
     // Import
-    'import_zip_cant_read' => 'Could not read ZIP file.',
-    'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
-    'import_validation_failed' => 'Import ZIP failed to validate with errors:',
-    'import_zip_failed_notification' => 'Failed to import ZIP file.',
-    'import_perms_books' => 'You are lacking the required permissions to create books.',
-    'import_perms_chapters' => 'You are lacking the required permissions to create chapters.',
-    'import_perms_pages' => 'You are lacking the required permissions to create pages.',
-    'import_perms_images' => 'You are lacking the required permissions to create images.',
-    'import_perms_attachments' => 'You are lacking the required permission to create attachments.',
+    'import_zip_cant_read' => 'Није се могла прочитати ZIP датотека.',
+    'import_zip_cant_decode_data' => 'НИје се могла пронаћи и декодовати ZIP data.json садржај.',
+    'import_zip_no_data' => 'Подаци у ZIP датотеци немају очекивани садржај књиге, поглавља или стране.',
+    'import_zip_data_too_large' => 'ZIP data.json садржај превазилази максималну величину за отпремање подешену у апликацији.',
+    'import_validation_failed' => 'Увоз ZIP-а није прошао потврду са овим грешкама:',
+    'import_zip_failed_notification' => 'Неуспео увоз ZIP датотеке.',
+    'import_perms_books' => 'Недостају вам неопходне дозволе да правите књиге.',
+    'import_perms_chapters' => 'Недостају вам неопходне дозволе да правите поглавља.',
+    'import_perms_pages' => 'Недостају вам неопходне дозволе да правите стране.',
+    'import_perms_images' => 'Недостају вам неопходне дозволе да правите слике.',
+    'import_perms_attachments' => 'Недостају вам неопходне дозволе да правите прилоге.',
 
     // API errors
-    'api_no_authorization_found' => 'No authorization token found on the request',
-    'api_bad_authorization_format' => 'An authorization token was found on the request but the format appeared incorrect',
-    'api_user_token_not_found' => 'No matching API token was found for the provided authorization token',
-    'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
-    'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
-    'api_user_token_expired' => 'The authorization token used has expired',
+    'api_no_authorization_found' => 'Није пронађен токен за ауторизацију у захтеву',
+    'api_bad_authorization_format' => 'Токен за ауторизацију је пронађен у захтеву али његов формат делује неисправан',
+    'api_user_token_not_found' => 'Није пронађен одговарајући API токен за достављени токен ауторизације',
+    'api_incorrect_token_secret' => 'Достављена тајна за пружени коришћени API токен није исправна',
+    'api_user_no_api_permission' => 'Власник коришћеног API токена нема дозволе да упућује API позиве',
+    'api_user_token_expired' => 'Коришћени токен за ауторизацију је истекао',
+    'api_cookie_auth_only_get' => 'Дозвољени су само GET захтеви када се користи API са аутентификацијом заснованом на колачићима',
 
     // Settings & Maintenance
-    'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
+    'maintenance_test_email_failure' => 'Враћена је грешка током слања пробне е-поруке:',
 
     // HTTP errors
-    'http_ssr_url_no_match' => 'The URL does not match the configured allowed SSR hosts',
+    'http_ssr_url_no_match' => 'Адреса се не подудара са подешеном за дозвољене SSR домаћине',
 ];
diff --git a/lang/sr/notifications.php b/lang/sr/notifications.php
index 6aa3f2abbaa..f25c7038d9d 100644
--- a/lang/sr/notifications.php
+++ b/lang/sr/notifications.php
@@ -10,11 +10,13 @@
     'new_page_intro' => 'Нова страница је креирана у :appName:',
     'updated_page_subject' => 'Ажурирана страница: :pageName',
     'updated_page_intro' => 'Страница је ажурирана у :appName:',
-    'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'updated_page_debounce' => 'Да би смо спречили масовна обавештења, неко време вам неће бити слата обавештења за измене ове стране од стране истог уредника.',
+    'comment_mention_subject' => 'Поменути сте у коментару на страни: :pageName',
+    'comment_mention_intro' => 'Поменути сте у коментару на :appName:',
 
     'detail_page_name' => 'Назив странице:',
     'detail_page_path' => 'Путања странице:',
-    'detail_commenter' => 'Commenter:',
+    'detail_commenter' => 'Коментатор:',
     'detail_comment' => 'Коментар:',
     'detail_created_by' => 'Креирао/ла:',
     'detail_updated_by' => 'Отпремио/ла:',
@@ -22,6 +24,6 @@
     'action_view_comment' => 'Погледај коментар',
     'action_view_page' => 'Погледај страницу',
 
-    'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.',
-    'footer_reason_link' => 'your notification preferences',
+    'footer_reason' => 'Ово обавештење вам је послато зато што :link покрива ове типове активности за ову ставку.',
+    'footer_reason_link' => 'ваше преференце за обавештавања',
 ];
diff --git a/lang/sr/pagination.php b/lang/sr/pagination.php
index 85bd12fc319..ce1a32bcf08 100644
--- a/lang/sr/pagination.php
+++ b/lang/sr/pagination.php
@@ -6,7 +6,7 @@
  */
 return [
 
-    'previous' => '&laquo; Previous',
-    'next'     => 'Next &raquo;',
+    'previous' => '&laquo; Претходна',
+    'next'     => 'Следећа &raquo;',
 
 ];
diff --git a/lang/sr/passwords.php b/lang/sr/passwords.php
index b408f3c2fda..1c961f6973c 100644
--- a/lang/sr/passwords.php
+++ b/lang/sr/passwords.php
@@ -6,10 +6,10 @@
  */
 return [
 
-    'password' => 'Passwords must be at least eight characters and match the confirmation.',
-    'user' => "We can't find a user with that e-mail address.",
-    'token' => 'The password reset token is invalid for this email address.',
-    'sent' => 'We have e-mailed your password reset link!',
-    'reset' => 'Your password has been reset!',
+    'password' => 'Лозинке морају имати најмање осам карактера и да се поклапају са потврдом.',
+    'user' => "Не можемо да пронађемо корисника са том адресом е-поште.",
+    'token' => 'Токен за поништавање лозинке је неисправан за ову адресу е-поште.',
+    'sent' => 'Послали смо вам везу за поништавање лозинке е-поштом!',
+    'reset' => 'Ваша лозинка је поништена!',
 
 ];
diff --git a/lang/sr/preferences.php b/lang/sr/preferences.php
index 2872f5f3c65..111bca4fb9b 100644
--- a/lang/sr/preferences.php
+++ b/lang/sr/preferences.php
@@ -5,47 +5,69 @@
  */
 
 return [
-    'my_account' => 'My Account',
-
-    'shortcuts' => 'Shortcuts',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
-    'shortcuts_save' => 'Save Shortcuts',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
-
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
-
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
-    'auth_change_password_success' => 'Password has been updated!',
-
-    'profile' => 'Profile Details',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
-    'profile_view_public' => 'View Public Profile',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
-
-    'delete_account' => 'Delete Account',
-    'delete_my_account' => 'Delete My Account',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'my_account' => 'Мој налог',
+
+    'shortcuts' => 'Пречице',
+    'shortcuts_interface' => 'Подешавања пречица интерфејса',
+    'shortcuts_toggle_desc' => 'Овде можете да омогућите или онемогућите пречице тастатуре интерфејса система, које се користе за навигацију и радње.',
+    'shortcuts_customize_desc' => 'Можете да прилагодите сваку пречицу испод. Само притисните жељену комбинацију тастера након одабира уноса за пречицу.',
+    'shortcuts_toggle_label' => 'Пречице тастатуре се омогућене',
+    'shortcuts_section_navigation' => 'Навигација',
+    'shortcuts_section_actions' => 'Уобичајене радње',
+    'shortcuts_save' => 'Сачувај пречице',
+    'shortcuts_overlay_desc' => 'Напомена: Када су пречице омогућене помоћни приказ је доступан притиском на "?" што ће нагласити доступне пречице за радње које су тренутно видљиве на екрану.',
+    'shortcuts_update_success' => 'Преференце пречица су ажуриране!',
+    'shortcuts_overview_desc' => 'Управљајте пречицама тастатуре које можете да користите за навигацију корисничким интерфејсом.',
+
+    'interface' => 'Преференце интерфејса',
+    'interface_desc' => 'Овде можете пронаћи опције да прилагодите изглед корисничког интерфејса апликације.',
+    'interface_display_mode' => 'Режим приказа',
+    'interface_display_mode_desc' => 'Изаберите да ли да апликација буде приказана у тамном или светлом режиму. Ово такође можете променити из почетног приказа, или кроз падајући мени у траци заглавља.',
+    'layouts' => 'Преференце распореда интерфејса',
+    'layouts_desc' => 'Прилагодите распоред секција приказаних у корисничком интерфејсу са неколико приказа.',
+    'layout_edit' => 'Измени распоред',
+    'layout_edit_desc' => 'Превицуте и отпустите секције, или користите мени радњи који се налази на свакој, да подесите које секције се приказују у овом распореду, и где су приказане.',
+    'layout_edit_column_hint' => 'Када се прегледају на екранима мањих диманзија, секција десне колоне биће смештена изнад секције леве колоне.',
+    'layout_edit_save' => 'Сачувај распоред',
+    'layout_edit_layouts' => 'Распореди',
+    'layout_edit_back_to_preferences' => 'Повратак на преференце',
+    'layout_edit_left' => 'Лево',
+    'layout_edit_right' => 'Десно',
+    'layout_edit_center' => 'У средини',
+    'layout_edit_unused' => 'Некоришћено',
+    'layout_edit_empty' => 'Нема секција за приказ',
+    'layout_edit_reset_to_defaults' => 'Врати на подразумевано',
+    'layout_update_success' => 'Преференце распореда су измењене!',
+    'layout_reset_success' => 'Поништене су преференце распореда!',
+
+    'notifications' => 'Подешавања обавештавања',
+    'notifications_desc' => 'Контролишите обавештења е-поштом која добијате када се изврши одређена активност у оквиру система.',
+    'notifications_opt_own_page_changes' => 'Обавести ме о изменама страница чији сам власник',
+    'notifications_opt_own_page_comments' => 'Обавести ме о коментарима на странама чији сам власник',
+    'notifications_opt_comment_mentions' => 'Обавести ме када сам поменут у коментару',
+    'notifications_opt_comment_replies' => 'Обавести ме о одговорима на моје коментаре',
+    'notifications_save' => 'Сачувај подешавања',
+    'notifications_update_success' => 'Преференце обавештења су ажуриране!',
+    'notifications_watched' => 'Праћене и игнорисане ставке',
+    'notifications_watched_desc' => 'Испод су ставке над којима су примењене прилагођене преференце праћења. Да би сте ажурирали ваше преференце за ове, погледајте ставку па затим пронађите опције праћења у траци са стране.',
+
+    'auth' => 'Приступ и безбедност',
+    'auth_change_password' => 'Промени лозинку',
+    'auth_change_password_desc' => 'Промените лозинку коју користите за пријављивање у апликацију. Она мора бити дугачка најмање 8 карактера.',
+    'auth_change_password_success' => 'Лозинка је ажурирана!',
+
+    'profile' => 'Детаљи о профилу',
+    'profile_desc' => 'Управљајте детаљима вашег налога чиме се представљате другим корисницима, поред детаља који се користе за комункацију и персонализацију система.',
+    'profile_view_public' => 'Погледај јавни профил',
+    'profile_name_desc' => 'Подесите ваше име за приказ које је видљво другим корисницима у систему кроз активности које извршавате и садржај који је у вашем власништу.',
+    'profile_email_desc' => 'Ова е-пошта ће се користити за обавештења и, у зависности од система аутентификације, прступ систему.',
+    'profile_email_no_permission' => 'На жалост немате дозволу да мењате адресу ваше е-поште. Ако желите да је промените, мораћете да замолите администратора да то уради уместо вас.',
+    'profile_avatar_desc' => 'Изаберите слику која ће се користити да се представљате другима у систему. Идеално би требала бити четвртаста и око 256px у ширини и висини.',
+    'profile_admin_options' => 'Администраторске опције',
+    'profile_admin_options_desc' => 'Додатне опције администраторског нивоа, попут оних за управљање доделама улога, се могу пронаћи у корисничком налогу под опцијом "Поставке > Корисници".',
+
+    'delete_account' => 'Обриши налог',
+    'delete_my_account' => 'Обриши мој налог',
+    'delete_my_account_desc' => 'Ово ће у потпуности обисати ваш кориснички налог из система. Нећете моћи да повратите овај налог или да поништите ову радњу. Садржај који сте направили, као што су странице и отпремљене слике, ће остати.',
+    'delete_my_account_warning' => 'Да ли заиста желите да обришете ваш налог?',
 ];
diff --git a/lang/sr/settings.php b/lang/sr/settings.php
index b7213e905b0..465b41bf650 100644
--- a/lang/sr/settings.php
+++ b/lang/sr/settings.php
@@ -7,24 +7,24 @@
 return [
 
     // Common Messages
-    'settings' => 'Подешавања',
-    'settings_save' => 'Сачувај подешавања',
+    'settings' => 'Поставке',
+    'settings_save' => 'Сачувај поставке',
     'system_version' => 'Верзија система',
     'categories' => 'Категорије',
 
     // App Settings
-    'app_customization' => 'Прилгођавање',
+    'app_customization' => 'Прилагођавање',
     'app_features_security' => 'Својства и сигурност',
     'app_name' => 'Назив апликације',
     'app_name_desc' => 'Ово име се приказује у заглављу и у свим системским порукама е-поште.',
     'app_name_header' => 'Прикажи назив у заглављу',
-    'app_public_access' => 'Javni pristup',
-    'app_public_access_desc' => 'Омогућавање ове опције ће омогућити посетиоцима, који нису пријављени, да приступе садржају у вашој Боокстак инстанци.',
+    'app_public_access' => 'Јавни приступ',
+    'app_public_access_desc' => 'Омогућавање ове опције ће омогућити посетиоцима, који нису пријављени, да приступе садржају у вашој Букстек инстанци.',
     'app_public_access_desc_guest' => 'Приступ за јавне посетиоце може се контролисати преко корисника „Гост“.',
     'app_public_access_toggle' => 'Дозволи јавни приступ',
     'app_public_viewing' => 'Дозволити јавно гледање?',
-    'app_secure_images' => 'Веће безбедност отпремања слика',
-    'app_secure_images_toggle' => 'Омогућите већу безбедност отпремања слика',
+    'app_secure_images' => 'Већа безбедност при отпремању слика',
+    'app_secure_images_toggle' => 'Омогући већу безбедност при отпремању слика',
     'app_secure_images_desc' => 'Из разлога перформанси, све слике су јавне. Ова опција додаје насумичан низ који је тешко погодити испред Урл-ова слике. Уверите се да индекси директоријума нису омогућени да бисте спречили лак приступ.',
     'app_default_editor' => 'Подразумевани уређивач страница',
     'app_default_editor_desc' => 'Изаберите који уређивач ће се подразумевано користити приликом уређивања нових страница. Ово се може заменити на нивоу странице где дозволе дозвољавају.',
@@ -75,34 +75,36 @@
     'reg_confirm_restrict_domain_placeholder' => 'Нема постављених ограничења',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
-    'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
-    'sorting_rules' => 'Sort Rules',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
-    'sort_rule_assigned_to_x_books' => 'Assigned to :count Book|Assigned to :count Books',
-    'sort_rule_create' => 'Create Sort Rule',
-    'sort_rule_edit' => 'Edit Sort Rule',
-    'sort_rule_delete' => 'Delete Sort Rule',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
-    'sort_rule_details' => 'Sort Rule Details',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
-    'sort_rule_available_operations' => 'Available Operations',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
-    'sort_rule_op_name' => 'Name - Alphabetical',
-    'sort_rule_op_name_numeric' => 'Name - Numeric',
-    'sort_rule_op_created_date' => 'Created Date',
-    'sort_rule_op_updated_date' => 'Updated Date',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting' => 'Спискови и разврставање',
+    'sorting_book_default' => 'Подразумевано правило разврставања',
+    'sorting_book_default_desc' => 'Одаберите подразумевано правило разврставање за нове књиге. Ово неће утицати на постојеће књиге и може бити прерађено за сваку књигу.',
+    'sorting_rules' => 'Правила разврставања',
+    'sorting_rules_desc' => 'Ово су предефинисане операције разврставања које се могу применити на садржај у систему.',
+    'sort_rule_assigned_to_x_books' => 'Додељено :count књизи|Додељено :count књигама',
+    'sort_rule_create' => 'Направи правило разврставања',
+    'sort_rule_edit' => 'Измени правило разврставања',
+    'sort_rule_delete' => 'Обриши правило разврставања',
+    'sort_rule_delete_desc' => 'Уклоните ово правило разврставања из система. Књиге које користе ово разврставање ће се вратити на ручно разврставање.',
+    'sort_rule_delete_warn_books' => 'Ово правило разврставања тренутно користе :count књиге. Да ли заиста желите да обришете ово?',
+    'sort_rule_delete_warn_default' => 'Ово правило разврставања се тренутно користи као подразумевано за књиге. Да ли заиста желите да обришете ово?',
+    'sort_rule_details' => 'Детаљи правила разврставања',
+    'sort_rule_details_desc' => 'Подесите назив за ово правило, које ће се појавити у списковима када корисници бирају разврставање.',
+    'sort_rule_operations' => 'Операције разврставања',
+    'sort_rule_operations_desc' => 'Конфигуришите радње разврставања за извршавање њиховим премештањем из списка доступних операција. Након употребе, операције ће се применити редом, од врха ка дну. Све промене извршене овде ће се применити на свим додељеним књигама након снимања.',
+    'sort_rule_available_operations' => 'Доступне операције',
+    'sort_rule_available_operations_empty' => 'Нема преосталих операција',
+    'sort_rule_configured_operations' => 'Подешене операције',
+    'sort_rule_configured_operations_empty' => 'Превуците/додајте операције са списка "Доступне операције"',
+    'sort_rule_op_asc' => '(раст)',
+    'sort_rule_op_desc' => '(опад)',
+    'sort_rule_op_name' => 'Назив - азбучно',
+    'sort_rule_op_name_numeric' => 'Назив - нумеричко',
+    'sort_rule_op_created_date' => 'Датум прављења',
+    'sort_rule_op_updated_date' => 'Датум ажурирања',
+    'sort_rule_op_chapters_first' => 'Прво поглавља',
+    'sort_rule_op_chapters_last' => 'Последње поглавља',
+    'sorting_page_limits' => 'Ограничења приказа по страници',
+    'sorting_page_limits_desc' => 'Подесите колико ставки се приказује по страни на разним списковима у систему. Типично мањи број ће пружити боље перформансе, док ће већи избећи потребу листање вишеструко страна. Препоручује се коришћење броја дељивог са 6.',
 
     // Maintenance settings
     'maint' => 'Одржавање',
@@ -111,68 +113,68 @@
     'maint_delete_images_only_in_revisions' => 'Такође избришите слике које постоје само у старим ревизијама странице',
     'maint_image_cleanup_run' => 'Покрени чишћење',
     'maint_image_cleanup_warning' => ':count пронађене су потенцијално неискоришћене слике. Да ли сте сигурни да желите да избришете ове слике?',
-    'maint_image_cleanup_success' => ':count potentially unused images found and deleted!',
-    'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!',
-    'maint_send_test_email' => 'Send a Test Email',
-    'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.',
-    'maint_send_test_email_run' => 'Send test email',
-    'maint_send_test_email_success' => 'Email sent to :address',
-    'maint_send_test_email_mail_subject' => 'Test Email',
-    'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!',
-    'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.',
-    'maint_recycle_bin_desc' => 'Deleted shelves, books, chapters & pages are sent to the recycle bin so they can be restored or permanently deleted. Older items in the recycle bin may be automatically removed after a while depending on system configuration.',
-    'maint_recycle_bin_open' => 'Open Recycle Bin',
-    'maint_regen_references' => 'Regenerate References',
-    'maint_regen_references_desc' => 'This action will rebuild the cross-item reference index within the database. This is usually handled automatically but this action can be useful to index old content or content added via unofficial methods.',
-    'maint_regen_references_success' => 'Reference index has been regenerated!',
-    'maint_timeout_command_note' => 'Note: This action can take time to run, which can lead to timeout issues in some web environments. As an alternative, this action be performed using a terminal command.',
+    'maint_image_cleanup_success' => ':count потенцијално некоришћених слика је пронађено и обрисано!',
+    'maint_image_cleanup_nothing_found' => 'Нису пронађене некоришћене слике. Ништа није обрисано!',
+    'maint_send_test_email' => 'Пошаљи пробну е-поруку',
+    'maint_send_test_email_desc' => 'Ово шаље пробну е-поруку на вашу адресу е-поште наведену у вашем профилу.',
+    'maint_send_test_email_run' => 'Пошаљи пробну е-поруку',
+    'maint_send_test_email_success' => 'Е-порука послата на :address',
+    'maint_send_test_email_mail_subject' => 'Пробна порука',
+    'maint_send_test_email_mail_greeting' => 'Чини се да достава е-порука функционише!',
+    'maint_send_test_email_mail_text' => 'Честитамо! С обзиром да сте добили ово обавештење е-поруком, чини се да су ваше поставке исправно подешене.',
+    'maint_recycle_bin_desc' => 'Обрисане полице, књиге, поглављи и стране се шаљу у канту за отпатке да би се могле повратити или трајно обрисати. Старије ставке у канти могу се аутоматски уклонити након неког времена у зависности од подешавања система.',
+    'maint_recycle_bin_open' => 'Отвори канту',
+    'maint_regen_references' => 'Регенериши референце',
+    'maint_regen_references_desc' => 'Ова радња ће поново изградити индекс референце међу ставкама унутар базе података. Ово се обчно решава аутоматски али ова радња може бити корисна за индексацију старог садржаја или садржаја додатог кроз незваничне начине.',
+    'maint_regen_references_success' => 'Индекс референци је регенерисан!',
+    'maint_timeout_command_note' => 'Напомена: Овој радњи треба времена да се изврши, што може довести до проблема са истеком времена чекања у неким веб окружењима. Као алтернатива, ова радња се може извршити користећи команду у терминалу.',
 
     // Recycle Bin
-    'recycle_bin' => 'Recycle Bin',
-    'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
-    'recycle_bin_deleted_item' => 'Deleted Item',
-    'recycle_bin_deleted_parent' => 'Parent',
-    'recycle_bin_deleted_by' => 'Deleted By',
-    'recycle_bin_deleted_at' => 'Deletion Time',
-    'recycle_bin_permanently_delete' => 'Permanently Delete',
-    'recycle_bin_restore' => 'Restore',
-    'recycle_bin_contents_empty' => 'The recycle bin is currently empty',
-    'recycle_bin_empty' => 'Empty Recycle Bin',
-    'recycle_bin_empty_confirm' => 'This will permanently destroy all items in the recycle bin including content contained within each item. Are you sure you want to empty the recycle bin?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
-    'recycle_bin_destroy_list' => 'Items to be Destroyed',
-    'recycle_bin_restore_list' => 'Items to be Restored',
-    'recycle_bin_restore_confirm' => 'This action will restore the deleted item, including any child elements, to their original location. If the original location has since been deleted, and is now in the recycle bin, the parent item will also need to be restored.',
-    'recycle_bin_restore_deleted_parent' => 'The parent of this item has also been deleted. These will remain deleted until that parent is also restored.',
-    'recycle_bin_restore_parent' => 'Restore Parent',
-    'recycle_bin_destroy_notification' => 'Deleted :count total items from the recycle bin.',
-    'recycle_bin_restore_notification' => 'Restored :count total items from the recycle bin.',
+    'recycle_bin' => 'Канта за отпатке',
+    'recycle_bin_desc' => 'Одавде можете да вратите ставке које су обрисане или изабрати да их трајно уклоните из система. Овај списак није филтриран за разлику од сличних слискова активности у систему где су примењени филтери дозвола.',
+    'recycle_bin_deleted_item' => 'Обрисана ставка',
+    'recycle_bin_deleted_parent' => 'Родитељ',
+    'recycle_bin_deleted_by' => 'Избрисао',
+    'recycle_bin_deleted_at' => 'Време брисања',
+    'recycle_bin_permanently_delete' => 'Обриши трајно',
+    'recycle_bin_restore' => 'Поврати',
+    'recycle_bin_contents_empty' => 'Канта је тренутно празна',
+    'recycle_bin_empty' => 'Испразни канту',
+    'recycle_bin_empty_confirm' => 'Ово ће трајно уништити све ставке у канти укључујући садржај унутар сваке ставке. Да ли заиста желите да испразните канту за отпатке?',
+    'recycle_bin_destroy_confirm' => 'Ова радња ће трајно обрисати ову ставку из система, заједно са наследним елементима наведеним испод, и нећете моћи да вратите садржај. Да ли заиста желите да трајно обришете ову ставку?',
+    'recycle_bin_destroy_list' => 'Ставке за уништавање',
+    'recycle_bin_restore_list' => 'Ставке за опоравак',
+    'recycle_bin_restore_confirm' => 'Ова радња ће вратити обрисану ставку, укључујући наследне елементе , на њихову оригиналну локацију. Ако је оригинална локација од тада обрисана, и сада се налази у канти за отпатке, родитељска ставка се такође мора вратити.',
+    'recycle_bin_restore_deleted_parent' => 'Раодитељ ове ставке је такође обрисан. Ово ће остати обрисано док се не врати тај родитељ..',
+    'recycle_bin_restore_parent' => 'Врати родитеља',
+    'recycle_bin_destroy_notification' => 'Обрисано :count ставки укупно из канте за отпатке.',
+    'recycle_bin_restore_notification' => 'Враћено :count ставки укупно из канте за отпатке.',
 
     // Audit Log
-    'audit' => 'Audit Log',
-    'audit_desc' => 'This audit log displays a list of activities tracked in the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
-    'audit_event_filter' => 'Event Filter',
-    'audit_event_filter_no_filter' => 'No Filter',
+    'audit' => 'Запис за ревизију',
+    'audit_desc' => 'Овај запис за ревизију приказује списак активности које се прате усистему. Овај списак није филтриран за разлику од сличних слискова активности у систему где су примењени филтери дозвола.',
+    'audit_event_filter' => 'Филтер догађаја',
+    'audit_event_filter_no_filter' => 'Без филтера',
     'audit_deleted_item' => 'Избрисана ставка',
-    'audit_deleted_item_name' => 'Name: :name',
+    'audit_deleted_item_name' => 'Назив: :name',
     'audit_table_user' => 'Корисник',
     'audit_table_event' => 'Догађај',
-    'audit_table_related' => 'Related Item or Detail',
+    'audit_table_related' => 'Повезана ставка или детаљ',
     'audit_table_ip' => 'ИП адреса',
     'audit_table_date' => 'Датум активности',
-    'audit_date_from' => 'Date Range From',
-    'audit_date_to' => 'Date Range To',
+    'audit_date_from' => 'Опсег датума од',
+    'audit_date_to' => 'Опсег датума до',
 
     // Role Settings
     'roles' => 'Улоге',
-    'role_user_roles' => 'User Roles',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
-    'role_create' => 'Create New Role',
-    'role_delete' => 'Delete Role',
+    'role_user_roles' => 'Корисничке улоге',
+    'roles_index_desc' => 'Улоге се користе да би се груписали корисници и доделиле дозволе за систем њиховим члановима. Када је корисник члан вишеструко група привилегије додељене ће се објединити и корисник ће наследити све способности.',
+    'roles_x_users_assigned' => ':count корисник додељен|:count корисника додељено',
+    'roles_x_permissions_provided' => ':count дозвола|:count дозвола',
+    'roles_assigned_users' => 'Додељени корисници',
+    'roles_permissions_provided' => 'Пружене дозволе',
+    'role_create' => 'Направи нову улогу',
+    'role_delete' => 'Обриши улогу',
     'role_delete_confirm' => 'Ово ће избрисати улогу са именом \':roleName\'.',
     'role_delete_users_assigned' => 'Ова улога има :userCount корисника који су јој додељени. Ако желите да мигрирате кориснике са ове улоге, изаберите нову улогу испод.',
     'role_delete_no_migration' => "Немојте мигрирати кориснике",
@@ -182,139 +184,146 @@
     'role_name' => 'Назив улоге',
     'role_desc' => 'Кратак опис улоге',
     'role_mfa_enforced' => 'Захтева вишефакторску аутентификацију',
-    'role_external_auth_id' => 'External Authentication IDs',
-    'role_system' => 'System Permissions',
-    'role_manage_users' => 'Manage users',
-    'role_manage_roles' => 'Manage roles & role permissions',
-    'role_manage_entity_permissions' => 'Manage all book, chapter & page permissions',
-    'role_manage_own_entity_permissions' => 'Manage permissions on own book, chapter & pages',
-    'role_manage_page_templates' => 'Manage page templates',
-    'role_access_api' => 'Access system API',
-    'role_manage_settings' => 'Manage app settings',
-    'role_export_content' => 'Export content',
-    'role_import_content' => 'Import content',
-    'role_editor_change' => 'Change page editor',
-    'role_notifications' => 'Receive & manage notifications',
-    'role_asset' => 'Asset Permissions',
-    'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
-    'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
-    'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
-    'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
-    'role_all' => 'All',
-    'role_own' => 'Own',
-    'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
-    'role_save' => 'Save Role',
-    'role_users' => 'Users in this role',
-    'role_users_none' => 'No users are currently assigned to this role',
+    'role_external_auth_id' => 'ID-јеви екстерне аутентификације',
+    'role_system' => 'Системске дозволе',
+    'role_manage_users' => 'Управља корисницима',
+    'role_manage_roles' => 'Управља улогама и дозволама улога',
+    'role_manage_entity_permissions' => 'Управља дозволама над свим елементима',
+    'role_manage_own_entity_permissions' => 'Управља дозволама над сопственим елементима',
+    'role_manage_page_templates' => 'Управља шаблонима страна',
+    'role_access_api' => 'Приступа системском API-ју',
+    'role_manage_settings' => 'Управља поставкама апликације',
+    'role_export_content' => 'Извози садржај',
+    'role_import_content' => 'Увози садржај',
+    'role_editor_change' => 'Мења уређивач стране',
+    'role_notifications' => 'Прима и управља обавештењима',
+    'role_permission_note_users_and_roles' => 'Ове дозволе ће технички такође омогућити видљивост и претрагу корисника и улога у систему.',
+    'role_asset' => 'Дозволе над имовином',
+    'roles_system_warning' => 'Имајте на уму да приступ било којој од дозвола изнад може да дозволи кориснику да измени сопствене привилегије или привилегије других у систему. Доделите улоге са овим дозволама само корисницима од поверења.',
+    'role_asset_desc' => 'Ове дозволе конторлишу подразумевани приступ имовини унутар система. Дозволе над књигама, поглављима и странама ће прерадити ове дозволе.',
+    'role_asset_admins' => 'Администраторима је аутоматски дат приступ целом садржају али ове опције могу да прикажу или сакрију опције на интерфејсу.',
+    'role_asset_image_view_note' => 'Ово се односи на видљивост унутар менаџера слика. Сам приступ отпремљеним сликама зависиће од системских опције складиштења слика.',
+    'role_asset_users_note' => 'Ове дозволе ће технички такође омогућити видљивост и претрагу корисника у систему.',
+    'role_all' => 'Све',
+    'role_own' => 'Власник',
+    'role_permission_aria' => ':action :resource: :value',
+    'role_controlled_by_asset' => 'Контролисано по имовини у којој су постављене',
+    'role_controlled_by_page_delete' => 'Контролисано дозволама брисања од странице',
+    'role_save' => 'Сачувај улогу',
+    'role_users' => 'Корисници са овом улогом',
+    'role_users_none' => 'Тренутно ниједном кориснику није додељена ова улога',
 
     // Users
-    'users' => 'Users',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
-    'user_profile' => 'User Profile',
-    'users_add_new' => 'Add New User',
-    'users_search' => 'Search Users',
-    'users_latest_activity' => 'Latest Activity',
-    'users_details' => 'User Details',
-    'users_details_desc' => 'Set a display name and an email address for this user. The email address will be used for logging into the application.',
-    'users_details_desc_no_email' => 'Set a display name for this user so others can recognise them.',
-    'users_role' => 'User Roles',
-    'users_role_desc' => 'Select which roles this user will be assigned to. If a user is assigned to multiple roles the permissions from those roles will stack and they will receive all abilities of the assigned roles.',
-    'users_password' => 'User Password',
-    'users_password_desc' => 'Set a password used to log-in to the application. This must be at least 8 characters long.',
-    'users_send_invite_text' => 'You can choose to send this user an invitation email which allows them to set their own password otherwise you can set their password yourself.',
-    'users_send_invite_option' => 'Send user invite email',
-    'users_external_auth_id' => 'External Authentication ID',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
-    'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
-    'users_delete' => 'Delete User',
-    'users_delete_named' => 'Delete user :userName',
-    'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',
-    'users_delete_confirm' => 'Are you sure you want to delete this user?',
-    'users_migrate_ownership' => 'Migrate Ownership',
-    'users_migrate_ownership_desc' => 'Select a user here if you want another user to become the owner of all items currently owned by this user.',
-    'users_none_selected' => 'No user selected',
-    'users_edit' => 'Edit User',
-    'users_edit_profile' => 'Edit Profile',
-    'users_avatar' => 'User Avatar',
-    'users_avatar_desc' => 'Select an image to represent this user. This should be approx 256px square.',
-    'users_preferred_language' => 'Preferred Language',
-    'users_preferred_language_desc' => 'This option will change the language used for the user-interface of the application. This will not affect any user-created content.',
-    'users_social_accounts' => 'Social Accounts',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
-    'users_social_accounts_info' => 'Here you can connect your other accounts for quicker and easier login. Disconnecting an account here does not revoke previously authorized access. Revoke access from your profile settings on the connected social account.',
-    'users_social_connect' => 'Connect Account',
-    'users_social_disconnect' => 'Disconnect Account',
-    'users_social_status_connected' => 'Connected',
-    'users_social_status_disconnected' => 'Disconnected',
-    'users_social_connected' => ':socialAccount account was successfully attached to your profile.',
-    'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.',
-    'users_api_tokens' => 'API Tokens',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
-    'users_api_tokens_none' => 'No API tokens have been created for this user',
-    'users_api_tokens_create' => 'Create Token',
-    'users_api_tokens_expires' => 'Expires',
-    'users_api_tokens_docs' => 'API Documentation',
-    'users_mfa' => 'Multi-Factor Authentication',
-    'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
-    'users_mfa_x_methods' => ':count method configured|:count methods configured',
-    'users_mfa_configure' => 'Configure Methods',
+    'users' => 'Корисници',
+    'users_index_desc' => 'Правите и управљајте појединачним налозима корисника унутар система. Кориснички налози се користе за пријављивање и приписивање садржаја и активности. Дозволе за приступ су примарно базиране на улогама али власништо над корисничким садржајем, између осталог, такође може да утиче на дозволе и приступ.',
+    'user_profile' => 'Кориснички профил',
+    'users_add_new' => 'Додај новог корисника',
+    'users_search' => 'Претражи кориснике',
+    'users_latest_activity' => 'Последња активност',
+    'users_details' => 'Детаљи о кориснику',
+    'users_details_desc' => 'Подесите име за приказ и адресу е-поште за овог корисника. Ова адреса е-поште ће се користити за пријављивање у апликацију.',
+    'users_details_desc_no_email' => 'Подесите име за приказ за овог корисника како би други могли да га препознају.',
+    'users_role' => 'Корисничке улоге',
+    'users_role_desc' => 'Одаберите које улоге ће бити додељене кориснику. Ако је кориснику додељено више улога, дозволе од тих улога ће се сакупити и они ће добити све дозволе додељених улога.',
+    'users_password' => 'Корисничка лозинка',
+    'users_password_desc' => 'Подесите лозинку која се користи за пријављивање у апликацију. Она мора имати најмање 8 карактера.',
+    'users_send_invite_text' => 'Можете изабрати да овом кориснику пошаљете позивницу е-поруком што ће им омогућити да самостално подесе своју лозинку. У супротном можете је сами подесити.',
+    'users_send_invite_option' => 'Пошаљи кориснику позивницу е-поруком',
+    'users_external_auth_id' => 'ID екстерне аутентификације',
+    'users_external_auth_id_desc' => 'Када се користи екстерни систем за аутентификацију (попут SAML2, OIDC или LDAP) ово је ID који повезује овог BookStack корисника са налогом система за аутентфикацију. Можете игнорисати ово поље ако користите подразумевану аутентификацију засновану на е-пошти.',
+    'users_password_warning' => 'Попуните поља испод само ако желите да промените лозинку овом кориснику.',
+    'users_system_public' => 'Овај корисник представља сваког госта који посећује вашу инстанцу. Не може се користити за пријављивање али је аутоматски додељен.',
+    'users_delete' => 'Обриши корисника',
+    'users_delete_named' => 'Обриши корисника :userName',
+    'users_delete_warning' => 'Ово ће у потпуности да обрише овог корисника са именом \':userName\' из система.',
+    'users_delete_confirm' => 'Да ли заиста желите да обришете овог корисника?',
+    'users_migrate_ownership' => 'Миграција власништва',
+    'users_migrate_ownership_desc' => 'Овде одаберите корисника ако желите да други корисник постане власник свих ставки за које је власник овај корисник.',
+    'users_none_selected' => 'Корисник није изабран',
+    'users_edit' => 'Измени корисника',
+    'users_edit_profile' => 'Измена профила',
+    'users_avatar' => 'Аватар корисника',
+    'users_avatar_desc' => 'Изаберите слику која ће да представља овог корисника. Требала би бити квадрат приближно 256px.',
+    'users_preferred_language' => 'Преферирани језик',
+    'users_preferred_language_desc' => 'Ова опција ће променити језик који се користи за кориснички интерфејс апликације. Ово неће утицати на било какав садржај направљен од стране корисника.',
+    'users_social_accounts' => 'Налози друштвених мрежа',
+    'users_social_accounts_desc' => 'Погледајте статус повезаних налога друштвених мрежа за овог корисника. Налози друштвених мрежа се могу користити за приступ систему поред примарног система за аутентификацију.',
+    'users_social_accounts_info' => 'Овде можете да повежете ваше друге налоге за бржу и лакшу пријаву. Развезивање налога овде не укида претходно ауторизован приступ. Повуците приступ из поставки вашег профила на повезаном налогу друштвене мреже.',
+    'users_social_connect' => 'Повежи налог',
+    'users_social_disconnect' => 'Развежи налог',
+    'users_social_status_connected' => 'Повезан',
+    'users_social_status_disconnected' => 'Развезан',
+    'users_social_connected' => ':socialAccount налог је успешно закачен на ваш профил.',
+    'users_social_disconnected' => ':socialAccount налог је успешно развезан са вашег профила.',
+    'users_api_tokens' => 'API токени',
+    'users_api_tokens_desc' => 'Направљај и управљај токенима за приступ који се користе за аутентификацију са BookStack REST API-јем. Дозволама за API се управља кроз корисника којем припада токен.',
+    'users_api_tokens_none' => 'Још ниједан API токен није направљен за овог корисника',
+    'users_api_tokens_create' => 'Направи токен',
+    'users_api_tokens_expires' => 'Истиче',
+    'users_api_tokens_docs' => 'API документација',
+    'users_mfa' => 'Вишефакторска аутентификација',
+    'users_mfa_desc' => 'Подесите вишефакторску аутентификацију ка додатни слој безбедности за ваш кориснички налог.',
+    'users_mfa_x_methods' => ':count начин подешен|:count начина су подешена',
+    'users_mfa_configure' => 'Подеси начине',
+    'users_mfa_reset' => 'Поништи начине вишефакторске аутентификације',
+    'users_mfa_reset_desc' => 'Ово ће понитити и почистити све подешене начине вишефакторске аутентификације за овог корисника. Ако је вишефакторска аутентификација неопходна за било коју од његових улога, од њих ће бити затражено да подесе нови начин приликом наредне пријаве.',
+    'users_mfa_reset_confirm' => 'Да ли заиста желите да поништите вишефакторску аутентификацију за овог корисника?',
 
     // API Tokens
-    'user_api_token_create' => 'Create API Token',
-    'user_api_token_name' => 'Name',
-    'user_api_token_name_desc' => 'Give your token a readable name as a future reminder of its intended purpose.',
-    'user_api_token_expiry' => 'Expiry Date',
-    'user_api_token_expiry_desc' => 'Set a date at which this token expires. After this date, requests made using this token will no longer work. Leaving this field blank will set an expiry 100 years into the future.',
-    'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.',
-    'user_api_token' => 'API Token',
-    'user_api_token_id' => 'Token ID',
-    'user_api_token_id_desc' => 'This is a non-editable system generated identifier for this token which will need to be provided in API requests.',
-    'user_api_token_secret' => 'Token Secret',
-    'user_api_token_secret_desc' => 'This is a system generated secret for this token which will need to be provided in API requests. This will only be displayed this one time so copy this value to somewhere safe and secure.',
-    'user_api_token_created' => 'Token created :timeAgo',
-    'user_api_token_updated' => 'Token updated :timeAgo',
-    'user_api_token_delete' => 'Delete Token',
-    'user_api_token_delete_warning' => 'This will fully delete this API token with the name \':tokenName\' from the system.',
-    'user_api_token_delete_confirm' => 'Are you sure you want to delete this API token?',
+    'user_api_token_create' => 'Направи API токен',
+    'user_api_token_name' => 'Назив',
+    'user_api_token_name_desc' => 'Дајте вашем токену читљив назив као будући подсетник његове сврхе.',
+    'user_api_token_expiry' => 'Датум истека',
+    'user_api_token_expiry_desc' => 'Подесите датум када истиче ваш токен. Након овог датума, захтеви послати користећи овај токен више неће функционисати. Остављањем овог поља празним ће подесити истек 100 година у будућности.',
+    'user_api_token_create_secret_message' => 'Моментално након прављења овог токена "ID токена" и "Тајна токена" ће бити генерисани и приказани. Тајна ће бити приказана само једном зато се потрудите да ископирате вредност на неко сигурно и безбедно место пре настављања.',
+    'user_api_token' => 'API токен',
+    'user_api_token_id' => 'ID токена',
+    'user_api_token_id_desc' => 'Ово је неизменљиви идентификатор који је генерисао систем за овај токен којег треба доставити у API захтевима.',
+    'user_api_token_secret' => 'Тајна токена',
+    'user_api_token_secret_desc' => 'Ово је тајна коју је генерисао систем за овај токен коју треба доставити у API захтевима. Ово ће бити приказано само једном зато ископирајте ову вредност на неко сигурно и безбедно место.',
+    'user_api_token_created' => 'Токен је направљен :timeAgo',
+    'user_api_token_updated' => 'Токен је ажуриран :timeAgo',
+    'user_api_token_delete' => 'Обриши токен',
+    'user_api_token_delete_warning' => 'Ово ће у потпуности обрисати овај API токен са називом \':tokenName\' из система.',
+    'user_api_token_delete_confirm' => 'Да ли заиста желите да обришете овај API токен?',
 
     // Webhooks
-    'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
-    'webhooks_create' => 'Create New Webhook',
-    'webhooks_none_created' => 'No webhooks have yet been created.',
-    'webhooks_edit' => 'Edit Webhook',
-    'webhooks_save' => 'Save Webhook',
-    'webhooks_details' => 'Webhook Details',
-    'webhooks_details_desc' => 'Provide a user friendly name and a POST endpoint as a location for the webhook data to be sent to.',
-    'webhooks_events' => 'Webhook Events',
-    'webhooks_events_desc' => 'Select all the events that should trigger this webhook to be called.',
-    'webhooks_events_warning' => 'Keep in mind that these events will be triggered for all selected events, even if custom permissions are applied. Ensure that use of this webhook won\'t expose confidential content.',
-    'webhooks_events_all' => 'All system events',
-    'webhooks_name' => 'Webhook Name',
-    'webhooks_timeout' => 'Webhook Request Timeout (Seconds)',
-    'webhooks_endpoint' => 'Webhook Endpoint',
-    'webhooks_active' => 'Webhook Active',
-    'webhook_events_table_header' => 'Events',
-    'webhooks_delete' => 'Delete Webhook',
-    'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.',
-    'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?',
-    'webhooks_format_example' => 'Webhook Format Example',
-    'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.',
-    'webhooks_status' => 'Webhook Status',
-    'webhooks_last_called' => 'Last Called:',
-    'webhooks_last_errored' => 'Last Errored:',
-    'webhooks_last_error_message' => 'Last Error Message:',
+    'webhooks' => 'Веб закачке',
+    'webhooks_index_desc' => 'Веб закачке су начин да се пошаљу подаци на екстерне УРЛ адресе када се одређене радње и догађаји одвију унутар система који дозвољава интеграцију засновану на догађајима са екстерним платформама као што су размена порука или системи за обавештавање.',
+    'webhooks_x_trigger_events' => ':count окидач догађаја|:count окидача догађаја',
+    'webhooks_create' => 'Направи нову веб закачку',
+    'webhooks_none_created' => 'Још нису направљене веб закачке.',
+    'webhooks_edit' => 'Измени веб закачку',
+    'webhooks_save' => 'Сачувај веб закачку',
+    'webhooks_details' => 'Детаљи веб закачке',
+    'webhooks_details_desc' => 'Пружите одговарајући назив и POST крајњу тачку којој слати податке ове веб закачке.',
+    'webhooks_events' => 'Догађаји веб закачке',
+    'webhooks_events_desc' => 'Изаберите све догађаје који требају да окину позив за ову веб закачку.',
+    'webhooks_events_warning' => 'Имајте на уму да ће ови догађаји бити окинути за све изабране догађаје, чак и када су примењене прилагођене дозволе. Обезбедите да коришћење ове веб закачке неће изложити поверљив садржај.',
+    'webhooks_events_all' => 'Сви догађаји система',
+    'webhooks_name' => 'Назив веб закачке',
+    'webhooks_timeout' => 'Време чекања на веб закачку (секунде)',
+    'webhooks_endpoint' => 'Крајња тачка веб закачке',
+    'webhooks_active' => 'Веб закачка је активна',
+    'webhook_events_table_header' => 'Догађаји',
+    'webhooks_delete' => 'Обриши веб закачку',
+    'webhooks_delete_warning' => 'Ово ће у потпуности обрисати ову веб закачку са називом \':webhookName\' из система.',
+    'webhooks_delete_confirm' => 'Да ли заиста желите да обришете ову веб закачку?',
+    'webhooks_format_example' => 'Пример формата веб закачке',
+    'webhooks_format_example_desc' => 'Податак веб закачке се шаље као POST захтев подешеној крајњој тачки као JSON пратећи формат испод. "related_item" и "url" својства су опциона и зависиће од типе окинутог догађаја.',
+    'webhooks_status' => 'Статус веб закачке',
+    'webhooks_last_called' => 'Последњи пут позвана:',
+    'webhooks_last_errored' => 'Последња грешка:',
+    'webhooks_last_error_message' => 'Порука последње грешке:',
 
     // Licensing
-    'licenses' => 'Licenses',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
-    'licenses_bookstack' => 'BookStack License',
-    'licenses_php' => 'PHP Library Licenses',
-    'licenses_js' => 'JavaScript Library Licenses',
-    'licenses_other' => 'Other Licenses',
-    'license_details' => 'License Details',
+    'licenses' => 'Лиценце',
+    'licenses_desc' => 'Ова страна приказује детаљне информације о лиценци за BookStack поред самих пројеката и библиотека које се користе унутар BookStack-а. Многи пројекти наведени могу се користити само у току развоја.',
+    'licenses_bookstack' => 'BookStack лиценца',
+    'licenses_php' => 'Лиценца PHP библиотеке',
+    'licenses_js' => 'Лиценце JavaScript библиотеке',
+    'licenses_other' => 'Друге лиценце',
+    'license_details' => 'Детаљи о лиценци',
 
     //! If editing translations files directly please ignore this in all
     //! languages apart from en. Content will be auto-copied from en.
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'Тајландски',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/sr/validation.php b/lang/sr/validation.php
index d9b982d1e23..700af927249 100644
--- a/lang/sr/validation.php
+++ b/lang/sr/validation.php
@@ -8,112 +8,115 @@
 return [
 
     // Standard laravel validation lines
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'backup_codes'         => 'The provided code is not valid or has already been used.',
-    'before'               => 'The :attribute must be a date before :date.',
+    'accepted'             => ':attribute мора бити прихваћен.',
+    'active_url'           => ':attribute није исправна URL адреса.',
+    'after'                => ':attribute мора бити датум после :date.',
+    'alpha'                => ':attribute може да садржи само слова.',
+    'alpha_dash'           => ':attribute може да садржи само слова, бројеве, црте и подцрте.',
+    'alpha_num'            => ':attribute може да садржи само слова и бројеве.',
+    'array'                => ':attribute мора бити низ.',
+    'backup_codes'         => 'Достављени код није исправан или је већ искоришћен.',
+    'base64_uri_mime'      => ':attribute мора бити исправан base64 URI који садржи податке :mime mime типа.',
+    'before'               => ':attribute мора бити датум пре :date.',
     'between'              => [
-        'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'numeric' => ':attribute мора бити између :min и :max.',
+        'file'    => ':attribute мора бити између :min и :max килобајта.',
+        'string'  => ':attribute мора бити између :min и :max карактера.',
+        'array'   => ':attribute мора бити између :min и :max ставки.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'ends_with' => 'The :attribute must end with one of the following: :values',
-    'file'                 => 'The :attribute must be provided as a valid file.',
-    'filled'               => 'The :attribute field is required.',
+    'boolean'              => 'Поље :attribute мора бити тачно или нетачно.',
+    'confirmed'            => ':attribute потврда се не подудара.',
+    'current_password'     => 'This does not match your current password.',
+    'date'                 => ':attribute није исправан датум.',
+    'date_format'          => ':attribute се не подудара са форматом :format.',
+    'different'            => ':attribute и :other се морају разликовати.',
+    'digits'               => ':attribute мора бити :digits цифри.',
+    'digits_between'       => ':attribute мора бити између :min и :max цифара.',
+    'email'                => ':attribute морабити исправна адреса е-поште.',
+    'ends_with' => ':attribute се мора завршити са једним од следећих: :values',
+    'file'                 => ':attribute мора бити исправна достављена датотека.',
+    'filled'               => ':attribute поље је неопходно.',
     'gt'                   => [
-        'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
+        'numeric' => ':attribute мора бити веће од :value.',
+        'file'    => ':attribute мора бити веће од :value килобајта.',
+        'string'  => ':attribute мора бити веће од :value карактера.',
+        'array'   => ':attribute мора садржати више од :value ставки.',
     ],
     'gte'                  => [
-        'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
+        'numeric' => ':attribute мора бити веће од или једнако :value.',
+        'file'    => ':attribute мора бити веће од или једнако :value килобајта.',
+        'string'  => ':attribute мора бити веће од или једнако :value карактера.',
+        'array'   => ':attribute мора да садржи :value или више ставки.',
     ],
-    'exists'               => 'The selected :attribute is invalid.',
-    'image'                => 'The :attribute must be an image.',
-    'image_extension'      => 'The :attribute must have a valid & supported image extension.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
+    'exists'               => 'Изабрани :attribute је неисправан.',
+    'image'                => ':attribute мора бити слика.',
+    'image_extension'      => ':attribute мора да има исправну и подржану екстензију слике.',
+    'in'                   => 'Изабрани :attribute је неисправан.',
+    'integer'              => ':attribute мора бити цели број.',
+    'ip'                   => ':attribute мора бити исправна ИП адреса.',
+    'ipv4'                 => ':attribute мора бити исправна IPv4 адреса.',
+    'ipv6'                 => ':attribute мора бити исправна IPv6 адреса.',
+    'json'                 => ':attribute мора бити исправна JSON ниска.',
     'lt'                   => [
-        'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
+        'numeric' => ':attribute мора бити мање од :value.',
+        'file'    => ':attribute мора бити мање од :value килобајта.',
+        'string'  => ':attribute мора бити мање од :value карактера.',
+        'array'   => ':attribute мора садржати мање од :value ставки.',
     ],
     'lte'                  => [
-        'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
+        'numeric' => ':attribute мора бити мање од или једнако :value.',
+        'file'    => ':attribute мора бити мање од или једнако :value килобајта.',
+        'string'  => ':attribute мора бити мање од или једнако :value карактера.',
+        'array'   => ':attribute не сме садржати више од :value ставки.',
     ],
     'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'numeric' => ':attribute не може бити већи од :max.',
+        'file'    => ':attribute не може бити већи од :max килобајта.',
+        'string'  => ':attribute не може бити већи од :max знакова.',
+        'array'   => ':attribute не може садржати више од :max ставки.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimes'                => ':attribute мора бити датотека типа: :values.',
     'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'numeric' => ':attribute мора бити најмање :min.',
+        'file'    => ':attribute мора бити најмање :min килобајта.',
+        'string'  => ':attribute мора бити најмање :min карактера.',
+        'array'   => ':attribute мора садржати најмање :min ставки.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'safe_url'             => 'The provided link may not be safe.',
+    'not_in'               => 'Изабрани :attribute је неисправан.',
+    'not_regex'            => ':attribute формат је неисправан.',
+    'numeric'              => ':attribute мора бити број.',
+    'regex'                => ':attribute формат је неисправан.',
+    'required'             => ':attribute поље је неопходно.',
+    'required_if'          => ':attribute поље је неопходно када :other је :value.',
+    'required_with'        => 'Поље :attribute је обавезно када је :values присутно.',
+    'required_with_all'    => 'Поље :attribute је обавезно када је :values присутно.',
+    'required_without'     => 'Поље :attribute је обавезно када :values није присутно.',
+    'required_without_all' => 'Поље :attribute је обавезно када ниједно од :values није присутно.',
+    'same'                 => ':attribute и :other се морају поклапати.',
+    'safe_url'             => 'Достављена веза можда није безбедна.',
     'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'numeric' => ':attribute мора бити :size.',
+        'file'    => ':attribute мора бити :size килобајта.',
+        'string'  => ':attribute мора бити :size карактера.',
+        'array'   => ':attribute мора да садржи :size ставки.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'totp'                 => 'The provided code is not valid or has expired.',
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
-    'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
+    'string'               => ':attribute мора бити текст.',
+    'timezone'             => ':attribute мора бити исправна зона.',
+    'totp'                 => 'Достављени код није исправан или је истекао.',
+    'unique'               => ':attribute је већ заузет.',
+    'url'                  => ':attribute формат је неисправан.',
+    'uploaded'             => 'Датотека није могла бити отпремљена. Сервер можда не прихвата датотеке ове величине.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute мора бити референца за датотеку унутар ZIP-а.',
+    'zip_file_size' => ':attribute датотеке не сме бити већи од :size MB.',
+    'zip_file_mime' => ':attribute мора бити референца за датотеку типа :validTypes, пронађено :foundType.',
+    'zip_model_expected' => 'Очекиван је објекат податка али је ":type" пронађен.',
+    'zip_unique' => ':attribute мора бити јединствено за тип објекта унутар ZIP-а.',
 
     // Custom validation lines
     'custom' => [
         'password-confirm' => [
-            'required_with' => 'Password confirmation required',
+            'required_with' => 'Неопходна је потврда лозинке',
         ],
     ],
 
diff --git a/lang/sv/activities.php b/lang/sv/activities.php
index 3acf6d4ff8d..c7afc0bace2 100644
--- a/lang/sv/activities.php
+++ b/lang/sv/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Användaren har uppdaterats',
     'user_delete' => 'raderad användare',
     'user_delete_notification' => 'Användaren har tagits bort',
+    'user_mfa_reset' => 'återställ MFA för användare',
+    'user_mfa_reset_notification' => 'Metoder för multifaktorautentisering återställda',
 
     // API Tokens
     'api_token_create' => 'skapade API-token',
diff --git a/lang/sv/auth.php b/lang/sv/auth.php
index c9feb831218..d5cca82e0ef 100644
--- a/lang/sv/auth.php
+++ b/lang/sv/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Uppgifterna stämmer inte överens med våra register.',
     'throttle' => 'För många inloggningsförsök. Prova igen om :seconds sekunder.',
+    'mfa_throttle' => 'För många försök till multifaktorverifiering. Försök igen om :seconds sekunder.',
 
     // Login & Register
     'sign_up' => 'Skapa konto',
@@ -20,6 +21,9 @@
     'username' => 'Användarnamn',
     'email' => 'E-post',
     'password' => 'Lösenord',
+    'password_new' => 'Nytt lösenord',
+    'password_new_confirm' => 'Bekräfta nytt lösenord',
+    'password_current' => 'Bekräfta nuvarande lösenord',
     'password_confirm' => 'Bekräfta lösenord',
     'password_hint' => 'Måste vara minst 8 tecken',
     'forgot_password' => 'Glömt lösenord?',
diff --git a/lang/sv/common.php b/lang/sv/common.php
index 2eab9bd7b8d..cf426f500b3 100644
--- a/lang/sv/common.php
+++ b/lang/sv/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inaktiv',
     'never' => 'Aldrig',
     'none' => 'Inga',
+    'move_left' => 'Flytta åt vänster',
+    'move_right' => 'Flytta åt höger',
 
     // Header
     'homepage' => 'Startsida',
diff --git a/lang/sv/entities.php b/lang/sv/entities.php
index 08c44ff1fe1..6a0e2f0995b 100644
--- a/lang/sv/entities.php
+++ b/lang/sv/entities.php
@@ -63,10 +63,10 @@
     'import_delete_desc' => 'Detta kommer att ta bort den uppladdade ZIP-baserade importfilen och kan inte ångras.',
     'import_errors' => 'Importfel',
     'import_errors_desc' => 'Följande fel inträffade under importförsöket:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => 'Navigera mellan syskon för sida',
+    'breadcrumb_siblings_for_chapter' => 'Navigera mellan syskon för kapitel',
+    'breadcrumb_siblings_for_book' => 'Navigera mellan syskon för bok',
+    'breadcrumb_siblings_for_bookshelf' => 'Navigera mellan syskon för hylla',
 
     // Permissions and restrictions
     'permissions' => 'Rättigheter',
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Flytta kapitel och sidor inom en bok för att omorganisera dess innehåll. Andra böcker kan läggas till, vilket gör det enkelt att flytta kapitel och sidor mellan böcker. Du kan även ställa in en regel som automatiskt sorterar bokens innehåll vid ändringar.',
     'books_sort_auto_sort' => 'Automatiskt sorteringsalternativ',
     'books_sort_auto_sort_active' => 'Aktiv automatisk sorteringsregel: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Regler för automatisk sortering kan skapas i inställningsområdet "Listor och sortering" av en användare med relevanta behörigheter.',
     'books_sort_named' => 'Sortera boken :bookName',
     'books_sort_name' => 'Sortera utifrån namn',
     'books_sort_created' => 'Sortera utifrån skapelse',
@@ -252,7 +253,7 @@
     'pages_edit_switch_to_markdown_stable' => '(Stabilt innehåll)',
     'pages_edit_switch_to_wysiwyg' => 'Växla till WYSIWYG-redigerare',
     'pages_edit_switch_to_new_wysiwyg' => 'Växla till ny WYSIWYG',
-    'pages_edit_switch_to_new_wysiwyg_desc' => '(In Beta Testing)',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(I betatestning)',
     'pages_edit_set_changelog' => 'Beskriv dina ändringar',
     'pages_edit_enter_changelog_desc' => 'Ange en kort beskrivning av de ändringar du har gjort',
     'pages_edit_enter_changelog' => 'Ändringslogg',
@@ -271,8 +272,8 @@
     'pages_md_insert_link' => 'Infoga länk',
     'pages_md_insert_drawing' => 'Infoga teckning',
     'pages_md_show_preview' => 'Visa förhandsgranskning',
-    'pages_md_sync_scroll' => 'Sync preview scroll',
-    'pages_md_plain_editor' => 'Plaintext editor',
+    'pages_md_sync_scroll' => 'Synkronisera förhandsgranskningsrullning',
+    'pages_md_plain_editor' => 'Textredigerare (plaintext)',
     'pages_drawing_unsaved' => 'Osparad ritning hittades',
     'pages_drawing_unsaved_confirm' => 'Osparade ritningsdata hittades från ett tidigare misslyckat sparförsök. Vill du återställa och fortsätta redigera den osparade ritningen?',
     'pages_not_in_chapter' => 'Sidan ligger inte i något kapitel',
@@ -305,10 +306,10 @@
     'pages_edit_content_link' => 'Hoppa till sektionen i redigeraren',
     'pages_pointer_enter_mode' => 'Ange markeringsläge för sektion',
     'pages_pointer_label' => 'Alternativ för sidsektion',
-    'pages_pointer_permalink' => 'Page Section Permalink',
-    'pages_pointer_include_tag' => 'Page Section Include Tag',
-    'pages_pointer_toggle_link' => 'Permalink mode, Press to show include tag',
-    'pages_pointer_toggle_include' => 'Include tag mode, Press to show permalink',
+    'pages_pointer_permalink' => 'Permalänk för sidavsnitt',
+    'pages_pointer_include_tag' => 'Include-tagg för sidavsnitt',
+    'pages_pointer_toggle_link' => 'Permalänksläge, tryck för att visa include-tagg',
+    'pages_pointer_toggle_include' => 'Include-taggläge, tryck för att visa permalänk',
     'pages_permissions_active' => 'Anpassade rättigheter är i bruk',
     'pages_initial_revision' => 'Första publicering',
     'pages_references_update_revision' => 'Automatisk uppdatering av interna länkar',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Visa/Dölj sidopanel',
+    'page_contents' => 'Sidans innehåll',
+    'page_contents_none' => 'Inga rubriker hittades i sidans innehåll.',
+    'page_contents_info' => 'Innehållsmenyn genereras utifrån de rubrikformat som används på sidan.',
     'page_tags' => 'Sidtaggar',
     'chapter_tags' => 'Kapiteltaggar',
     'book_tags' => 'Boktaggar',
@@ -357,7 +361,7 @@
     'attachments_explain_instant_save' => 'Ändringar här sparas omgående.',
     'attachments_upload' => 'Ladda upp fil',
     'attachments_link' => 'Bifoga länk',
-    'attachments_upload_drop' => 'Alternatively you can drag and drop a file here to upload it as an attachment.',
+    'attachments_upload_drop' => 'Alternativt kan du dra och släppa en fil här för att ladda upp den som en bilaga.',
     'attachments_set_link' => 'Ange länk',
     'attachments_delete' => 'Är du säker på att du vill ta bort bilagan?',
     'attachments_dropzone' => 'Släpp filer här för uppladdning',
@@ -397,11 +401,11 @@
     'comment' => 'Kommentar',
     'comments' => 'Kommentarer',
     'comment_add' => 'Lägg till kommentar',
-    'comment_none' => 'No comments to display',
+    'comment_none' => 'Inga kommentarer att visa',
     'comment_placeholder' => 'Lämna en kommentar här',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
-    'comment_archived_count' => ':count Archived',
-    'comment_archived_threads' => 'Archived Threads',
+    'comment_thread_count' => ':count kommentarstråd|:count kommentarstrådar',
+    'comment_archived_count' => ':count arkiverad(e)',
+    'comment_archived_threads' => 'Arkiverade trådar',
     'comment_save' => 'Spara kommentar',
     'comment_new' => 'Ny kommentar',
     'comment_created' => 'kommenterade :createDiff',
@@ -411,7 +415,7 @@
     'comment_created_success' => 'Kommentaren har sparats',
     'comment_updated_success' => 'Kommentaren har uppdaterats',
     'comment_archive_success' => 'Arkivera kommentar',
-    'comment_unarchive_success' => 'Comment un-archived',
+    'comment_unarchive_success' => 'Kommentar avarkiverad',
     'comment_view' => 'Visa kommentar',
     'comment_jump_to_thread' => 'Hoppa till tråd',
     'comment_delete_confirm' => 'Är du säker på att du vill ta bort den här kommentaren?',
@@ -448,12 +452,12 @@
     // References
     'references' => 'Referenser',
     'references_none' => 'Det finns inga referenser kopplade till detta objekt.',
-    'references_to_desc' => 'Listed below is all the known content in the system that links to this item.',
+    'references_to_desc' => 'Nedan listas allt känt innehåll i systemet som länkar till detta objekt.',
 
     // Watch Options
     'watch' => 'Följ',
     'watch_title_default' => 'Standardinställningar',
-    'watch_desc_default' => 'Revert watching to just your default notification preferences.',
+    'watch_desc_default' => 'Återställ bevakning till enbart dina standardaviseringsinställningar.',
     'watch_title_ignore' => 'Ignorera',
     'watch_desc_ignore' => 'Ignorera samtliga meddelanden, även sådana som styrs av användarens egna inställningar.',
     'watch_title_new' => 'Nya sidor',
@@ -461,16 +465,16 @@
     'watch_title_updates' => 'Alla siduppdateringar',
     'watch_desc_updates' => 'Meddela vid alla nya sidor och siduppdateringar.',
     'watch_desc_updates_page' => 'Meddela alla siduppdateringar.',
-    'watch_title_comments' => 'All Page Updates & Comments',
+    'watch_title_comments' => 'Alla sidupdateringar och kommentarer',
     'watch_desc_comments' => 'Meddela vid alla nya sidor, siduppdateringar och nya kommentarer.',
     'watch_desc_comments_page' => 'Meddela vid siduppdateringar och nya kommentarer.',
     'watch_change_default' => 'Ändra standardinställningar för meddelanden',
     'watch_detail_ignore' => 'Ignorera meddelanden',
-    'watch_detail_new' => 'Watching for new pages',
-    'watch_detail_updates' => 'Watching new pages and updates',
-    'watch_detail_comments' => 'Watching new pages, updates & comments',
-    'watch_detail_parent_book' => 'Watching via parent book',
-    'watch_detail_parent_book_ignore' => 'Ignoring via parent book',
-    'watch_detail_parent_chapter' => 'Watching via parent chapter',
-    'watch_detail_parent_chapter_ignore' => 'Ignoring via parent chapter',
+    'watch_detail_new' => 'Bevakar nya sidor',
+    'watch_detail_updates' => 'Bevakar nya sidor och uppdateringar',
+    'watch_detail_comments' => 'Bevakar nya sidor, uppdateringar och kommentarer',
+    'watch_detail_parent_book' => 'Bevakar via överordnad bok',
+    'watch_detail_parent_book_ignore' => 'Ignorerar via överordnad bok',
+    'watch_detail_parent_chapter' => 'Bevakar via överordnat kapitel',
+    'watch_detail_parent_chapter_ignore' => 'Ignorerar via överordnat kapitel',
 ];
diff --git a/lang/sv/errors.php b/lang/sv/errors.php
index 4505dfa0b65..7cbe9f6c561 100644
--- a/lang/sv/errors.php
+++ b/lang/sv/errors.php
@@ -10,7 +10,7 @@
 
     // Auth
     'error_user_exists_different_creds' => 'En användare med adressen :email finns redan.',
-    'auth_pre_register_theme_prevention' => 'User account could not be registered for the provided details',
+    'auth_pre_register_theme_prevention' => 'Användarkontot kunde inte registreras med de angivna uppgifterna',
     'email_already_confirmed' => 'E-posten har redan bekräftats, prova att logga in.',
     'email_confirmation_invalid' => 'Denna bekräftelsekod är inte giltig eller har redan använts. Vänligen prova att registrera dig på nytt.',
     'email_confirmation_expired' => 'Denna bekräftelsekod har gått ut. Vi har skickat dig en ny.',
@@ -51,18 +51,18 @@
     'image_upload_error' => 'Ett fel inträffade vid uppladdningen',
     'image_upload_type_error' => 'Filtypen du försöker ladda upp är ogiltig',
     'image_upload_replace_type' => 'Bilder som skall ersättas måste vara av samma filtyp',
-    'image_upload_memory_limit' => 'Failed to handle image upload and/or create thumbnails due to system resource limits.',
-    'image_thumbnail_memory_limit' => 'Failed to create image size variations due to system resource limits.',
+    'image_upload_memory_limit' => 'Det gick inte att hantera bilduppladdningen och/eller skapa miniatyrbilder på grund av begränsade systemresurser.',
+    'image_thumbnail_memory_limit' => 'Det gick inte att skapa bildstorleksvarianter på grund av begränsade systemresurser.',
     'image_gallery_thumbnail_memory_limit' => 'Misslyckades att skapa galleriminiatyrer på grund av otillräckliga systemresurser.',
-    'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
+    'drawing_data_not_found' => 'Ritningsdata kunde inte laddas. Ritningen kanske inte längre finns, eller så har du inte behörighet att komma åt den.',
 
     // Attachments
     'attachment_not_found' => 'Bilagan hittades ej',
-    'attachment_upload_error' => 'An error occurred uploading the attachment file',
+    'attachment_upload_error' => 'Ett fel uppstod vid uppladdning av bilagan',
 
     // Pages
     'page_draft_autosave_fail' => 'Kunde inte spara utkastet. Kontrollera att du är ansluten till internet.',
-    'page_draft_delete_fail' => 'Failed to delete page draft and fetch current page saved content',
+    'page_draft_delete_fail' => 'Det gick inte att radera utkastet och hämta det sparade innehållet för aktuell sida',
     'page_custom_home_deletion' => 'Det går inte att ta bort sidan medan den används som startsida',
 
     // Entities
@@ -78,7 +78,7 @@
     // Users
     'users_cannot_delete_only_admin' => 'Du kan inte ta bort den enda admin-användaren',
     'users_cannot_delete_guest' => 'Du kan inte ta bort gästanvändaren',
-    'users_could_not_send_invite' => 'Could not create user since invite email failed to send',
+    'users_could_not_send_invite' => 'Kunde inte skapa användare eftersom inbjudningsmejlet inte kunde skickas',
 
     // Roles
     'role_cannot_be_edited' => 'Den här rollen kan inte redigeras',
@@ -108,7 +108,8 @@
     // Import
     'import_zip_cant_read' => 'Kunde inte läsa ZIP-filen.',
     'import_zip_cant_decode_data' => 'Kunde inte hitta och avkoda ZIP data.json innehåll.',
-    'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_no_data' => 'ZIP-filens data innehåller inte förväntat bok-, kapitel- eller sidinnehåll.',
+    'import_zip_data_too_large' => 'Innehållet i ZIP-filens data.json överskrider den konfigurerade maxgränsen för uppladdning i applikationen.',
     'import_validation_failed' => 'ZIP-filen kunde inte valideras med fel:',
     'import_zip_failed_notification' => 'Det gick inte att importera ZIP-fil.',
     'import_perms_books' => 'Du saknar behörighet att skapa böcker.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Hemligheten för den angivna API-token är felaktig',
     'api_user_no_api_permission' => 'Ägaren av den använda API-token har inte behörighet att göra API-anrop',
     'api_user_token_expired' => 'Den använda auktoriseringstoken har löpt ut',
+    'api_cookie_auth_only_get' => 'Endast GET-förfrågningar är tillåtna vid API-användning med cookiebaserad autentisering',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Ett fel uppstod när ett test mail skulle skickas:',
diff --git a/lang/sv/notifications.php b/lang/sv/notifications.php
index 58418ddb01e..cf1a87cf656 100644
--- a/lang/sv/notifications.php
+++ b/lang/sv/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Uppdaterad sida: :pageName',
     'updated_page_intro' => 'En sida har blivit uppdaterad i :appName:',
     'updated_page_debounce' => 'För att förhindra en massa notiser, så kommer det inte skickas nya notiser på ett tag för ytterligare ändringar till denna sida av samma skribent.',
+    'comment_mention_subject' => 'Du har blivit nämnd i en kommentar på sidan: :pageName',
+    'comment_mention_intro' => 'Du har blivit nämnd i en kommentar på :appName:',
 
     'detail_page_name' => 'Sidonamn:',
     'detail_page_path' => 'Sidosökväg:',
diff --git a/lang/sv/preferences.php b/lang/sv/preferences.php
index 945099151f2..e733330c1bb 100644
--- a/lang/sv/preferences.php
+++ b/lang/sv/preferences.php
@@ -5,47 +5,69 @@
  */
 
 return [
-    'my_account' => 'My Account',
+    'my_account' => 'Mitt Konto',
 
     'shortcuts' => 'Genvägar',
-    'shortcuts_interface' => 'UI Shortcut Preferences',
-    'shortcuts_toggle_desc' => 'Here you can enable or disable keyboard system interface shortcuts, used for navigation and actions.',
-    'shortcuts_customize_desc' => 'You can customize each of the shortcuts below. Just press your desired key combination after selecting the input for a shortcut.',
-    'shortcuts_toggle_label' => 'Keyboard shortcuts enabled',
-    'shortcuts_section_navigation' => 'Navigation',
-    'shortcuts_section_actions' => 'Common Actions',
+    'shortcuts_interface' => 'Inställningar för UI-genvägar',
+    'shortcuts_toggle_desc' => 'Här kan du aktivera eller inaktivera tangentbordsgenvägar för systemgränssnittet, som används för navigering och åtgärder.',
+    'shortcuts_customize_desc' => 'Du kan anpassa varje genväg nedan. Tryck bara på önskad tangentkombination efter att ha valt inmatningsfältet för en genväg.',
+    'shortcuts_toggle_label' => 'Tangentbordsgenvägar aktiverade',
+    'shortcuts_section_navigation' => 'Navigering',
+    'shortcuts_section_actions' => 'Vanliga åtgärder',
     'shortcuts_save' => 'Spara genvägar',
-    'shortcuts_overlay_desc' => 'Note: When shortcuts are enabled a helper overlay is available via pressing "?" which will highlight the available shortcuts for actions currently visible on the screen.',
-    'shortcuts_update_success' => 'Shortcut preferences have been updated!',
-    'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
-
-    'notifications' => 'Notification Preferences',
-    'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
-    'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
-    'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
-    'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
-    'notifications_save' => 'Save Preferences',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
-
-    'auth' => 'Access & Security',
-    'auth_change_password' => 'Change Password',
-    'auth_change_password_desc' => 'Change the password you use to log-in to the application. This must be at least 8 characters long.',
+    'shortcuts_overlay_desc' => 'Obs: När genvägar är aktiverade finns en hjälpöverlagring tillgänglig genom att trycka på "?", vilken markerar de tillgängliga genvägarna för åtgärder som för närvarande syns på skärmen.',
+    'shortcuts_update_success' => 'Genvägsinställningarna har uppdaterats!',
+    'shortcuts_overview_desc' => 'Hantera tangentbordsgenvägar som du kan använda för att navigera i systemets användargränssnitt.',
+
+    'interface' => 'Gränssnittsinställningar',
+    'interface_desc' => 'Här kan du anpassa utseendet på programmets användargränssnitt.',
+    'interface_display_mode' => 'Visningsläge',
+    'interface_display_mode_desc' => 'Välj om programmet ska visas i mörkt eller ljust läge. Du kan även växla läge från startsidan eller via profilmenyn i sidhuvudet.',
+    'layouts' => 'Layoutinställningar',
+    'layouts_desc' => 'Anpassa hur avsnitten i användargränssnittets olika vyer är placerade.',
+    'layout_edit' => 'Redigera layout',
+    'layout_edit_desc' => 'Dra och släpp avsnitten eller använd åtgärdsmenyn för respektive avsnitt för att ändra vilka avsnitt som visas i den här layouten och var de placeras.',
+    'layout_edit_column_hint' => 'På mindre skärmar placeras avsnitten i den högra kolumnen ovanför avsnitten i den vänstra.',
+    'layout_edit_save' => 'Spara layout',
+    'layout_edit_layouts' => 'Layouter',
+    'layout_edit_back_to_preferences' => 'Tillbaka till inställningarna',
+    'layout_edit_left' => 'Vänster',
+    'layout_edit_right' => 'Höger',
+    'layout_edit_center' => 'Mitten',
+    'layout_edit_unused' => 'Används inte',
+    'layout_edit_empty' => 'Inga avsnitt att visa',
+    'layout_edit_reset_to_defaults' => 'Återställ standardinställningar',
+    'layout_update_success' => 'Layoutinställningarna har uppdaterats!',
+    'layout_reset_success' => 'Layoutinställningarna har återställts!',
+
+    'notifications' => 'Aviseringsinställningar',
+    'notifications_desc' => 'Kontrollera de e-postaviseringar du får när viss aktivitet utförs i systemet.',
+    'notifications_opt_own_page_changes' => 'Meddela vid ändringar på sidor jag äger',
+    'notifications_opt_own_page_comments' => 'Meddela vid kommentarer på sidor jag äger',
+    'notifications_opt_comment_mentions' => 'Meddela när jag blir nämnd i en kommentar',
+    'notifications_opt_comment_replies' => 'Meddela vid svar på mina kommentarer',
+    'notifications_save' => 'Spara inställningar',
+    'notifications_update_success' => 'Aviseringsinställningarna har uppdaterats!',
+    'notifications_watched' => 'Bevakade och ignorerade objekt',
+    'notifications_watched_desc' => 'Nedan visas de objekt som har anpassade bevakningsinställningar. För att uppdatera dina inställningar för dessa, öppna objektet och hitta bevakningsalternativen i sidopanelen.',
+
+    'auth' => 'Åtkomst och säkerhet',
+    'auth_change_password' => 'Ändra lösenord',
+    'auth_change_password_desc' => 'Ändra lösenordet du använder för att logga in i applikationen. Det måste vara minst 8 tecken långt.',
     'auth_change_password_success' => 'Lösenordet har uppdaterats!',
 
     'profile' => 'Profildetaljer',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_desc' => 'Hantera detaljerna för ditt konto som representerar dig för andra användare, utöver de uppgifter som används för kommunikation och systempersonalisering.',
     'profile_view_public' => 'Visa publik profil',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
-    'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
+    'profile_name_desc' => 'Konfigurera ditt visningsnamn som kommer att vara synligt för andra användare i systemet genom den aktivitet du utför och det innehåll du äger.',
+    'profile_email_desc' => 'Denna e-postadress kommer att användas för aviseringar och beroende på aktiv systemautentisering, för systemåtkomst.',
+    'profile_email_no_permission' => 'Tyvärr har du inte behörighet att ändra din e-postadress. Om du vill ändra detta behöver du be en administratör att göra det åt dig.',
+    'profile_avatar_desc' => 'Välj en bild som kommer att representera dig för andra i systemet. Helst bör bilden vara kvadratisk och cirka 256px bred och hög.',
+    'profile_admin_options' => 'Administratörsalternativ',
+    'profile_admin_options_desc' => 'Ytterligare inställningar på administratörsnivå, till exempel för att hantera rolltilldelningar, hittar du för ditt användarkonto under "Inställningar > Användare" i applikationen.',
 
     'delete_account' => 'Radera konto',
     'delete_my_account' => 'Radera mitt konto',
-    'delete_my_account_desc' => 'This will fully delete your user account from the system. You will not be able to recover this account or revert this action. Content you\'ve created, such as created pages and uploaded images, will remain.',
-    'delete_my_account_warning' => 'Are you sure you want to delete your account?',
+    'delete_my_account_desc' => 'Detta kommer permanent radera ditt användarkonto från systemet. Du kommer inte kunna återställa detta konto eller ångra denna åtgärd. Innehåll du har skapat, till exempel skapade sidor och uppladdade bilder, kommer att finnas kvar.',
+    'delete_my_account_warning' => 'Är du säker på att du vill radera ditt konto?',
 ];
diff --git a/lang/sv/settings.php b/lang/sv/settings.php
index 8f391d3d713..e8e85758dc6 100644
--- a/lang/sv/settings.php
+++ b/lang/sv/settings.php
@@ -16,8 +16,8 @@
     'app_customization' => 'Sidanpassning',
     'app_features_security' => 'Funktioner och säkerhet',
     'app_name' => 'Applikationsnamn',
-    'app_name_desc' => 'Namnet visas i sidhuvdet och i eventuella mail.',
-    'app_name_header' => 'Visa applikationsnamn i sidhuvudet?',
+    'app_name_desc' => 'Namnet visas i sidhuvudet och i eventuella mejl.',
+    'app_name_header' => 'Visa applikationsnamn i sidhuvudet',
     'app_public_access' => 'Offentlig åtkomst',
     'app_public_access_desc' => 'Om du aktiverar detta alternativ låter du icke inloggade besökare komma åt innehåll på din sida',
     'app_public_access_desc_guest' => 'Åtkomst för icke inloggade besökare kan styras via användaren "Guest".',
@@ -75,34 +75,36 @@
     'reg_confirm_restrict_domain_placeholder' => 'Ingen begränsning inställd',
 
     // Sorting Settings
-    'sorting' => 'Sorterar',
-    'sorting_book_default' => 'Standard boksortering',
+    'sorting' => 'Listor och sortering',
+    'sorting_book_default' => 'Standardsorteringsregel för böcker',
     'sorting_book_default_desc' => 'Välj standard sorteringsregel som skall tillämpas på nya böcker. Detta påverkar inte befintliga böcker och kan åsidosättas per bok.',
     'sorting_rules' => 'Sorteringsregler',
-    'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
+    'sorting_rules_desc' => 'Detta är fördefinierade sorteringsåtgärder som kan tillämpas på innehåll i systemet.',
     'sort_rule_assigned_to_x_books' => 'Tilldelad till :count bok|Tilldelad till :count böcker',
     'sort_rule_create' => 'Skapa sorteringsregel',
     'sort_rule_edit' => 'Redigera sorteringsregel',
     'sort_rule_delete' => 'Ta bort sorteringsregel',
-    'sort_rule_delete_desc' => 'Remove this sort rule from the system. Books using this sort will revert to manual sorting.',
-    'sort_rule_delete_warn_books' => 'This sort rule is currently used on :count book(s). Are you sure you want to delete this?',
-    'sort_rule_delete_warn_default' => 'This sort rule is currently used as the default for books. Are you sure you want to delete this?',
+    'sort_rule_delete_desc' => 'Ta bort denna sorteringsregel från systemet. Böcker som använder denna sortering kommer att återgå till manuell sortering.',
+    'sort_rule_delete_warn_books' => 'Denna sorteringsregel används för närvarande på :count bok/böcker. Är du säker på att du vill radera den?',
+    'sort_rule_delete_warn_default' => 'Denna sorteringsregel används för närvarande som standard för böcker. Är du säker på att du vill radera den?',
     'sort_rule_details' => 'Detaljer för sorteringsregler',
-    'sort_rule_details_desc' => 'Set a name for this sort rule, which will appear in lists when users are selecting a sort.',
-    'sort_rule_operations' => 'Sort Operations',
-    'sort_rule_operations_desc' => 'Configure the sort actions to be performed by moving them from the list of available operations. Upon use, the operations will be applied in order, from top to bottom. Any changes made here will be applied to all assigned books upon save.',
+    'sort_rule_details_desc' => 'Ange ett namn för denna sorteringsregel, vilket kommer att visas i listor när användare väljer en sortering.',
+    'sort_rule_operations' => 'Sorteringsåtgärder',
+    'sort_rule_operations_desc' => 'Konfigurera sorteringsåtgärderna som ska utföras genom att flytta dem från listan över tillgängliga åtgärder. Vid användning kommer åtgärderna att tillämpas i ordning, uppifrån och ner. Alla ändringar som görs här kommer att tillämpas på alla tilldelade böcker vid sparande.',
     'sort_rule_available_operations' => 'Tillgängliga åtgärder',
-    'sort_rule_available_operations_empty' => 'No operations remaining',
-    'sort_rule_configured_operations' => 'Configured Operations',
-    'sort_rule_configured_operations_empty' => 'Drag/add operations from the "Available Operations" list',
-    'sort_rule_op_asc' => '(Asc)',
-    'sort_rule_op_desc' => '(Desc)',
+    'sort_rule_available_operations_empty' => 'Inga åtgärder kvar',
+    'sort_rule_configured_operations' => 'Konfigurerade åtgärder',
+    'sort_rule_configured_operations_empty' => 'Dra/lägg till åtgärder från listan "Tillgängliga åtgärder"',
+    'sort_rule_op_asc' => '(Stigande)',
+    'sort_rule_op_desc' => '(Fallande)',
     'sort_rule_op_name' => 'Namn - Alfabetisk ordning',
     'sort_rule_op_name_numeric' => 'Namn - Numerisk ordning',
     'sort_rule_op_created_date' => 'Datum skapat',
     'sort_rule_op_updated_date' => 'Datum uppdaterat',
-    'sort_rule_op_chapters_first' => 'Chapters First',
-    'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sort_rule_op_chapters_first' => 'Kapitel först',
+    'sort_rule_op_chapters_last' => 'Kapitel sist',
+    'sorting_page_limits' => 'Gränser för antal objekt per sida',
+    'sorting_page_limits_desc' => 'Ställ in hur många objekt som ska visas per sida i olika listor i systemet. Vanligtvis är ett lägre antal mer prestandaeffektivt, medan ett högre antal minskar behovet av att klicka sig igenom flera sidor. Det rekommenderas att använda en multipel av 6.',
 
     // Maintenance settings
     'maint' => 'Underhåll',
@@ -139,7 +141,7 @@
     'recycle_bin_contents_empty' => 'Papperskorgen är för närvarande tom',
     'recycle_bin_empty' => 'Töm papperskorgen',
     'recycle_bin_empty_confirm' => 'Detta kommer permanent att förstöra alla objekt i papperskorgen inklusive innehåll som finns i varje objekt. Är du säker du vill tömma papperskorgen?',
-    'recycle_bin_destroy_confirm' => 'This action will permanently delete this item from the system, along with any child elements listed below, and you will not be able to restore this content. Are you sure you want to permanently delete this item?',
+    'recycle_bin_destroy_confirm' => 'Denna åtgärd kommer att permanent radera detta objekt från systemet, tillsammans med eventuella underliggande element som listas nedan, och du kommer inte att kunna återställa detta innehåll. Är du säker på att du vill permanent radera detta objekt?',
     'recycle_bin_destroy_list' => 'Objekt som ska förstöras',
     'recycle_bin_restore_list' => 'Objekt som ska återställas',
     'recycle_bin_restore_confirm' => 'Denna åtgärd kommer att återställa det raderade objektet, inklusive alla underordnade element, till deras ursprungliga plats. Om den ursprungliga platsen har tagits bort sedan dess, och är nu i papperskorgen, kommer det överordnade objektet också att behöva återställas.',
@@ -166,11 +168,11 @@
     // Role Settings
     'roles' => 'Roller',
     'role_user_roles' => 'Användarroller',
-    'roles_index_desc' => 'Roles are used to group users & provide system permission to their members. When a user is a member of multiple roles the privileges granted will stack and the user will inherit all abilities.',
-    'roles_x_users_assigned' => ':count user assigned|:count users assigned',
-    'roles_x_permissions_provided' => ':count permission|:count permissions',
-    'roles_assigned_users' => 'Assigned Users',
-    'roles_permissions_provided' => 'Provided Permissions',
+    'roles_index_desc' => 'Roller används för att gruppera användare och ge deras medlemmar systembehörigheter. När en användare är medlem i flera roller läggs behörigheterna samman och användaren ärver alla rättigheter.',
+    'roles_x_users_assigned' => ':count användare tilldelad|:count användare tilldelade',
+    'roles_x_permissions_provided' => ':count behörighet|:count behörigheter',
+    'roles_assigned_users' => 'Tilldelade användare',
+    'roles_permissions_provided' => 'Tillhandahållna behörigheter',
     'role_create' => 'Skapa ny roll',
     'role_delete' => 'Ta bort roll',
     'role_delete_confirm' => 'Rollen med namn \':roleName\' kommer att tas bort.',
@@ -192,24 +194,28 @@
     'role_access_api' => 'Åtkomst till systemets API',
     'role_manage_settings' => 'Hantera appinställningar',
     'role_export_content' => 'Exportera innehåll',
-    'role_import_content' => 'Import content',
+    'role_import_content' => 'Importera innehåll',
     'role_editor_change' => 'Ändra sidredigerare',
-    'role_notifications' => 'Receive & manage notifications',
+    'role_notifications' => 'Ta emot och hantera aviseringar',
+    'role_permission_note_users_and_roles' => 'Dessa behörigheter kommer i praktiken även att ge synlighet och sökmöjlighet för användare och roller i systemet.',
     'role_asset' => 'Tillgång till innehåll',
     'roles_system_warning' => 'Var medveten om att åtkomst till någon av ovanstående tre behörigheter kan tillåta en användare att ändra sina egna rättigheter eller andras rättigheter i systemet. Tilldela endast roller med dessa behörigheter till betrodda användare.',
     'role_asset_desc' => 'Det här är standardinställningarna för allt innehåll i systemet. Eventuella anpassade rättigheter på böcker, kapitel och sidor skriver över dessa inställningar.',
     'role_asset_admins' => 'Administratörer har automatisk tillgång till allt innehåll men dessa alternativ kan visa och dölja vissa gränssnittselement',
     'role_asset_image_view_note' => 'Detta avser synlighet inom bildhanteraren. Faktisk åtkomst för uppladdade bildfiler kommer att bero på alternativ för bildlagring.',
+    'role_asset_users_note' => 'Dessa behörigheter kommer i praktiken även att ge synlighet och sökmöjlighet för användare i systemet.',
     'role_all' => 'Alla',
     'role_own' => 'Egna',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kontrolleras av den sida de laddas upp till',
+    'role_controlled_by_page_delete' => 'Styrs av behörigheter för radering av sidor',
     'role_save' => 'Spara roll',
     'role_users' => 'Användare med denna roll',
     'role_users_none' => 'Inga användare tillhör den här rollen',
 
     // Users
     'users' => 'Användare',
-    'users_index_desc' => 'Create & manage individual user accounts within the system. User accounts are used for login and attribution of content & activity. Access permissions are primarily role-based but user content ownership, among other factors, may also affect permissions & access.',
+    'users_index_desc' => 'Skapa och hantera enskilda användarkonton i systemet. Användarkonton används för inloggning och för att tillskriva innehåll och aktivitet en användare. Åtkomstbehörigheter är i huvudsak rollbaserade, men användarens innehållsägarskap, bland andra faktorer, kan också påverka behörigheter och åtkomst.',
     'user_profile' => 'Användarprofil',
     'users_add_new' => 'Lägg till användare',
     'users_search' => 'Sök användare',
@@ -224,8 +230,8 @@
     'users_send_invite_text' => 'Du kan välja att skicka denna användare ett e-postmeddelande som tillåter dem att ställa in sitt eget lösenord, eller så kan du ställa in deras lösenord själv.',
     'users_send_invite_option' => 'Skicka e-post med inbjudan',
     'users_external_auth_id' => 'Externt ID för autentisering',
-    'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.',
-    'users_password_warning' => 'Only fill the below if you would like to change the password for this user.',
+    'users_external_auth_id_desc' => 'När ett externt autentiseringssystem används (såsom SAML2, OIDC eller LDAP) är detta det ID som länkar detta BookStack-konto till kontot i autentiseringssystemet. Du kan bortse från detta fält om standardautentisering via e-post används.',
+    'users_password_warning' => 'Dessa behörigheter kommer i praktiken även att ge synlighet och sökmöjlighet för användare i systemet.',
     'users_system_public' => 'Den här användaren representerar eventuella gäster som använder systemet. Den kan inte användas för att logga in utan tilldeles automatiskt.',
     'users_delete' => 'Ta bort användare',
     'users_delete_named' => 'Ta bort användaren :userName',
@@ -241,7 +247,7 @@
     'users_preferred_language' => 'Föredraget språk',
     'users_preferred_language_desc' => 'Det här alternativet kommer att ändra det språk som används i användargränssnittet. Detta påverkar inget användarskapat innehåll.',
     'users_social_accounts' => 'Anslutna konton',
-    'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.',
+    'users_social_accounts_desc' => 'Dessa behörigheter kommer i praktiken även att ge synlighet och sökmöjlighet för användare och roller i systemet.',
     'users_social_accounts_info' => 'Här kan du ansluta dina andra konton för snabbare och smidigare inloggning. Om du kopplar från en tjänst här kommer de behörigheter som tidigare givits inte att tas bort - ta bort behörigheter genom att logga in på ditt konto på tjänsten i fråga.',
     'users_social_connect' => 'Anslut konto',
     'users_social_disconnect' => 'Koppla från konto',
@@ -250,7 +256,7 @@
     'users_social_connected' => ':socialAccount har kopplats till ditt konto.',
     'users_social_disconnected' => ':socialAccount har kopplats bort från ditt konto.',
     'users_api_tokens' => 'API-nyckel',
-    'users_api_tokens_desc' => 'Create and manage the access tokens used to authenticate with the BookStack REST API. Permissions for the API are managed via the user that the token belongs to.',
+    'users_api_tokens_desc' => 'Ta emot och hantera aviseringar',
     'users_api_tokens_none' => 'Inga API-tokens har skapats för den här användaren',
     'users_api_tokens_create' => 'Skapa token',
     'users_api_tokens_expires' => 'Förfaller',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Konfigurera multifaktorsautentisering som ett extra skydd för ditt konto.',
     'users_mfa_x_methods' => ':count metod konfigurerad|:count metoder konfigurerade',
     'users_mfa_configure' => 'Konfigurera metoder',
+    'users_mfa_reset' => 'Återställ metoder för multifaktorautentisering',
+    'users_mfa_reset_desc' => 'Detta kommer att återställa och rensa alla konfigurerade metoder för multifaktorautentisering för denna användare. Om multifaktorautentisering krävs av någon av deras roller kommer de att uppmanas att konfigurera nya metoder vid nästa inloggning.',
+    'users_mfa_reset_confirm' => 'Är du säker på att du vill återställa multifaktorautentisering för denna användare?',
 
     // API Tokens
     'user_api_token_create' => 'Skapa API-nyckel',
@@ -280,8 +289,8 @@
 
     // Webhooks
     'webhooks' => 'Webhooks',
-    'webhooks_index_desc' => 'Webhooks are a way to send data to external URLs when certain actions and events occur within the system which allows event-based integration with external platforms such as messaging or notification systems.',
-    'webhooks_x_trigger_events' => ':count trigger event|:count trigger events',
+    'webhooks_index_desc' => 'Webhooks är ett sätt att skicka data till externa URLer när vissa åtgärder och händelser inträffar i systemet, vilket möjliggör händelsebaserad integration med externa plattformar såsom meddelande- eller aviseringssystem.',
+    'webhooks_x_trigger_events' => ':count utlösande händelse|:count utlösande händelser',
     'webhooks_create' => 'Skapa ny webhook',
     'webhooks_none_created' => 'Inga webhooks har skapats än.',
     'webhooks_edit' => 'Redigera webhook',
@@ -309,7 +318,7 @@
 
     // Licensing
     'licenses' => 'Licenser',
-    'licenses_desc' => 'This page details license information for BookStack in addition to the projects & libraries that are used within BookStack. Many projects listed may only be used in a development context.',
+    'licenses_desc' => 'Denna sida beskriver licensinformation för BookStack samt de projekt och bibliotek som används inom BookStack. Många av de listade projekten används eventuellt bara i ett utvecklingssammanhang.',
     'licenses_bookstack' => 'BookStack licens',
     'licenses_php' => 'Licenser för PHP-bibliotek',
     'licenses_js' => 'Licenser för JavaScript-bibliotek',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenska',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/sv/validation.php b/lang/sv/validation.php
index 4cc98c57598..ea942fee7ca 100644
--- a/lang/sv/validation.php
+++ b/lang/sv/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute får bara innehålla bokstäver och siffror.',
     'array'                => ':attribute måste vara en array.',
     'backup_codes'         => 'Den angivna koden är inte giltig eller har redan använts.',
+    'base64_uri_mime'      => ':attribute måste vara en giltig base64-URI som innehåller data av MIME-typen :mime.',
     'before'               => ':attribute måste vara före :date.',
     'between'              => [
         'numeric' => ':attribute måste vara mellan :min och :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute måste vara sant eller falskt.',
     'confirmed'            => 'Bekräftelsen av :attribute stämmer inte.',
+    'current_password'     => 'Detta stämmer inte överens med ditt nuvarande lösenord.',
     'date'                 => ':attribute är inte ett giltigt datum.',
     'date_format'          => ':attribute matchar inte formatet :format.',
     'different'            => ':attribute och :other måste vara olika.',
@@ -105,10 +107,11 @@
     'url'                  => 'Formatet på :attribute är ogiltigt.',
     'uploaded'             => 'Filen kunde inte laddas upp. Servern kanske inte tillåter filer med denna storlek.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute måste referera till en fil inom ZIP-filen.',
+    'zip_file_size' => 'Filen :attribute får inte överstiga :size MB.',
+    'zip_file_mime' => ':attribute måste referera till en fil av typen :validTypes, hittade :foundType.',
+    'zip_model_expected' => 'Dataobjekt förväntades men ":type" hittades.',
+    'zip_unique' => ':attribute måste referera till en fil inom ZIP-filen.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/th/activities.php b/lang/th/activities.php
new file mode 100644
index 00000000000..0ea18ca0a6b
--- /dev/null
+++ b/lang/th/activities.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Activity text strings.
+ * Is used for all the text within activity logs & notifications.
+ */
+return [
+
+    // Pages
+    'page_create'                 => 'สร้างหน้า',
+    'page_create_notification'    => 'สร้างหน้าสำเร็จแล้ว',
+    'page_update'                 => 'แก้ไขหน้า',
+    'page_update_notification'    => 'แก้ไขหน้าสำเร็จแล้ว',
+    'page_delete'                 => 'ลบหน้า',
+    'page_delete_notification'    => 'ลบหน้าสำเร็จแล้ว',
+    'page_restore'                => 'กู้คืนหน้า',
+    'page_restore_notification'   => 'กู้คืนหน้าสำเร็จแล้ว',
+    'page_move'                   => 'ย้ายหน้า',
+    'page_move_notification'      => 'ย้ายหน้าสำเร็จแล้ว',
+
+    // Chapters
+    'chapter_create'              => 'สร้างบท',
+    'chapter_create_notification' => 'สร้างบทสำเร็จแล้ว',
+    'chapter_update'              => 'แก้ไขบท',
+    'chapter_update_notification' => 'แก้ไขบทสำเร็จแล้ว',
+    'chapter_delete'              => 'ลบบท',
+    'chapter_delete_notification' => 'ลบบทสำเร็จแล้ว',
+    'chapter_move'                => 'ย้ายบท',
+    'chapter_move_notification' => 'ย้ายบทสำเร็จแล้ว',
+
+    // Books
+    'book_create'                 => 'สร้างหนังสือ',
+    'book_create_notification'    => 'สร้างหนังสือสำเร็จแล้ว',
+    'book_create_from_chapter'              => 'แปลงบทเป็นหนังสือ',
+    'book_create_from_chapter_notification' => 'แปลงบทเป็นหนังสือสำเร็จแล้ว',
+    'book_update'                 => 'แก้ไขหนังสือ',
+    'book_update_notification'    => 'แก้ไขหนังสือสำเร็จแล้ว',
+    'book_delete'                 => 'ลบหนังสือ',
+    'book_delete_notification'    => 'ลบหนังสือสำเร็จแล้ว',
+    'book_sort'                   => 'จัดเรียงหนังสือ',
+    'book_sort_notification'      => 'จัดเรียงหนังสือสำเร็จแล้ว',
+
+    // Bookshelves
+    'bookshelf_create'            => 'สร้างชั้นวาง',
+    'bookshelf_create_notification'    => 'สร้างชั้นวางสำเร็จแล้ว',
+    'bookshelf_create_from_book'    => 'แปลงหนังสือเป็นชั้นวาง',
+    'bookshelf_create_from_book_notification'    => 'แปลงหนังสือเป็นชั้นวางสำเร็จแล้ว',
+    'bookshelf_update'                 => 'แก้ไขชั้นวาง',
+    'bookshelf_update_notification'    => 'แก้ไขชั้นวางสำเร็จแล้ว',
+    'bookshelf_delete'                 => 'ลบชั้นวาง',
+    'bookshelf_delete_notification'    => 'ลบชั้นวางสำเร็จแล้ว',
+
+    // Revisions
+    'revision_restore' => 'กู้คืนการแก้ไข',
+    'revision_delete' => 'ลบการแก้ไข',
+    'revision_delete_notification' => 'ลบการแก้ไขสำเร็จแล้ว',
+
+    // Favourites
+    'favourite_add_notification' => 'เพิ่ม ":name" ในรายการโปรดแล้ว',
+    'favourite_remove_notification' => 'นำ ":name" ออกจากรายการโปรดแล้ว',
+
+    // Watching
+    'watch_update_level_notification' => 'อัปเดตการตั้งค่าการติดตามสำเร็จแล้ว',
+
+    // Auth
+    'auth_login' => 'เข้าสู่ระบบ',
+    'auth_register' => 'ลงทะเบียนเป็นผู้ใช้ใหม่',
+    'auth_password_reset_request' => 'ขอรีเซ็ตรหัสผ่าน',
+    'auth_password_reset_update' => 'รีเซ็ตรหัสผ่านแล้ว',
+    'mfa_setup_method' => 'ตั้งค่าวิธียืนยันตัวตน MFA',
+    'mfa_setup_method_notification' => 'ตั้งค่าการยืนยันตัวตนแบบหลายขั้นตอนสำเร็จแล้ว',
+    'mfa_remove_method' => 'ลบวิธียืนยันตัวตน MFA',
+    'mfa_remove_method_notification' => 'ลบการยืนยันตัวตนแบบหลายขั้นตอนสำเร็จแล้ว',
+
+    // Settings
+    'settings_update' => 'แก้ไขการตั้งค่า',
+    'settings_update_notification' => 'แก้ไขการตั้งค่าสำเร็จแล้ว',
+    'maintenance_action_run' => 'ดำเนินการบำรุงรักษาระบบ',
+
+    // Webhooks
+    'webhook_create' => 'สร้าง Webhook',
+    'webhook_create_notification' => 'สร้าง Webhook สำเร็จแล้ว',
+    'webhook_update' => 'แก้ไข Webhook',
+    'webhook_update_notification' => 'แก้ไข Webhook สำเร็จแล้ว',
+    'webhook_delete' => 'ลบ Webhook',
+    'webhook_delete_notification' => 'ลบ Webhook สำเร็จแล้ว',
+
+    // Imports
+    'import_create' => 'สร้างการนำเข้า',
+    'import_create_notification' => 'อัปโหลดไฟล์นำเข้าสำเร็จแล้ว',
+    'import_run' => 'ดำเนินการนำเข้า',
+    'import_run_notification' => 'นำเข้าเนื้อหาสำเร็จแล้ว',
+    'import_delete' => 'ลบการนำเข้า',
+    'import_delete_notification' => 'ลบการนำเข้าสำเร็จแล้ว',
+
+    // Users
+    'user_create' => 'สร้างผู้ใช้',
+    'user_create_notification' => 'สร้างผู้ใช้สำเร็จแล้ว',
+    'user_update' => 'แก้ไขผู้ใช้',
+    'user_update_notification' => 'แก้ไขผู้ใช้สำเร็จแล้ว',
+    'user_delete' => 'ลบผู้ใช้',
+    'user_delete_notification' => 'ลบผู้ใช้สำเร็จแล้ว',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
+
+    // API Tokens
+    'api_token_create' => 'สร้าง API Token',
+    'api_token_create_notification' => 'สร้าง API Token สำเร็จแล้ว',
+    'api_token_update' => 'แก้ไข API Token',
+    'api_token_update_notification' => 'แก้ไข API Token สำเร็จแล้ว',
+    'api_token_delete' => 'ลบ API Token',
+    'api_token_delete_notification' => 'ลบ API Token สำเร็จแล้ว',
+
+    // Roles
+    'role_create' => 'สร้างบทบาท',
+    'role_create_notification' => 'สร้างบทบาทสำเร็จแล้ว',
+    'role_update' => 'แก้ไขบทบาท',
+    'role_update_notification' => 'แก้ไขบทบาทสำเร็จแล้ว',
+    'role_delete' => 'ลบบทบาท',
+    'role_delete_notification' => 'ลบบทบาทสำเร็จแล้ว',
+
+    // Recycle Bin
+    'recycle_bin_empty' => 'ล้างถังรีไซเคิล',
+    'recycle_bin_restore' => 'กู้คืนจากถังรีไซเคิล',
+    'recycle_bin_destroy' => 'ลบถาวรจากถังรีไซเคิล',
+
+    // Comments
+    'commented_on'                => 'แสดงความคิดเห็นใน',
+    'comment_create'              => 'เพิ่มความคิดเห็น',
+    'comment_update'              => 'แก้ไขความคิดเห็น',
+    'comment_delete'              => 'ลบความคิดเห็น',
+
+    // Sort Rules
+    'sort_rule_create' => 'สร้างกฎการจัดเรียง',
+    'sort_rule_create_notification' => 'สร้างกฎการจัดเรียงสำเร็จแล้ว',
+    'sort_rule_update' => 'แก้ไขกฎการจัดเรียง',
+    'sort_rule_update_notification' => 'แก้ไขกฎการจัดเรียงสำเร็จแล้ว',
+    'sort_rule_delete' => 'ลบกฎการจัดเรียง',
+    'sort_rule_delete_notification' => 'ลบกฎการจัดเรียงสำเร็จแล้ว',
+
+    // Other
+    'permissions_update'          => 'แก้ไขสิทธิ์',
+];
diff --git a/lang/th/auth.php b/lang/th/auth.php
new file mode 100644
index 00000000000..14af2ed57a9
--- /dev/null
+++ b/lang/th/auth.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Authentication Language Lines
+ * The following language lines are used during authentication for various
+ * messages that we need to display to the user.
+ */
+return [
+
+    'failed' => 'ข้อมูลประจำตัวไม่ตรงกับที่มีในระบบ',
+    'throttle' => 'เข้าสู่ระบบล้มเหลวหลายครั้งเกินไป กรุณาลองใหม่ในอีก :seconds วินาที',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
+
+    // Login & Register
+    'sign_up' => 'สมัครสมาชิก',
+    'log_in' => 'เข้าสู่ระบบ',
+    'log_in_with' => 'เข้าสู่ระบบด้วย :socialDriver',
+    'sign_up_with' => 'สมัครสมาชิกด้วย :socialDriver',
+    'logout' => 'ออกจากระบบ',
+
+    'name' => 'ชื่อ',
+    'username' => 'ชื่อผู้ใช้',
+    'email' => 'อีเมล',
+    'password' => 'รหัสผ่าน',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
+    'password_confirm' => 'ยืนยันรหัสผ่าน',
+    'password_hint' => 'ต้องมีอย่างน้อย 8 ตัวอักษร',
+    'forgot_password' => 'ลืมรหัสผ่าน?',
+    'remember_me' => 'จดจำฉัน',
+    'ldap_email_hint' => 'กรุณากรอกอีเมลที่จะใช้กับบัญชีนี้',
+    'create_account' => 'สร้างบัญชี',
+    'already_have_account' => 'มีบัญชีอยู่แล้ว?',
+    'dont_have_account' => 'ยังไม่มีบัญชี?',
+    'social_login' => 'เข้าสู่ระบบด้วย Social',
+    'social_registration' => 'ลงทะเบียนด้วย Social',
+    'social_registration_text' => 'ลงทะเบียนและเข้าสู่ระบบด้วยบริการอื่น',
+
+    'register_thanks' => 'ขอบคุณที่ลงทะเบียน กรุณายืนยันอีเมลเพื่อเข้าสู่ระบบ',
+    'register_confirm' => 'ยืนยันและลงทะเบียน',
+    'registrations_disabled' => 'ขณะนี้ปิดรับการลงทะเบียน',
+    'registration_email_domain_invalid' => 'โดเมนอีเมลนี้ไม่มีสิทธิ์เข้าถึงระบบ',
+    'register_success' => 'ขอบคุณที่สมัครสมาชิก คุณได้ลงทะเบียนและเข้าสู่ระบบแล้ว',
+
+    // Login auto-initiation
+    'auto_init_starting' => 'กำลังเข้าสู่ระบบ',
+    'auto_init_starting_desc' => 'กำลังติดต่อระบบยืนยันตัวตนเพื่อเริ่มกระบวนการเข้าสู่ระบบ หากไม่มีความคืบหน้าภายใน 5 วินาที กรุณาคลิกลิงก์ด้านล่าง',
+    'auto_init_start_link' => 'ดำเนินการยืนยันตัวตน',
+
+    // Password Reset
+    'reset_password' => 'รีเซ็ตรหัสผ่าน',
+    'reset_password_send_instructions' => 'กรอกอีเมลด้านล่าง ระบบจะส่งลิงก์รีเซ็ตรหัสผ่านให้คุณ',
+    'reset_password_send_button' => 'ส่งลิงก์รีเซ็ตรหัสผ่าน',
+    'reset_password_sent' => 'หากพบอีเมล :email ในระบบ จะมีลิงก์รีเซ็ตรหัสผ่านส่งไปให้',
+    'reset_password_success' => 'รีเซ็ตรหัสผ่านสำเร็จแล้ว',
+    'email_reset_subject' => 'รีเซ็ตรหัสผ่าน :appName ของคุณ',
+    'email_reset_text' => 'คุณได้รับอีเมลนี้เพราะมีการขอรีเซ็ตรหัสผ่านสำหรับบัญชีของคุณ',
+    'email_reset_not_requested' => 'หากคุณไม่ได้ขอรีเซ็ตรหัสผ่าน ไม่ต้องดำเนินการใดๆ เพิ่มเติม',
+
+    // Email Confirmation
+    'email_confirm_subject' => 'ยืนยันอีเมลของคุณบน :appName',
+    'email_confirm_greeting' => 'ขอบคุณที่เข้าร่วม :appName!',
+    'email_confirm_text' => 'กรุณายืนยันอีเมลของคุณโดยคลิกปุ่มด้านล่าง:',
+    'email_confirm_action' => 'ยืนยันอีเมล',
+    'email_confirm_send_error' => 'จำเป็นต้องยืนยันอีเมล แต่ระบบไม่สามารถส่งอีเมลได้ กรุณาติดต่อผู้ดูแลระบบเพื่อตรวจสอบการตั้งค่าอีเมล',
+    'email_confirm_success' => 'ยืนยันอีเมลสำเร็จแล้ว สามารถเข้าสู่ระบบได้',
+    'email_confirm_resent' => 'ส่งอีเมลยืนยันใหม่แล้ว กรุณาตรวจสอบกล่องจดหมาย',
+    'email_confirm_thanks' => 'ขอบคุณที่ยืนยัน!',
+    'email_confirm_thanks_desc' => 'กรุณารอสักครู่ขณะที่ระบบดำเนินการยืนยัน หากไม่ถูกเปลี่ยนหน้าภายใน 3 วินาที กรุณาคลิกลิงก์ "ดำเนินการต่อ" ด้านล่าง',
+
+    'email_not_confirmed' => 'ยังไม่ได้ยืนยันอีเมล',
+    'email_not_confirmed_text' => 'อีเมลของคุณยังไม่ได้รับการยืนยัน',
+    'email_not_confirmed_click_link' => 'กรุณาคลิกลิงก์ในอีเมลที่ส่งให้คุณหลังจากลงทะเบียน',
+    'email_not_confirmed_resend' => 'หากไม่พบอีเมล คุณสามารถส่งอีเมลยืนยันอีกครั้งโดยกรอกแบบฟอร์มด้านล่าง',
+    'email_not_confirmed_resend_button' => 'ส่งอีเมลยืนยันอีกครั้ง',
+
+    // User Invite
+    'user_invite_email_subject' => 'คุณได้รับเชิญให้เข้าร่วม :appName!',
+    'user_invite_email_greeting' => 'มีการสร้างบัญชีให้คุณบน :appName',
+    'user_invite_email_text' => 'คลิกปุ่มด้านล่างเพื่อตั้งรหัสผ่านและเข้าใช้งาน:',
+    'user_invite_email_action' => 'ตั้งรหัสผ่านบัญชี',
+    'user_invite_page_welcome' => 'ยินดีต้อนรับสู่ :appName!',
+    'user_invite_page_text' => 'เพื่อเสร็จสิ้นการสร้างบัญชีและเข้าใช้งาน คุณต้องตั้งรหัสผ่านสำหรับเข้าสู่ :appName ในครั้งถัดไป',
+    'user_invite_page_confirm_button' => 'ยืนยันรหัสผ่าน',
+    'user_invite_success_login' => 'ตั้งรหัสผ่านแล้ว คุณสามารถเข้าสู่ระบบ :appName ด้วยรหัสผ่านที่ตั้งไว้ได้แล้ว!',
+
+    // Multi-factor Authentication
+    'mfa_setup' => 'ตั้งค่าการยืนยันตัวตนแบบหลายขั้นตอน',
+    'mfa_setup_desc' => 'ตั้งค่า MFA เพื่อเพิ่มความปลอดภัยให้บัญชีของคุณ',
+    'mfa_setup_configured' => 'ตั้งค่าแล้ว',
+    'mfa_setup_reconfigure' => 'ตั้งค่าใหม่',
+    'mfa_setup_remove_confirmation' => 'คุณแน่ใจหรือไม่ว่าต้องการลบวิธียืนยันตัวตนแบบหลายขั้นตอนนี้?',
+    'mfa_setup_action' => 'ตั้งค่า',
+    'mfa_backup_codes_usage_limit_warning' => 'คุณมีรหัสสำรองเหลือน้อยกว่า 5 รหัส กรุณาสร้างและบันทึกชุดใหม่ก่อนหมด เพื่อป้องกันการถูกล็อกออกจากบัญชี',
+    'mfa_option_totp_title' => 'แอป Authenticator',
+    'mfa_option_totp_desc' => 'ในการใช้การยืนยันตัวตนแบบหลายขั้นตอน คุณต้องมีแอปพลิเคชันมือถือที่รองรับ TOTP เช่น Google Authenticator, Authy หรือ Microsoft Authenticator',
+    'mfa_option_backup_codes_title' => 'รหัสสำรอง',
+    'mfa_option_backup_codes_desc' => 'สร้างชุดรหัสสำรองแบบใช้ครั้งเดียว ซึ่งจะใช้กรอกเมื่อเข้าสู่ระบบเพื่อยืนยันตัวตน กรุณาเก็บรักษาไว้ในที่ปลอดภัย',
+    'mfa_gen_confirm_and_enable' => 'ยืนยันและเปิดใช้งาน',
+    'mfa_gen_backup_codes_title' => 'ตั้งค่ารหัสสำรอง',
+    'mfa_gen_backup_codes_desc' => 'บันทึกรายการรหัสด้านล่างไว้ในที่ปลอดภัย เมื่อเข้าระบบคุณสามารถใช้รหัสเหล่านี้เป็นการยืนยันตัวตนขั้นที่สองได้',
+    'mfa_gen_backup_codes_download' => 'ดาวน์โหลดรหัส',
+    'mfa_gen_backup_codes_usage_warning' => 'รหัสแต่ละรหัสใช้ได้เพียงครั้งเดียว',
+    'mfa_gen_totp_title' => 'ตั้งค่าแอปมือถือ',
+    'mfa_gen_totp_desc' => 'ในการใช้การยืนยันตัวตนแบบหลายขั้นตอน คุณต้องมีแอปพลิเคชันมือถือที่รองรับ TOTP เช่น Google Authenticator, Authy หรือ Microsoft Authenticator',
+    'mfa_gen_totp_scan' => 'สแกน QR code ด้านล่างด้วยแอป Authenticator ที่คุณต้องการใช้',
+    'mfa_gen_totp_verify_setup' => 'ยืนยันการตั้งค่า',
+    'mfa_gen_totp_verify_setup_desc' => 'ยืนยันว่าทุกอย่างทำงานได้โดยกรอกรหัสที่สร้างจากแอป Authenticator ในช่องด้านล่าง:',
+    'mfa_gen_totp_provide_code_here' => 'กรอกรหัสที่สร้างจากแอปของคุณที่นี่',
+    'mfa_verify_access' => 'ยืนยันการเข้าถึง',
+    'mfa_verify_access_desc' => 'บัญชีของคุณต้องยืนยันตัวตนผ่านการตรวจสอบเพิ่มเติมก่อนเข้าใช้งาน กรุณายืนยันด้วยวิธีที่ตั้งค่าไว้เพื่อดำเนินการต่อ',
+    'mfa_verify_no_methods' => 'ยังไม่ได้ตั้งค่าวิธียืนยันตัวตน',
+    'mfa_verify_no_methods_desc' => 'ไม่พบวิธียืนยันตัวตนแบบหลายขั้นตอนสำหรับบัญชีของคุณ กรุณาตั้งค่าอย่างน้อยหนึ่งวิธีก่อนเข้าใช้งาน',
+    'mfa_verify_use_totp' => 'ยืนยันด้วยแอปมือถือ',
+    'mfa_verify_use_backup_codes' => 'ยืนยันด้วยรหัสสำรอง',
+    'mfa_verify_backup_code' => 'รหัสสำรอง',
+    'mfa_verify_backup_code_desc' => 'กรอกรหัสสำรองที่เหลืออยู่ของคุณด้านล่าง:',
+    'mfa_verify_backup_code_enter_here' => 'กรอกรหัสสำรองที่นี่',
+    'mfa_verify_totp_desc' => 'กรอกรหัสที่สร้างจากแอปมือถือของคุณด้านล่าง:',
+    'mfa_setup_login_notification' => 'ตั้งค่าวิธียืนยันตัวตนแล้ว กรุณาเข้าสู่ระบบอีกครั้งด้วยวิธีที่ตั้งค่าไว้',
+];
diff --git a/lang/th/common.php b/lang/th/common.php
new file mode 100644
index 00000000000..5600465dafd
--- /dev/null
+++ b/lang/th/common.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Common elements found throughout many areas of BookStack.
+ */
+return [
+
+    // Buttons
+    'cancel' => 'ยกเลิก',
+    'close' => 'ปิด',
+    'confirm' => 'ยืนยัน',
+    'back' => 'ย้อนกลับ',
+    'save' => 'บันทึก',
+    'continue' => 'ดำเนินการต่อ',
+    'select' => 'เลือก',
+    'toggle_all' => 'สลับทั้งหมด',
+    'more' => 'เพิ่มเติม',
+
+    // Form Labels
+    'name' => 'ชื่อ',
+    'description' => 'คำอธิบาย',
+    'role' => 'บทบาท',
+    'cover_image' => 'ภาพปก',
+    'cover_image_description' => 'รูปภาพนี้ควรมีขนาดประมาณ 440x250px แต่จะถูกปรับขนาดและตัดให้เหมาะกับการแสดงผลในสถานการณ์ต่างๆ ดังนั้นขนาดที่แสดงจริงอาจแตกต่างกัน',
+
+    // Actions
+    'actions' => 'การดำเนินการ',
+    'view' => 'ดู',
+    'view_all' => 'ดูทั้งหมด',
+    'new' => 'ใหม่',
+    'create' => 'สร้าง',
+    'update' => 'อัปเดต',
+    'edit' => 'แก้ไข',
+    'archive' => 'เก็บถาวร',
+    'unarchive' => 'ยกเลิกการเก็บถาวร',
+    'sort' => 'จัดเรียง',
+    'move' => 'ย้าย',
+    'copy' => 'คัดลอก',
+    'reply' => 'ตอบกลับ',
+    'delete' => 'ลบ',
+    'delete_confirm' => 'ยืนยันการลบ',
+    'search' => 'ค้นหา',
+    'search_clear' => 'ล้างการค้นหา',
+    'reset' => 'รีเซ็ต',
+    'remove' => 'ลบออก',
+    'add' => 'เพิ่ม',
+    'configure' => 'กำหนดค่า',
+    'manage' => 'จัดการ',
+    'fullscreen' => 'เต็มหน้าจอ',
+    'favourite' => 'เพิ่มในรายการโปรด',
+    'unfavourite' => 'นำออกจากรายการโปรด',
+    'next' => 'ถัดไป',
+    'previous' => 'ก่อนหน้า',
+    'filter_active' => 'ตัวกรองที่ใช้งานอยู่:',
+    'filter_clear' => 'ล้างตัวกรอง',
+    'download' => 'ดาวน์โหลด',
+    'open_in_tab' => 'เปิดในแท็บใหม่',
+    'open' => 'เปิด',
+
+    // Sort Options
+    'sort_options' => 'ตัวเลือกการจัดเรียง',
+    'sort_direction_toggle' => 'สลับทิศทางการจัดเรียง',
+    'sort_ascending' => 'จัดเรียงจากน้อยไปมาก',
+    'sort_descending' => 'จัดเรียงจากมากไปน้อย',
+    'sort_name' => 'ชื่อ',
+    'sort_default' => 'ค่าเริ่มต้น',
+    'sort_created_at' => 'วันที่สร้าง',
+    'sort_updated_at' => 'วันที่แก้ไขล่าสุด',
+
+    // Misc
+    'deleted_user' => 'ผู้ใช้ที่ถูกลบ',
+    'no_activity' => 'ไม่มีกิจกรรมที่จะแสดง',
+    'no_items' => 'ไม่มีรายการ',
+    'back_to_top' => 'กลับไปด้านบน',
+    'skip_to_main_content' => 'ข้ามไปยังเนื้อหาหลัก',
+    'toggle_details' => 'แสดง/ซ่อนรายละเอียด',
+    'toggle_thumbnails' => 'แสดง/ซ่อนภาพย่อ',
+    'details' => 'รายละเอียด',
+    'grid_view' => 'มุมมองตาราง',
+    'list_view' => 'มุมมองรายการ',
+    'default' => 'ค่าเริ่มต้น',
+    'breadcrumb' => 'เส้นทางนำทาง',
+    'status' => 'สถานะ',
+    'status_active' => 'ใช้งาน',
+    'status_inactive' => 'ไม่ใช้งาน',
+    'never' => 'ไม่เคย',
+    'none' => 'ไม่มี',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
+
+    // Header
+    'homepage' => 'หน้าแรก',
+    'header_menu_expand' => 'ขยายเมนูส่วนหัว',
+    'profile_menu' => 'เมนูโปรไฟล์',
+    'view_profile' => 'ดูโปรไฟล์',
+    'edit_profile' => 'แก้ไขโปรไฟล์',
+    'dark_mode' => 'โหมดมืด',
+    'light_mode' => 'โหมดสว่าง',
+    'global_search' => 'ค้นหาทั้งระบบ',
+
+    // Layout tabs
+    'tab_info' => 'ข้อมูล',
+    'tab_info_label' => 'แท็บ: แสดงข้อมูลเพิ่มเติม',
+    'tab_content' => 'เนื้อหา',
+    'tab_content_label' => 'แท็บ: แสดงเนื้อหาหลัก',
+
+    // Email Content
+    'email_action_help' => 'หากไม่สามารถคลิกปุ่ม ":actionText" ได้ กรุณาคัดลอก URL ด้านล่างและวางในเบราว์เซอร์:',
+    'email_rights' => 'สงวนลิขสิทธิ์',
+
+    // Footer Link Options
+    // Not directly used but available for convenience to users.
+    'privacy_policy' => 'นโยบายความเป็นส่วนตัว',
+    'terms_of_service' => 'ข้อกำหนดการใช้งาน',
+
+    // OpenSearch
+    'opensearch_description' => 'ค้นหา :appName',
+];
diff --git a/lang/th/components.php b/lang/th/components.php
new file mode 100644
index 00000000000..2931d2bc768
--- /dev/null
+++ b/lang/th/components.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Text used in custom JavaScript driven components.
+ */
+return [
+
+    // Image Manager
+    'image_select' => 'เลือกรูปภาพ',
+    'image_list' => 'รายการรูปภาพ',
+    'image_details' => 'รายละเอียดรูปภาพ',
+    'image_upload' => 'อัปโหลดรูปภาพ',
+    'image_intro' => 'คุณสามารถเลือกและจัดการรูปภาพที่เคยอัปโหลดไว้ในระบบได้ที่นี่',
+    'image_intro_upload' => 'อัปโหลดรูปภาพใหม่โดยลากไฟล์รูปภาพมาวางในหน้าต่างนี้ หรือใช้ปุ่ม "อัปโหลดรูปภาพ" ด้านบน',
+    'image_all' => 'ทั้งหมด',
+    'image_all_title' => 'ดูรูปภาพทั้งหมด',
+    'image_book_title' => 'ดูรูปภาพที่อัปโหลดในหนังสือนี้',
+    'image_page_title' => 'ดูรูปภาพที่อัปโหลดในหน้านี้',
+    'image_search_hint' => 'ค้นหาตามชื่อรูปภาพ',
+    'image_uploaded' => 'อัปโหลดเมื่อ :uploadedDate',
+    'image_uploaded_by' => 'อัปโหลดโดย :userName',
+    'image_uploaded_to' => 'อัปโหลดไปยัง :pageLink',
+    'image_updated' => 'อัปเดตเมื่อ :updateDate',
+    'image_load_more' => 'โหลดเพิ่มเติม',
+    'image_image_name' => 'ชื่อรูปภาพ',
+    'image_delete_used' => 'รูปภาพนี้ถูกใช้งานในหน้าด้านล่าง',
+    'image_delete_confirm_text' => 'คุณแน่ใจหรือไม่ว่าต้องการลบรูปภาพนี้?',
+    'image_select_image' => 'เลือกรูปภาพ',
+    'image_dropzone' => 'วางรูปภาพหรือคลิกที่นี่เพื่ออัปโหลด',
+    'image_dropzone_drop' => 'วางรูปภาพที่นี่เพื่ออัปโหลด',
+    'images_deleted' => 'ลบรูปภาพแล้ว',
+    'image_preview' => 'ดูตัวอย่างรูปภาพ',
+    'image_upload_success' => 'อัปโหลดรูปภาพสำเร็จแล้ว',
+    'image_update_success' => 'อัปเดตรายละเอียดรูปภาพสำเร็จแล้ว',
+    'image_delete_success' => 'ลบรูปภาพสำเร็จแล้ว',
+    'image_replace' => 'แทนที่รูปภาพ',
+    'image_replace_success' => 'อัปเดตไฟล์รูปภาพสำเร็จแล้ว',
+    'image_rebuild_thumbs' => 'สร้างภาพย่อขนาดต่างๆ ใหม่',
+    'image_rebuild_thumbs_success' => 'สร้างภาพย่อขนาดต่างๆ ใหม่สำเร็จแล้ว!',
+
+    // Code Editor
+    'code_editor' => 'แก้ไขโค้ด',
+    'code_language' => 'ภาษาโค้ด',
+    'code_content' => 'เนื้อหาโค้ด',
+    'code_session_history' => 'ประวัติเซสชัน',
+    'code_save' => 'บันทึกโค้ด',
+];
diff --git a/lang/th/editor.php b/lang/th/editor.php
new file mode 100644
index 00000000000..4af059bf19c
--- /dev/null
+++ b/lang/th/editor.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Page Editor Lines
+ * Contains text strings used within the user interface of the
+ * WYSIWYG page editor. Some Markdown editor strings may still
+ * exist in the 'entities' file instead since this was added later.
+ */
+return [
+    // General editor terms
+    'general' => 'ทั่วไป',
+    'advanced' => 'ขั้นสูง',
+    'none' => 'ไม่มี',
+    'cancel' => 'ยกเลิก',
+    'save' => 'บันทึก',
+    'close' => 'ปิด',
+    'apply' => 'ใช้งาน',
+    'undo' => 'เลิกทำ',
+    'redo' => 'ทำซ้ำ',
+    'left' => 'ซ้าย',
+    'center' => 'กลาง',
+    'right' => 'ขวา',
+    'top' => 'บน',
+    'middle' => 'กลาง',
+    'bottom' => 'ล่าง',
+    'width' => 'ความกว้าง',
+    'height' => 'ความสูง',
+    'More' => 'เพิ่มเติม',
+    'select' => 'เลือก...',
+
+    // Toolbar
+    'formats' => 'รูปแบบ',
+    'header_large' => 'หัวข้อใหญ่',
+    'header_medium' => 'หัวข้อกลาง',
+    'header_small' => 'หัวข้อเล็ก',
+    'header_tiny' => 'หัวข้อเล็กมาก',
+    'paragraph' => 'ย่อหน้า',
+    'blockquote' => 'คำพูดอ้างอิง',
+    'inline_code' => 'โค้ดแบบอินไลน์',
+    'callouts' => 'กล่องข้อความเน้น',
+    'callout_information' => 'ข้อมูล',
+    'callout_success' => 'สำเร็จ',
+    'callout_warning' => 'คำเตือน',
+    'callout_danger' => 'อันตราย',
+    'bold' => 'ตัวหนา',
+    'italic' => 'ตัวเอียง',
+    'underline' => 'ขีดเส้นใต้',
+    'strikethrough' => 'ขีดทับ',
+    'superscript' => 'ตัวยก',
+    'subscript' => 'ตัวห้อย',
+    'text_color' => 'สีตัวอักษร',
+    'highlight_color' => 'สีไฮไลต์',
+    'custom_color' => 'สีกำหนดเอง',
+    'remove_color' => 'ลบสี',
+    'background_color' => 'สีพื้นหลัง',
+    'align_left' => 'จัดชิดซ้าย',
+    'align_center' => 'จัดกึ่งกลาง',
+    'align_right' => 'จัดชิดขวา',
+    'align_justify' => 'จัดเต็มบรรทัด',
+    'list_bullet' => 'รายการแบบจุด',
+    'list_numbered' => 'รายการแบบตัวเลข',
+    'list_task' => 'รายการงาน',
+    'indent_increase' => 'เพิ่มการย่อหน้า',
+    'indent_decrease' => 'ลดการย่อหน้า',
+    'table' => 'ตาราง',
+    'insert_image' => 'แทรกรูปภาพ',
+    'insert_image_title' => 'แทรก/แก้ไขรูปภาพ',
+    'insert_link' => 'แทรก/แก้ไขลิงก์',
+    'insert_link_title' => 'แทรก/แก้ไขลิงก์',
+    'insert_horizontal_line' => 'แทรกเส้นแนวนอน',
+    'insert_code_block' => 'แทรกบล็อกโค้ด',
+    'edit_code_block' => 'แก้ไขบล็อกโค้ด',
+    'insert_drawing' => 'แทรก/แก้ไขภาพวาด',
+    'drawing_manager' => 'ตัวจัดการภาพวาด',
+    'insert_media' => 'แทรก/แก้ไขสื่อ',
+    'insert_media_title' => 'แทรก/แก้ไขสื่อ',
+    'clear_formatting' => 'ล้างการจัดรูปแบบ',
+    'source_code' => 'ซอร์สโค้ด',
+    'source_code_title' => 'ซอร์สโค้ด',
+    'fullscreen' => 'เต็มหน้าจอ',
+    'image_options' => 'ตัวเลือกรูปภาพ',
+
+    // Tables
+    'table_properties' => 'คุณสมบัติตาราง',
+    'table_properties_title' => 'คุณสมบัติตาราง',
+    'delete_table' => 'ลบตาราง',
+    'table_clear_formatting' => 'ล้างการจัดรูปแบบตาราง',
+    'resize_to_contents' => 'ปรับขนาดตามเนื้อหา',
+    'row_header' => 'แถวหัวตาราง',
+    'insert_row_before' => 'แทรกแถวก่อนหน้า',
+    'insert_row_after' => 'แทรกแถวถัดไป',
+    'delete_row' => 'ลบแถว',
+    'insert_column_before' => 'แทรกคอลัมน์ก่อนหน้า',
+    'insert_column_after' => 'แทรกคอลัมน์ถัดไป',
+    'delete_column' => 'ลบคอลัมน์',
+    'table_cell' => 'เซลล์',
+    'table_row' => 'แถว',
+    'table_column' => 'คอลัมน์',
+    'cell_properties' => 'คุณสมบัติเซลล์',
+    'cell_properties_title' => 'คุณสมบัติเซลล์',
+    'cell_type' => 'ประเภทเซลล์',
+    'cell_type_cell' => 'เซลล์',
+    'cell_scope' => 'ขอบเขต',
+    'cell_type_header' => 'เซลล์หัวตาราง',
+    'merge_cells' => 'รวมเซลล์',
+    'split_cell' => 'แยกเซลล์',
+    'table_row_group' => 'กลุ่มแถว',
+    'table_column_group' => 'กลุ่มคอลัมน์',
+    'horizontal_align' => 'การจัดแนวนอน',
+    'vertical_align' => 'การจัดแนวตั้ง',
+    'border_width' => 'ความกว้างเส้นขอบ',
+    'border_style' => 'รูปแบบเส้นขอบ',
+    'border_color' => 'สีเส้นขอบ',
+    'row_properties' => 'คุณสมบัติแถว',
+    'row_properties_title' => 'คุณสมบัติแถว',
+    'cut_row' => 'ตัดแถว',
+    'copy_row' => 'คัดลอกแถว',
+    'paste_row_before' => 'วางแถวก่อนหน้า',
+    'paste_row_after' => 'วางแถวถัดไป',
+    'row_type' => 'ประเภทแถว',
+    'row_type_header' => 'ส่วนหัว',
+    'row_type_body' => 'ส่วนเนื้อหา',
+    'row_type_footer' => 'ส่วนท้าย',
+    'alignment' => 'การจัดตำแหน่ง',
+    'cut_column' => 'ตัดคอลัมน์',
+    'copy_column' => 'คัดลอกคอลัมน์',
+    'paste_column_before' => 'วางคอลัมน์ก่อนหน้า',
+    'paste_column_after' => 'วางคอลัมน์ถัดไป',
+    'cell_padding' => 'ระยะห่างภายในเซลล์',
+    'cell_spacing' => 'ระยะห่างระหว่างเซลล์',
+    'caption' => 'คำบรรยาย',
+    'show_caption' => 'แสดงคำบรรยาย',
+    'constrain' => 'รักษาสัดส่วน',
+    'cell_border_solid' => 'เส้นทึบ',
+    'cell_border_dotted' => 'เส้นจุด',
+    'cell_border_dashed' => 'เส้นประ',
+    'cell_border_double' => 'เส้นคู่',
+    'cell_border_groove' => 'เส้นร่อง',
+    'cell_border_ridge' => 'เส้นนูน',
+    'cell_border_inset' => 'เส้นฝัง',
+    'cell_border_outset' => 'เส้นนูนออก',
+    'cell_border_none' => 'ไม่มี',
+    'cell_border_hidden' => 'ซ่อน',
+
+    // Images, links, details/summary & embed
+    'source' => 'แหล่งที่มา',
+    'alt_desc' => 'คำอธิบายทดแทน',
+    'embed' => 'ฝังเนื้อหา',
+    'paste_embed' => 'วางโค้ดฝังเนื้อหาด้านล่าง:',
+    'url' => 'URL',
+    'text_to_display' => 'ข้อความที่แสดง',
+    'title' => 'ชื่อเรื่อง',
+    'browse_links' => 'เรียกดูลิงก์',
+    'open_link' => 'เปิดลิงก์',
+    'open_link_in' => 'เปิดลิงก์ใน...',
+    'open_link_current' => 'หน้าต่างปัจจุบัน',
+    'open_link_new' => 'หน้าต่างใหม่',
+    'remove_link' => 'ลบลิงก์',
+    'insert_collapsible' => 'แทรกบล็อกที่ย่อได้',
+    'collapsible_unwrap' => 'ยกเลิกการห่อ',
+    'edit_label' => 'แก้ไขป้ายกำกับ',
+    'toggle_open_closed' => 'สลับเปิด/ปิด',
+    'collapsible_edit' => 'แก้ไขบล็อกที่ย่อได้',
+    'toggle_label' => 'ป้ายกำกับสลับ',
+
+    // About view
+    'about' => 'เกี่ยวกับตัวแก้ไข',
+    'about_title' => 'เกี่ยวกับตัวแก้ไข WYSIWYG',
+    'editor_license' => 'สัญญาอนุญาตและลิขสิทธิ์ตัวแก้ไข',
+    'editor_lexical_license' => 'ตัวแก้ไขนี้สร้างจาก :lexicalLink ซึ่งเผยแพร่ภายใต้สัญญาอนุญาต MIT',
+    'editor_lexical_license_link' => 'ดูรายละเอียดสัญญาอนุญาตฉบับเต็มได้ที่นี่',
+    'editor_tiny_license' => 'ตัวแก้ไขนี้สร้างด้วย :tinyLink ซึ่งเผยแพร่ภายใต้สัญญาอนุญาต MIT',
+    'editor_tiny_license_link' => 'ดูรายละเอียดลิขสิทธิ์และสัญญาอนุญาตของ TinyMCE ได้ที่นี่',
+    'save_continue' => 'บันทึกหน้าและดำเนินการต่อ',
+    'callouts_cycle' => '(กดต่อเนื่องเพื่อสลับประเภท)',
+    'link_selector' => 'ลิงก์ไปยังเนื้อหา',
+    'shortcuts' => 'แป้นพิมพ์ลัด',
+    'shortcut' => 'แป้นพิมพ์ลัด',
+    'shortcuts_intro' => 'แป้นพิมพ์ลัดต่อไปนี้ใช้งานได้ในตัวแก้ไข:',
+    'windows_linux' => '(Windows/Linux)',
+    'mac' => '(Mac)',
+    'description' => 'คำอธิบาย',
+];
diff --git a/lang/th/entities.php b/lang/th/entities.php
new file mode 100644
index 00000000000..bda46b62c59
--- /dev/null
+++ b/lang/th/entities.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * Text used for 'Entities' (Document Structure Elements) such as
+ * Books, Shelves, Chapters & Pages
+ */
+return [
+
+    // Shared
+    'recently_created' => 'สร้างล่าสุด',
+    'recently_created_pages' => 'หน้าที่สร้างล่าสุด',
+    'recently_updated_pages' => 'หน้าที่แก้ไขล่าสุด',
+    'recently_created_chapters' => 'บทที่สร้างล่าสุด',
+    'recently_created_books' => 'หนังสือที่สร้างล่าสุด',
+    'recently_created_shelves' => 'ชั้นวางที่สร้างล่าสุด',
+    'recently_update' => 'แก้ไขล่าสุด',
+    'recently_viewed' => 'ดูล่าสุด',
+    'recent_activity' => 'กิจกรรมล่าสุด',
+    'create_now' => 'สร้างตอนนี้',
+    'revisions' => 'การแก้ไข',
+    'meta_revision' => 'การแก้ไข #:revisionCount',
+    'meta_created' => 'สร้างเมื่อ :timeLength',
+    'meta_created_name' => 'สร้างเมื่อ :timeLength โดย :user',
+    'meta_updated' => 'แก้ไขเมื่อ :timeLength',
+    'meta_updated_name' => 'แก้ไขเมื่อ :timeLength โดย :user',
+    'meta_owned_name' => 'เป็นของ :user',
+    'meta_reference_count' => 'อ้างอิงโดย :count รายการ',
+    'entity_select' => 'เลือกรายการ',
+    'entity_select_lack_permission' => 'คุณไม่มีสิทธิ์เลือกรายการนี้',
+    'images' => 'รูปภาพ',
+    'my_recent_drafts' => 'ร่างล่าสุดของฉัน',
+    'my_recently_viewed' => 'ที่ฉันดูล่าสุด',
+    'my_most_viewed_favourites' => 'รายการโปรดที่ดูบ่อยที่สุด',
+    'my_favourites' => 'รายการโปรดของฉัน',
+    'no_pages_viewed' => 'คุณยังไม่ได้ดูหน้าใด',
+    'no_pages_recently_created' => 'ยังไม่มีหน้าที่สร้างล่าสุด',
+    'no_pages_recently_updated' => 'ยังไม่มีหน้าที่แก้ไขล่าสุด',
+    'export' => 'ส่งออก',
+    'export_html' => 'ไฟล์เว็บ (HTML)',
+    'export_pdf' => 'ไฟล์ PDF',
+    'export_text' => 'ไฟล์ข้อความธรรมดา',
+    'export_md' => 'ไฟล์ Markdown',
+    'export_zip' => 'ZIP แบบพกพา',
+    'default_template' => 'แม่แบบหน้าเริ่มต้น',
+    'default_template_explain' => 'กำหนดแม่แบบหน้าที่จะใช้เป็นเนื้อหาเริ่มต้นสำหรับหน้าที่สร้างในรายการนี้ โปรดทราบว่าจะใช้งานได้เฉพาะเมื่อผู้สร้างหน้ามีสิทธิ์ดูแม่แบบที่เลือก',
+    'default_template_select' => 'เลือกแม่แบบหน้า',
+    'import' => 'นำเข้า',
+    'import_validate' => 'ตรวจสอบการนำเข้า',
+    'import_desc' => 'นำเข้าหนังสือ บท และหน้าจากไฟล์ ZIP แบบพกพาจากระบบเดียวกันหรือต่างระบบ เลือกไฟล์ ZIP เพื่อดำเนินการต่อ หลังจากอัปโหลดและตรวจสอบแล้ว คุณจะสามารถกำหนดค่าและยืนยันการนำเข้าในขั้นตอนถัดไป',
+    'import_zip_select' => 'เลือกไฟล์ ZIP ที่จะอัปโหลด',
+    'import_zip_validation_errors' => 'พบข้อผิดพลาดขณะตรวจสอบไฟล์ ZIP:',
+    'import_pending' => 'การนำเข้าที่รอดำเนินการ',
+    'import_pending_none' => 'ยังไม่มีการนำเข้าที่เริ่มไว้',
+    'import_continue' => 'ดำเนินการนำเข้าต่อ',
+    'import_continue_desc' => 'ตรวจสอบเนื้อหาที่จะนำเข้าจากไฟล์ ZIP เมื่อพร้อมแล้ว ให้รันการนำเข้าเพื่อเพิ่มเนื้อหาเข้าสู่ระบบ ไฟล์ ZIP จะถูกลบโดยอัตโนมัติเมื่อนำเข้าสำเร็จ',
+    'import_details' => 'รายละเอียดการนำเข้า',
+    'import_run' => 'รันการนำเข้า',
+    'import_size' => 'ขนาดไฟล์ ZIP :size',
+    'import_uploaded_at' => 'อัปโหลดเมื่อ :relativeTime',
+    'import_uploaded_by' => 'อัปโหลดโดย',
+    'import_location' => 'ตำแหน่งนำเข้า',
+    'import_location_desc' => 'เลือกตำแหน่งปลายทางสำหรับเนื้อหาที่นำเข้า คุณต้องมีสิทธิ์สร้างเนื้อหาในตำแหน่งที่เลือก',
+    'import_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบการนำเข้านี้?',
+    'import_delete_desc' => 'การดำเนินการนี้จะลบไฟล์ ZIP ที่อัปโหลดไว้และไม่สามารถยกเลิกได้',
+    'import_errors' => 'ข้อผิดพลาดในการนำเข้า',
+    'import_errors_desc' => 'เกิดข้อผิดพลาดต่อไปนี้ระหว่างการนำเข้า:',
+    'breadcrumb_siblings_for_page' => 'นำทางไปยังหน้าที่อยู่ระดับเดียวกัน',
+    'breadcrumb_siblings_for_chapter' => 'นำทางไปยังบทที่อยู่ระดับเดียวกัน',
+    'breadcrumb_siblings_for_book' => 'นำทางไปยังหนังสือที่อยู่ระดับเดียวกัน',
+    'breadcrumb_siblings_for_bookshelf' => 'นำทางไปยังชั้นวางที่อยู่ระดับเดียวกัน',
+
+    // Permissions and restrictions
+    'permissions' => 'สิทธิ์',
+    'permissions_desc' => 'ตั้งค่าสิทธิ์ที่นี่เพื่อแทนที่สิทธิ์เริ่มต้นที่กำหนดโดยบทบาทผู้ใช้',
+    'permissions_book_cascade' => 'สิทธิ์ที่กำหนดบนหนังสือจะส่งต่อไปยังบทและหน้าลูกโดยอัตโนมัติ เว้นแต่มีการกำหนดสิทธิ์ของตัวเองไว้',
+    'permissions_chapter_cascade' => 'สิทธิ์ที่กำหนดบนบทจะส่งต่อไปยังหน้าลูกโดยอัตโนมัติ เว้นแต่มีการกำหนดสิทธิ์ของตัวเองไว้',
+    'permissions_save' => 'บันทึกสิทธิ์',
+    'permissions_owner' => 'เจ้าของ',
+    'permissions_role_everyone_else' => 'ทุกคนที่เหลือ',
+    'permissions_role_everyone_else_desc' => 'ตั้งค่าสิทธิ์สำหรับบทบาทที่ไม่ได้กำหนดไว้โดยเฉพาะ',
+    'permissions_role_override' => 'แทนที่สิทธิ์สำหรับบทบาท',
+    'permissions_inherit_defaults' => 'รับสิทธิ์เริ่มต้น',
+
+    // Search
+    'search_results' => 'ผลการค้นหา',
+    'search_total_results_found' => 'พบ :count ผลลัพธ์',
+    'search_clear' => 'ล้างการค้นหา',
+    'search_no_pages' => 'ไม่มีหน้าที่ตรงกับการค้นหานี้',
+    'search_for_term' => 'ค้นหา :term',
+    'search_more' => 'ผลลัพธ์เพิ่มเติม',
+    'search_advanced' => 'ค้นหาขั้นสูง',
+    'search_terms' => 'คำค้นหา',
+    'search_content_type' => 'ประเภทเนื้อหา',
+    'search_exact_matches' => 'ตรงทั้งหมด',
+    'search_tags' => 'ค้นหาด้วยแท็ก',
+    'search_options' => 'ตัวเลือก',
+    'search_viewed_by_me' => 'ที่ฉันดูแล้ว',
+    'search_not_viewed_by_me' => 'ที่ฉันยังไม่ได้ดู',
+    'search_permissions_set' => 'มีการกำหนดสิทธิ์',
+    'search_created_by_me' => 'ที่ฉันสร้าง',
+    'search_updated_by_me' => 'ที่ฉันแก้ไข',
+    'search_owned_by_me' => 'ที่ฉันเป็นเจ้าของ',
+    'search_date_options' => 'ตัวเลือกวันที่',
+    'search_updated_before' => 'แก้ไขก่อน',
+    'search_updated_after' => 'แก้ไขหลัง',
+    'search_created_before' => 'สร้างก่อน',
+    'search_created_after' => 'สร้างหลัง',
+    'search_set_date' => 'กำหนดวันที่',
+    'search_update' => 'อัปเดตการค้นหา',
+
+    // Shelves
+    'shelf' => 'ชั้นวาง',
+    'shelves' => 'ชั้นวาง',
+    'x_shelves' => ':count ชั้นวาง',
+    'shelves_empty' => 'ยังไม่มีชั้นวาง',
+    'shelves_create' => 'สร้างชั้นวางใหม่',
+    'shelves_popular' => 'ชั้นวางยอดนิยม',
+    'shelves_new' => 'ชั้นวางใหม่',
+    'shelves_new_action' => 'ชั้นวางใหม่',
+    'shelves_popular_empty' => 'ชั้นวางที่ได้รับความนิยมมากที่สุดจะแสดงที่นี่',
+    'shelves_new_empty' => 'ชั้นวางที่สร้างล่าสุดจะแสดงที่นี่',
+    'shelves_save' => 'บันทึกชั้นวาง',
+    'shelves_books' => 'หนังสือในชั้นวางนี้',
+    'shelves_add_books' => 'เพิ่มหนังสือในชั้นวางนี้',
+    'shelves_drag_books' => 'ลากหนังสือด้านล่างเพื่อเพิ่มในชั้นวางนี้',
+    'shelves_empty_contents' => 'ชั้นวางนี้ยังไม่มีหนังสือ',
+    'shelves_edit_and_assign' => 'แก้ไขชั้นวางเพื่อกำหนดหนังสือ',
+    'shelves_edit_named' => 'แก้ไขชั้นวาง :name',
+    'shelves_edit' => 'แก้ไขชั้นวาง',
+    'shelves_delete' => 'ลบชั้นวาง',
+    'shelves_delete_named' => 'ลบชั้นวาง :name',
+    'shelves_delete_explain' => "การดำเนินการนี้จะลบชั้นวางชื่อ ':name' หนังสือภายในจะไม่ถูกลบ",
+    'shelves_delete_confirmation' => 'คุณแน่ใจหรือไม่ว่าต้องการลบชั้นวางนี้?',
+    'shelves_permissions' => 'สิทธิ์ชั้นวาง',
+    'shelves_permissions_updated' => 'อัปเดตสิทธิ์ชั้นวางแล้ว',
+    'shelves_permissions_active' => 'สิทธิ์ชั้นวางเปิดใช้งานอยู่',
+    'shelves_permissions_cascade_warning' => 'สิทธิ์บนชั้นวางไม่ส่งต่อไปยังหนังสือภายในโดยอัตโนมัติ เนื่องจากหนังสือสามารถอยู่ในหลายชั้นวางได้ อย่างไรก็ตาม สามารถคัดลอกสิทธิ์ไปยังหนังสือลูกได้โดยใช้ตัวเลือกด้านล่าง',
+    'shelves_permissions_create' => 'สิทธิ์สร้างชั้นวางจะใช้สำหรับการคัดลอกสิทธิ์ไปยังหนังสือลูกเท่านั้น ไม่ได้ควบคุมความสามารถในการสร้างหนังสือ',
+    'shelves_copy_permissions_to_books' => 'คัดลอกสิทธิ์ไปยังหนังสือ',
+    'shelves_copy_permissions' => 'คัดลอกสิทธิ์',
+    'shelves_copy_permissions_explain' => 'การดำเนินการนี้จะนำการตั้งค่าสิทธิ์ปัจจุบันของชั้นวางนี้ไปใช้กับหนังสือทั้งหมดภายใน ก่อนเริ่มต้น ให้ตรวจสอบว่าบันทึกการเปลี่ยนแปลงสิทธิ์แล้ว',
+    'shelves_copy_permission_success' => 'คัดลอกสิทธิ์ชั้นวางไปยัง :count หนังสือแล้ว',
+
+    // Books
+    'book' => 'หนังสือ',
+    'books' => 'หนังสือ',
+    'x_books' => ':count หนังสือ',
+    'books_empty' => 'ยังไม่มีหนังสือ',
+    'books_popular' => 'หนังสือยอดนิยม',
+    'books_recent' => 'หนังสือล่าสุด',
+    'books_new' => 'หนังสือใหม่',
+    'books_new_action' => 'หนังสือใหม่',
+    'books_popular_empty' => 'หนังสือที่ได้รับความนิยมมากที่สุดจะแสดงที่นี่',
+    'books_new_empty' => 'หนังสือที่สร้างล่าสุดจะแสดงที่นี่',
+    'books_create' => 'สร้างหนังสือใหม่',
+    'books_delete' => 'ลบหนังสือ',
+    'books_delete_named' => 'ลบหนังสือ :bookName',
+    'books_delete_explain' => 'การดำเนินการนี้จะลบหนังสือชื่อ \':bookName\' หน้าและบทภายในทั้งหมดจะถูกลบด้วย',
+    'books_delete_confirmation' => 'คุณแน่ใจหรือไม่ว่าต้องการลบหนังสือนี้?',
+    'books_edit' => 'แก้ไขหนังสือ',
+    'books_edit_named' => 'แก้ไขหนังสือ :bookName',
+    'books_form_book_name' => 'ชื่อหนังสือ',
+    'books_save' => 'บันทึกหนังสือ',
+    'books_permissions' => 'สิทธิ์หนังสือ',
+    'books_permissions_updated' => 'อัปเดตสิทธิ์หนังสือแล้ว',
+    'books_empty_contents' => 'ยังไม่มีหน้าหรือบทในหนังสือนี้',
+    'books_empty_create_page' => 'สร้างหน้าใหม่',
+    'books_empty_sort_current_book' => 'จัดเรียงหนังสือนี้',
+    'books_empty_add_chapter' => 'เพิ่มบท',
+    'books_permissions_active' => 'สิทธิ์หนังสือเปิดใช้งานอยู่',
+    'books_search_this' => 'ค้นหาในหนังสือนี้',
+    'books_navigation' => 'การนำทางหนังสือ',
+    'books_sort' => 'จัดเรียงเนื้อหาหนังสือ',
+    'books_sort_desc' => 'ย้ายบทและหน้าภายในหนังสือเพื่อจัดเรียงใหม่ สามารถเพิ่มหนังสือเล่มอื่นเพื่อย้ายบทและหน้าระหว่างหนังสือได้ อาจตั้งกฎการจัดเรียงอัตโนมัติเพื่อจัดเรียงเนื้อหาโดยอัตโนมัติเมื่อมีการเปลี่ยนแปลง',
+    'books_sort_auto_sort' => 'ตัวเลือกการจัดเรียงอัตโนมัติ',
+    'books_sort_auto_sort_active' => 'การจัดเรียงอัตโนมัติเปิดใช้งาน: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'กฎการจัดเรียงอัตโนมัติสามารถสร้างได้ในหน้าตั้งค่า "รายการและการจัดเรียง" โดยผู้ใช้ที่มีสิทธิ์ที่เกี่ยวข้อง',
+    'books_sort_named' => 'จัดเรียงหนังสือ :bookName',
+    'books_sort_name' => 'จัดเรียงตามชื่อ',
+    'books_sort_created' => 'จัดเรียงตามวันที่สร้าง',
+    'books_sort_updated' => 'จัดเรียงตามวันที่แก้ไข',
+    'books_sort_chapters_first' => 'บทอยู่ก่อน',
+    'books_sort_chapters_last' => 'บทอยู่หลัง',
+    'books_sort_show_other' => 'แสดงหนังสือเล่มอื่น',
+    'books_sort_save' => 'บันทึกลำดับใหม่',
+    'books_sort_show_other_desc' => 'เพิ่มหนังสือเล่มอื่นที่นี่เพื่อรวมในการจัดเรียง และอนุญาตให้จัดระเบียบข้ามหนังสือได้ง่าย',
+    'books_sort_move_up' => 'เลื่อนขึ้น',
+    'books_sort_move_down' => 'เลื่อนลง',
+    'books_sort_move_prev_book' => 'ย้ายไปหนังสือก่อนหน้า',
+    'books_sort_move_next_book' => 'ย้ายไปหนังสือถัดไป',
+    'books_sort_move_prev_chapter' => 'ย้ายเข้าบทก่อนหน้า',
+    'books_sort_move_next_chapter' => 'ย้ายเข้าบทถัดไป',
+    'books_sort_move_book_start' => 'ย้ายไปต้นหนังสือ',
+    'books_sort_move_book_end' => 'ย้ายไปท้ายหนังสือ',
+    'books_sort_move_before_chapter' => 'ย้ายไปก่อนบท',
+    'books_sort_move_after_chapter' => 'ย้ายไปหลังบท',
+    'books_copy' => 'คัดลอกหนังสือ',
+    'books_copy_success' => 'คัดลอกหนังสือสำเร็จแล้ว',
+
+    // Chapters
+    'chapter' => 'บท',
+    'chapters' => 'บท',
+    'x_chapters' => ':count บท',
+    'chapters_popular' => 'บทยอดนิยม',
+    'chapters_new' => 'บทใหม่',
+    'chapters_create' => 'สร้างบทใหม่',
+    'chapters_delete' => 'ลบบท',
+    'chapters_delete_named' => 'ลบบท :chapterName',
+    'chapters_delete_explain' => 'การดำเนินการนี้จะลบบทชื่อ \':chapterName\' หน้าทั้งหมดในบทนี้จะถูกลบด้วย',
+    'chapters_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบบทนี้?',
+    'chapters_edit' => 'แก้ไขบท',
+    'chapters_edit_named' => 'แก้ไขบท :chapterName',
+    'chapters_save' => 'บันทึกบท',
+    'chapters_move' => 'ย้ายบท',
+    'chapters_move_named' => 'ย้ายบท :chapterName',
+    'chapters_copy' => 'คัดลอกบท',
+    'chapters_copy_success' => 'คัดลอกบทสำเร็จแล้ว',
+    'chapters_permissions' => 'สิทธิ์บท',
+    'chapters_empty' => 'ยังไม่มีหน้าในบทนี้',
+    'chapters_permissions_active' => 'สิทธิ์บทเปิดใช้งานอยู่',
+    'chapters_permissions_success' => 'อัปเดตสิทธิ์บทแล้ว',
+    'chapters_search_this' => 'ค้นหาในบทนี้',
+    'chapter_sort_book' => 'จัดเรียงหนังสือ',
+
+    // Pages
+    'page' => 'หน้า',
+    'pages' => 'หน้า',
+    'x_pages' => ':count หน้า',
+    'pages_popular' => 'หน้ายอดนิยม',
+    'pages_new' => 'หน้าใหม่',
+    'pages_attachments' => 'ไฟล์แนบ',
+    'pages_navigation' => 'การนำทางหน้า',
+    'pages_delete' => 'ลบหน้า',
+    'pages_delete_named' => 'ลบหน้า :pageName',
+    'pages_delete_draft_named' => 'ลบร่างหน้า :pageName',
+    'pages_delete_draft' => 'ลบร่างหน้า',
+    'pages_delete_success' => 'ลบหน้าแล้ว',
+    'pages_delete_draft_success' => 'ลบร่างหน้าแล้ว',
+    'pages_delete_warning_template' => 'หน้านี้ถูกใช้งานเป็นแม่แบบหน้าเริ่มต้นของหนังสือหรือบท หลังจากลบหน้านี้ หนังสือหรือบทดังกล่าวจะไม่มีแม่แบบหน้าเริ่มต้น',
+    'pages_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบหน้านี้?',
+    'pages_delete_draft_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบร่างหน้านี้?',
+    'pages_editing_named' => 'กำลังแก้ไขหน้า :pageName',
+    'pages_edit_draft_options' => 'ตัวเลือกร่าง',
+    'pages_edit_save_draft' => 'บันทึกร่าง',
+    'pages_edit_draft' => 'แก้ไขร่างหน้า',
+    'pages_editing_draft' => 'กำลังแก้ไขร่าง',
+    'pages_editing_page' => 'กำลังแก้ไขหน้า',
+    'pages_edit_draft_save_at' => 'บันทึกร่างเมื่อ ',
+    'pages_edit_delete_draft' => 'ลบร่าง',
+    'pages_edit_delete_draft_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบร่างหน้านี้? การเปลี่ยนแปลงทั้งหมดตั้งแต่บันทึกครั้งล่าสุดจะสูญหาย และตัวแก้ไขจะโหลดเนื้อหาที่บันทึกล่าสุด',
+    'pages_edit_discard_draft' => 'ยกเลิกร่าง',
+    'pages_edit_switch_to_markdown' => 'เปลี่ยนไปใช้ตัวแก้ไข Markdown',
+    'pages_edit_switch_to_markdown_clean' => '(เนื้อหาสะอาด)',
+    'pages_edit_switch_to_markdown_stable' => '(เนื้อหาเสถียร)',
+    'pages_edit_switch_to_wysiwyg' => 'เปลี่ยนไปใช้ตัวแก้ไข WYSIWYG',
+    'pages_edit_switch_to_new_wysiwyg' => 'เปลี่ยนไปใช้ WYSIWYG ใหม่',
+    'pages_edit_switch_to_new_wysiwyg_desc' => '(กำลังทดสอบ Beta)',
+    'pages_edit_set_changelog' => 'ตั้งค่า Changelog',
+    'pages_edit_enter_changelog_desc' => 'กรอกคำอธิบายสั้นๆ เกี่ยวกับการเปลี่ยนแปลงที่ทำ',
+    'pages_edit_enter_changelog' => 'กรอก Changelog',
+    'pages_editor_switch_title' => 'เปลี่ยนตัวแก้ไข',
+    'pages_editor_switch_are_you_sure' => 'คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนตัวแก้ไขสำหรับหน้านี้?',
+    'pages_editor_switch_consider_following' => 'โปรดพิจารณาสิ่งต่อไปนี้เมื่อเปลี่ยนตัวแก้ไข:',
+    'pages_editor_switch_consideration_a' => 'เมื่อบันทึกแล้ว ตัวแก้ไขใหม่จะถูกใช้โดยผู้แก้ไขในอนาคต รวมถึงผู้ที่อาจไม่สามารถเปลี่ยนประเภทตัวแก้ไขได้เอง',
+    'pages_editor_switch_consideration_b' => 'อาจทำให้รายละเอียดและไวยากรณ์บางอย่างสูญหายในบางสถานการณ์',
+    'pages_editor_switch_consideration_c' => 'การเปลี่ยนแปลงแท็กหรือ changelog ที่ทำตั้งแต่บันทึกครั้งล่าสุดจะไม่ถูกบันทึกหลังจากเปลี่ยนนี้',
+    'pages_save' => 'บันทึกหน้า',
+    'pages_title' => 'ชื่อหน้า',
+    'pages_name' => 'ชื่อหน้า',
+    'pages_md_editor' => 'ตัวแก้ไข',
+    'pages_md_preview' => 'ดูตัวอย่าง',
+    'pages_md_insert_image' => 'แทรกรูปภาพ',
+    'pages_md_insert_link' => 'แทรกลิงก์รายการ',
+    'pages_md_insert_drawing' => 'แทรกภาพวาด',
+    'pages_md_show_preview' => 'แสดงตัวอย่าง',
+    'pages_md_sync_scroll' => 'ซิงค์การเลื่อนหน้าตัวอย่าง',
+    'pages_md_plain_editor' => 'ตัวแก้ไขข้อความธรรมดา',
+    'pages_drawing_unsaved' => 'พบภาพวาดที่ยังไม่บันทึก',
+    'pages_drawing_unsaved_confirm' => 'พบข้อมูลภาพวาดที่ยังไม่บันทึกจากการบันทึกที่ล้มเหลวก่อนหน้า ต้องการกู้คืนและแก้ไขภาพวาดที่ยังไม่บันทึกนี้ต่อหรือไม่?',
+    'pages_not_in_chapter' => 'หน้านี้ไม่ได้อยู่ในบท',
+    'pages_move' => 'ย้ายหน้า',
+    'pages_copy' => 'คัดลอกหน้า',
+    'pages_copy_desination' => 'ปลายทางการคัดลอก',
+    'pages_copy_success' => 'คัดลอกหน้าสำเร็จแล้ว',
+    'pages_permissions' => 'สิทธิ์หน้า',
+    'pages_permissions_success' => 'อัปเดตสิทธิ์หน้าแล้ว',
+    'pages_revision' => 'การแก้ไข',
+    'pages_revisions' => 'การแก้ไขหน้า',
+    'pages_revisions_desc' => 'แสดงรายการการแก้ไขทั้งหมดของหน้านี้ คุณสามารถดูย้อนหลัง เปรียบเทียบ และกู้คืนเวอร์ชันเก่าได้หากมีสิทธิ์ ประวัติทั้งหมดอาจไม่แสดงครบเนื่องจากการตั้งค่าระบบอาจลบการแก้ไขเก่าโดยอัตโนมัติ',
+    'pages_revisions_named' => 'การแก้ไขหน้าสำหรับ :pageName',
+    'pages_revision_named' => 'การแก้ไขหน้าสำหรับ :pageName',
+    'pages_revision_restored_from' => 'กู้คืนจาก #:id; :summary',
+    'pages_revisions_created_by' => 'สร้างโดย',
+    'pages_revisions_date' => 'วันที่แก้ไข',
+    'pages_revisions_number' => '#',
+    'pages_revisions_sort_number' => 'หมายเลขการแก้ไข',
+    'pages_revisions_numbered' => 'การแก้ไข #:id',
+    'pages_revisions_numbered_changes' => 'การเปลี่ยนแปลงในการแก้ไข #:id',
+    'pages_revisions_editor' => 'ประเภทตัวแก้ไข',
+    'pages_revisions_changelog' => 'Changelog',
+    'pages_revisions_changes' => 'การเปลี่ยนแปลง',
+    'pages_revisions_current' => 'เวอร์ชันปัจจุบัน',
+    'pages_revisions_preview' => 'ดูตัวอย่าง',
+    'pages_revisions_restore' => 'กู้คืน',
+    'pages_revisions_none' => 'หน้านี้ยังไม่มีการแก้ไข',
+    'pages_copy_link' => 'คัดลอกลิงก์',
+    'pages_edit_content_link' => 'ข้ามไปยังส่วนในตัวแก้ไข',
+    'pages_pointer_enter_mode' => 'เข้าสู่โหมดเลือกส่วน',
+    'pages_pointer_label' => 'ตัวเลือกส่วนหน้า',
+    'pages_pointer_permalink' => 'ลิงก์ถาวรส่วนหน้า',
+    'pages_pointer_include_tag' => 'แท็กรวมส่วนหน้า',
+    'pages_pointer_toggle_link' => 'โหมดลิงก์ถาวร กดเพื่อแสดงแท็กรวม',
+    'pages_pointer_toggle_include' => 'โหมดแท็กรวม กดเพื่อแสดงลิงก์ถาวร',
+    'pages_permissions_active' => 'สิทธิ์หน้าเปิดใช้งานอยู่',
+    'pages_initial_revision' => 'เผยแพร่ครั้งแรก',
+    'pages_references_update_revision' => 'ระบบอัปเดตลิงก์ภายในอัตโนมัติ',
+    'pages_initial_name' => 'หน้าใหม่',
+    'pages_editing_draft_notification' => 'คุณกำลังแก้ไขร่างที่บันทึกล่าสุดเมื่อ :timeDiff',
+    'pages_draft_edited_notification' => 'หน้านี้ได้รับการอัปเดตตั้งแต่นั้นมา แนะนำให้ยกเลิกร่างนี้',
+    'pages_draft_page_changed_since_creation' => 'หน้านี้ได้รับการอัปเดตตั้งแต่สร้างร่างนี้ แนะนำให้ยกเลิกร่างหรือระมัดระวังไม่ให้เขียนทับการเปลี่ยนแปลงของหน้า',
+    'pages_draft_edit_active' => [
+        'start_a' => 'มีผู้ใช้ :count คนกำลังแก้ไขหน้านี้',
+        'start_b' => ':userName กำลังแก้ไขหน้านี้',
+        'time_a' => 'ตั้งแต่อัปเดตหน้าล่าสุด',
+        'time_b' => 'ใน :minCount นาทีที่ผ่านมา',
+        'message' => ':start :time โปรดระวังอย่าเขียนทับการแก้ไขของกันและกัน!',
+    ],
+    'pages_draft_discarded' => 'ยกเลิกร่างแล้ว! ตัวแก้ไขได้รับการอัปเดตด้วยเนื้อหาปัจจุบันของหน้า',
+    'pages_draft_deleted' => 'ลบร่างแล้ว! ตัวแก้ไขได้รับการอัปเดตด้วยเนื้อหาปัจจุบันของหน้า',
+    'pages_specific' => 'หน้าเฉพาะ',
+    'pages_is_template' => 'แม่แบบหน้า',
+
+    // Editor Sidebar
+    'toggle_sidebar' => 'แสดง/ซ่อนแถบด้านข้าง',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
+    'page_tags' => 'แท็กหน้า',
+    'chapter_tags' => 'แท็กบท',
+    'book_tags' => 'แท็กหนังสือ',
+    'shelf_tags' => 'แท็กชั้นวาง',
+    'tag' => 'แท็ก',
+    'tags' =>  'แท็ก',
+    'tags_index_desc' => 'แท็กสามารถนำไปใช้กับเนื้อหาในระบบเพื่อจัดหมวดหมู่แบบยืดหยุ่น แท็กสามารถมีทั้งคีย์และค่า โดยค่าไม่บังคับ เมื่อกำหนดแล้ว สามารถค้นหาเนื้อหาด้วยชื่อและค่าของแท็กได้',
+    'tag_name' =>  'ชื่อแท็ก',
+    'tag_value' => 'ค่าแท็ก (ไม่บังคับ)',
+    'tags_explain' => "เพิ่มแท็กเพื่อจัดหมวดหมู่เนื้อหาให้ดีขึ้น \n คุณสามารถกำหนดค่าให้แท็กเพื่อการจัดระเบียบที่ละเอียดขึ้น",
+    'tags_add' => 'เพิ่มแท็ก',
+    'tags_remove' => 'ลบแท็กนี้',
+    'tags_usages' => 'การใช้งานแท็กทั้งหมด',
+    'tags_assigned_pages' => 'กำหนดให้หน้า',
+    'tags_assigned_chapters' => 'กำหนดให้บท',
+    'tags_assigned_books' => 'กำหนดให้หนังสือ',
+    'tags_assigned_shelves' => 'กำหนดให้ชั้นวาง',
+    'tags_x_unique_values' => ':count ค่าที่ไม่ซ้ำ',
+    'tags_all_values' => 'ค่าทั้งหมด',
+    'tags_view_tags' => 'ดูแท็ก',
+    'tags_view_existing_tags' => 'ดูแท็กที่มีอยู่',
+    'tags_list_empty_hint' => 'แท็กสามารถกำหนดได้ผ่านแถบด้านข้างของตัวแก้ไขหน้า หรือขณะแก้ไขรายละเอียดของหนังสือ บท หรือชั้นวาง',
+    'attachments' => 'ไฟล์แนบ',
+    'attachments_explain' => 'อัปโหลดไฟล์หรือแนบลิงก์เพื่อแสดงในหน้านี้ จะมองเห็นได้ในแถบด้านข้างของหน้า',
+    'attachments_explain_instant_save' => 'การเปลี่ยนแปลงที่นี่จะบันทึกทันที',
+    'attachments_upload' => 'อัปโหลดไฟล์',
+    'attachments_link' => 'แนบลิงก์',
+    'attachments_upload_drop' => 'หรือคุณสามารถลากและวางไฟล์ที่นี่เพื่ออัปโหลดเป็นไฟล์แนบ',
+    'attachments_set_link' => 'ตั้งค่าลิงก์',
+    'attachments_delete' => 'คุณแน่ใจหรือไม่ว่าต้องการลบไฟล์แนบนี้?',
+    'attachments_dropzone' => 'วางไฟล์ที่นี่เพื่ออัปโหลด',
+    'attachments_no_files' => 'ยังไม่มีไฟล์ที่อัปโหลด',
+    'attachments_explain_link' => 'คุณสามารถแนบลิงก์แทนการอัปโหลดไฟล์ได้ ลิงก์อาจเป็นลิงก์ไปยังหน้าอื่นหรือไฟล์ในคลาวด์',
+    'attachments_link_name' => 'ชื่อลิงก์',
+    'attachment_link' => 'ลิงก์ไฟล์แนบ',
+    'attachments_link_url' => 'ลิงก์ไปยังไฟล์',
+    'attachments_link_url_hint' => 'URL ของเว็บไซต์หรือไฟล์',
+    'attach' => 'แนบ',
+    'attachments_insert_link' => 'เพิ่มลิงก์ไฟล์แนบในหน้า',
+    'attachments_edit_file' => 'แก้ไขไฟล์',
+    'attachments_edit_file_name' => 'ชื่อไฟล์',
+    'attachments_edit_drop_upload' => 'วางไฟล์หรือคลิกที่นี่เพื่ออัปโหลดและแทนที่',
+    'attachments_order_updated' => 'อัปเดตลำดับไฟล์แนบแล้ว',
+    'attachments_updated_success' => 'อัปเดตรายละเอียดไฟล์แนบแล้ว',
+    'attachments_deleted' => 'ลบไฟล์แนบแล้ว',
+    'attachments_file_uploaded' => 'อัปโหลดไฟล์สำเร็จแล้ว',
+    'attachments_file_updated' => 'อัปเดตไฟล์สำเร็จแล้ว',
+    'attachments_link_attached' => 'แนบลิงก์ไปยังหน้าสำเร็จแล้ว',
+    'templates' => 'แม่แบบ',
+    'templates_set_as_template' => 'หน้านี้เป็นแม่แบบ',
+    'templates_explain_set_as_template' => 'คุณสามารถตั้งหน้านี้เป็นแม่แบบเพื่อให้นำเนื้อหาไปใช้เมื่อสร้างหน้าอื่น ผู้ใช้อื่นจะสามารถใช้แม่แบบนี้ได้หากมีสิทธิ์ดูหน้านี้',
+    'templates_replace_content' => 'แทนที่เนื้อหาหน้า',
+    'templates_append_content' => 'ต่อท้ายเนื้อหาหน้า',
+    'templates_prepend_content' => 'เพิ่มก่อนเนื้อหาหน้า',
+
+    // Profile View
+    'profile_user_for_x' => 'ผู้ใช้มาแล้ว :time',
+    'profile_created_content' => 'เนื้อหาที่สร้าง',
+    'profile_not_created_pages' => ':userName ยังไม่ได้สร้างหน้าใด',
+    'profile_not_created_chapters' => ':userName ยังไม่ได้สร้างบทใด',
+    'profile_not_created_books' => ':userName ยังไม่ได้สร้างหนังสือใด',
+    'profile_not_created_shelves' => ':userName ยังไม่ได้สร้างชั้นวางใด',
+
+    // Comments
+    'comment' => 'ความคิดเห็น',
+    'comments' => 'ความคิดเห็น',
+    'comment_add' => 'เพิ่มความคิดเห็น',
+    'comment_none' => 'ไม่มีความคิดเห็น',
+    'comment_placeholder' => 'เขียนความคิดเห็นที่นี่',
+    'comment_thread_count' => ':count เธรดความคิดเห็น',
+    'comment_archived_count' => ':count ที่เก็บถาวร',
+    'comment_archived_threads' => 'เธรดที่เก็บถาวร',
+    'comment_save' => 'บันทึกความคิดเห็น',
+    'comment_new' => 'ความคิดเห็นใหม่',
+    'comment_created' => 'แสดงความคิดเห็นเมื่อ :createDiff',
+    'comment_updated' => 'แก้ไขเมื่อ :updateDiff โดย :username',
+    'comment_updated_indicator' => 'แก้ไขแล้ว',
+    'comment_deleted_success' => 'ลบความคิดเห็นแล้ว',
+    'comment_created_success' => 'เพิ่มความคิดเห็นแล้ว',
+    'comment_updated_success' => 'แก้ไขความคิดเห็นแล้ว',
+    'comment_archive_success' => 'เก็บถาวรความคิดเห็นแล้ว',
+    'comment_unarchive_success' => 'ยกเลิกการเก็บถาวรความคิดเห็นแล้ว',
+    'comment_view' => 'ดูความคิดเห็น',
+    'comment_jump_to_thread' => 'ไปยังเธรด',
+    'comment_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบความคิดเห็นนี้?',
+    'comment_in_reply_to' => 'ตอบกลับ :commentId',
+    'comment_reference' => 'อ้างอิง',
+    'comment_reference_outdated' => '(ล้าสมัย)',
+    'comment_editor_explain' => 'แสดงความคิดเห็นที่มีในหน้านี้ สามารถเพิ่มและจัดการความคิดเห็นได้เมื่อดูหน้าที่บันทึกแล้ว',
+
+    // Revision
+    'revision_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบการแก้ไขนี้?',
+    'revision_restore_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการกู้คืนการแก้ไขนี้? เนื้อหาปัจจุบันของหน้าจะถูกแทนที่',
+    'revision_cannot_delete_latest' => 'ไม่สามารถลบการแก้ไขล่าสุดได้',
+
+    // Copy view
+    'copy_consider' => 'โปรดพิจารณาสิ่งต่อไปนี้เมื่อคัดลอกเนื้อหา',
+    'copy_consider_permissions' => 'การตั้งค่าสิทธิ์แบบกำหนดเองจะไม่ถูกคัดลอก',
+    'copy_consider_owner' => 'คุณจะเป็นเจ้าของเนื้อหาที่คัดลอกทั้งหมด',
+    'copy_consider_images' => 'ไฟล์รูปภาพในหน้าจะไม่ถูกทำสำเนา และรูปภาพต้นฉบับจะยังคงเชื่อมกับหน้าที่อัปโหลดไว้เดิม',
+    'copy_consider_attachments' => 'ไฟล์แนบในหน้าจะไม่ถูกคัดลอก',
+    'copy_consider_access' => 'การเปลี่ยนตำแหน่ง เจ้าของ หรือสิทธิ์อาจทำให้เนื้อหานี้เข้าถึงได้โดยผู้ที่ไม่เคยมีสิทธิ์มาก่อน',
+
+    // Conversions
+    'convert_to_shelf' => 'แปลงเป็นชั้นวาง',
+    'convert_to_shelf_contents_desc' => 'คุณสามารถแปลงหนังสือนี้เป็นชั้นวางใหม่ที่มีเนื้อหาเดิม บทในหนังสือนี้จะถูกแปลงเป็นหนังสือใหม่ หากหนังสือนี้มีหน้าที่ไม่อยู่ในบท หนังสือนี้จะถูกเปลี่ยนชื่อและเก็บหน้าเหล่านั้น และจะกลายเป็นส่วนหนึ่งของชั้นวางใหม่',
+    'convert_to_shelf_permissions_desc' => 'สิทธิ์ที่กำหนดบนหนังสือนี้จะถูกคัดลอกไปยังชั้นวางใหม่และหนังสือลูกทั้งหมดที่ไม่มีสิทธิ์ของตัวเอง โปรดทราบว่าสิทธิ์บนชั้นวางไม่ส่งต่อไปยังเนื้อหาภายในโดยอัตโนมัติเหมือนกับหนังสือ',
+    'convert_book' => 'แปลงหนังสือ',
+    'convert_book_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการแปลงหนังสือนี้?',
+    'convert_undo_warning' => 'การดำเนินการนี้ยากที่จะยกเลิก',
+    'convert_to_book' => 'แปลงเป็นหนังสือ',
+    'convert_to_book_desc' => 'คุณสามารถแปลงบทนี้เป็นหนังสือใหม่ที่มีเนื้อหาเดิม สิทธิ์ที่กำหนดบนบทนี้จะถูกคัดลอกไปยังหนังสือใหม่ แต่สิทธิ์ที่รับมาจากหนังสือแม่จะไม่ถูกคัดลอก ซึ่งอาจทำให้การควบคุมการเข้าถึงเปลี่ยนแปลงได้',
+    'convert_chapter' => 'แปลงบท',
+    'convert_chapter_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการแปลงบทนี้?',
+
+    // References
+    'references' => 'การอ้างอิง',
+    'references_none' => 'ยังไม่มีการอ้างอิงที่ติดตามไปยังรายการนี้',
+    'references_to_desc' => 'แสดงรายการเนื้อหาทั้งหมดในระบบที่ลิงก์ไปยังรายการนี้',
+
+    // Watch Options
+    'watch' => 'ติดตาม',
+    'watch_title_default' => 'การตั้งค่าเริ่มต้น',
+    'watch_desc_default' => 'กลับไปใช้การตั้งค่าการแจ้งเตือนเริ่มต้นของคุณ',
+    'watch_title_ignore' => 'ไม่สนใจ',
+    'watch_desc_ignore' => 'ไม่รับการแจ้งเตือนใดๆ รวมถึงจากการตั้งค่าระดับผู้ใช้',
+    'watch_title_new' => 'หน้าใหม่',
+    'watch_desc_new' => 'แจ้งเตือนเมื่อมีการสร้างหน้าใหม่ในรายการนี้',
+    'watch_title_updates' => 'การอัปเดตหน้าทั้งหมด',
+    'watch_desc_updates' => 'แจ้งเตือนเมื่อมีหน้าใหม่และการแก้ไขหน้า',
+    'watch_desc_updates_page' => 'แจ้งเตือนเมื่อมีการแก้ไขหน้า',
+    'watch_title_comments' => 'การอัปเดตและความคิดเห็นทั้งหมด',
+    'watch_desc_comments' => 'แจ้งเตือนเมื่อมีหน้าใหม่ การแก้ไขหน้า และความคิดเห็นใหม่',
+    'watch_desc_comments_page' => 'แจ้งเตือนเมื่อมีการแก้ไขหน้าและความคิดเห็นใหม่',
+    'watch_change_default' => 'เปลี่ยนการตั้งค่าการแจ้งเตือนเริ่มต้น',
+    'watch_detail_ignore' => 'ไม่รับการแจ้งเตือน',
+    'watch_detail_new' => 'ติดตามหน้าใหม่',
+    'watch_detail_updates' => 'ติดตามหน้าใหม่และการอัปเดต',
+    'watch_detail_comments' => 'ติดตามหน้าใหม่ การอัปเดต และความคิดเห็น',
+    'watch_detail_parent_book' => 'ติดตามผ่านหนังสือแม่',
+    'watch_detail_parent_book_ignore' => 'ไม่รับการแจ้งเตือนผ่านหนังสือแม่',
+    'watch_detail_parent_chapter' => 'ติดตามผ่านบทแม่',
+    'watch_detail_parent_chapter_ignore' => 'ไม่รับการแจ้งเตือนผ่านบทแม่',
+];
diff --git a/lang/th/errors.php b/lang/th/errors.php
new file mode 100644
index 00000000000..61f1ed82c76
--- /dev/null
+++ b/lang/th/errors.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Text shown in error messaging.
+ */
+return [
+
+    // Permissions
+    'permission' => 'คุณไม่มีสิทธิ์เข้าถึงหน้าที่ร้องขอ',
+    'permissionJson' => 'คุณไม่มีสิทธิ์ดำเนินการที่ร้องขอ',
+
+    // Auth
+    'error_user_exists_different_creds' => 'มีผู้ใช้ที่ใช้อีเมล :email อยู่แล้วแต่ใช้ข้อมูลประจำตัวต่างกัน',
+    'auth_pre_register_theme_prevention' => 'ไม่สามารถลงทะเบียนบัญชีผู้ใช้สำหรับข้อมูลที่ให้มาได้',
+    'email_already_confirmed' => 'ยืนยันอีเมลแล้ว กรุณาลองเข้าสู่ระบบ',
+    'email_confirmation_invalid' => 'โทเค็นยืนยันนี้ไม่ถูกต้องหรือถูกใช้ไปแล้ว กรุณาลองลงทะเบียนใหม่',
+    'email_confirmation_expired' => 'โทเค็นยืนยันหมดอายุแล้ว ส่งอีเมลยืนยันใหม่ให้แล้ว',
+    'email_confirmation_awaiting' => 'ที่อยู่อีเมลของบัญชีที่ใช้งานอยู่ต้องได้รับการยืนยัน',
+    'ldap_fail_anonymous' => 'การเข้าถึง LDAP ล้มเหลวโดยใช้การเชื่อมต่อแบบไม่ระบุตัวตน',
+    'ldap_fail_authed' => 'การเข้าถึง LDAP ล้มเหลวโดยใช้ข้อมูล dn และรหัสผ่านที่กำหนด',
+    'ldap_extension_not_installed' => 'ไม่ได้ติดตั้ง PHP extension สำหรับ LDAP',
+    'ldap_cannot_connect' => 'ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ LDAP ได้ การเชื่อมต่อเริ่มต้นล้มเหลว',
+    'saml_already_logged_in' => 'เข้าสู่ระบบแล้ว',
+    'saml_no_email_address' => 'ไม่พบที่อยู่อีเมลสำหรับผู้ใช้นี้ในข้อมูลที่ระบบยืนยันตัวตนภายนอกส่งมา',
+    'saml_invalid_response_id' => 'คำขอจากระบบยืนยันตัวตนภายนอกไม่ได้รับการยอมรับจากกระบวนการที่เริ่มต้นโดยแอปพลิเคชันนี้ การนำทางย้อนกลับหลังเข้าสู่ระบบอาจทำให้เกิดปัญหานี้',
+    'saml_fail_authed' => 'การเข้าสู่ระบบด้วย :system ล้มเหลว ระบบไม่ได้ให้การอนุญาตที่สำเร็จ',
+    'oidc_already_logged_in' => 'เข้าสู่ระบบแล้ว',
+    'oidc_no_email_address' => 'ไม่พบที่อยู่อีเมลสำหรับผู้ใช้นี้ในข้อมูลที่ระบบยืนยันตัวตนภายนอกส่งมา',
+    'oidc_fail_authed' => 'การเข้าสู่ระบบด้วย :system ล้มเหลว ระบบไม่ได้ให้การอนุญาตที่สำเร็จ',
+    'social_no_action_defined' => 'ไม่ได้กำหนดการดำเนินการ',
+    'social_login_bad_response' => "เกิดข้อผิดพลาดระหว่างเข้าสู่ระบบด้วย :socialAccount: \n:error",
+    'social_account_in_use' => 'บัญชี :socialAccount นี้ถูกใช้งานแล้ว ลองเข้าสู่ระบบผ่านตัวเลือก :socialAccount',
+    'social_account_email_in_use' => 'อีเมล :email ถูกใช้งานแล้ว หากมีบัญชีอยู่แล้ว คุณสามารถเชื่อมต่อบัญชี :socialAccount จากการตั้งค่าโปรไฟล์ได้',
+    'social_account_existing' => ':socialAccount นี้เชื่อมต่อกับโปรไฟล์ของคุณแล้ว',
+    'social_account_already_used_existing' => 'บัญชี :socialAccount นี้ถูกใช้งานโดยผู้ใช้อื่นแล้ว',
+    'social_account_not_used' => 'บัญชี :socialAccount นี้ไม่ได้เชื่อมต่อกับผู้ใช้ใด กรุณาแนบในการตั้งค่าโปรไฟล์',
+    'social_account_register_instructions' => 'หากยังไม่มีบัญชี คุณสามารถลงทะเบียนโดยใช้ตัวเลือก :socialAccount',
+    'social_driver_not_found' => 'ไม่พบ Social driver',
+    'social_driver_not_configured' => 'การตั้งค่า Social ของ :socialAccount ไม่ถูกต้อง',
+    'invite_token_expired' => 'ลิงก์เชิญนี้หมดอายุแล้ว คุณสามารถลองรีเซ็ตรหัสผ่านบัญชีแทนได้',
+    'login_user_not_found' => 'ไม่พบผู้ใช้สำหรับการดำเนินการนี้',
+
+    // System
+    'path_not_writable' => 'ไม่สามารถอัปโหลดไปยังพาธ :filePath ได้ โปรดตรวจสอบว่าเซิร์ฟเวอร์มีสิทธิ์เขียนได้',
+    'cannot_get_image_from_url' => 'ไม่สามารถดึงรูปภาพจาก :url ได้',
+    'cannot_create_thumbs' => 'เซิร์ฟเวอร์ไม่สามารถสร้างภาพย่อได้ โปรดตรวจสอบว่าติดตั้ง PHP extension GD แล้ว',
+    'server_upload_limit' => 'เซิร์ฟเวอร์ไม่อนุญาตให้อัปโหลดไฟล์ขนาดนี้ กรุณาลองใช้ไฟล์ขนาดเล็กกว่า',
+    'server_post_limit' => 'เซิร์ฟเวอร์ไม่สามารถรับข้อมูลในปริมาณที่กำหนดได้ ลองใหม่ด้วยข้อมูลน้อยลงหรือไฟล์ขนาดเล็กกว่า',
+    'uploaded'  => 'เซิร์ฟเวอร์ไม่อนุญาตให้อัปโหลดไฟล์ขนาดนี้ กรุณาลองใช้ไฟล์ขนาดเล็กกว่า',
+
+    // Drawing & Images
+    'image_upload_error' => 'เกิดข้อผิดพลาดขณะอัปโหลดรูปภาพ',
+    'image_upload_type_error' => 'ประเภทรูปภาพที่อัปโหลดไม่ถูกต้อง',
+    'image_upload_replace_type' => 'การแทนที่ไฟล์รูปภาพต้องใช้ประเภทเดียวกัน',
+    'image_upload_memory_limit' => 'ไม่สามารถจัดการการอัปโหลดรูปภาพและ/หรือสร้างภาพย่อได้เนื่องจากทรัพยากรระบบไม่เพียงพอ',
+    'image_thumbnail_memory_limit' => 'ไม่สามารถสร้างขนาดรูปภาพต่างๆ ได้เนื่องจากทรัพยากรระบบไม่เพียงพอ',
+    'image_gallery_thumbnail_memory_limit' => 'ไม่สามารถสร้างภาพย่อแกลเลอรีได้เนื่องจากทรัพยากรระบบไม่เพียงพอ',
+    'drawing_data_not_found' => 'ไม่สามารถโหลดข้อมูลภาพวาดได้ ไฟล์ภาพวาดอาจไม่มีอยู่แล้วหรือคุณไม่มีสิทธิ์เข้าถึง',
+
+    // Attachments
+    'attachment_not_found' => 'ไม่พบไฟล์แนบ',
+    'attachment_upload_error' => 'เกิดข้อผิดพลาดขณะอัปโหลดไฟล์แนบ',
+
+    // Pages
+    'page_draft_autosave_fail' => 'บันทึกร่างล้มเหลว โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตก่อนบันทึกหน้านี้',
+    'page_draft_delete_fail' => 'ลบร่างหน้าและดึงเนื้อหาที่บันทึกปัจจุบันล้มเหลว',
+    'page_custom_home_deletion' => 'ไม่สามารถลบหน้าได้ในขณะที่ตั้งเป็นหน้าแรก',
+
+    // Entities
+    'entity_not_found' => 'ไม่พบรายการ',
+    'bookshelf_not_found' => 'ไม่พบชั้นวาง',
+    'book_not_found' => 'ไม่พบหนังสือ',
+    'page_not_found' => 'ไม่พบหน้า',
+    'chapter_not_found' => 'ไม่พบบท',
+    'selected_book_not_found' => 'ไม่พบหนังสือที่เลือก',
+    'selected_book_chapter_not_found' => 'ไม่พบหนังสือหรือบทที่เลือก',
+    'guests_cannot_save_drafts' => 'ผู้เยี่ยมชมไม่สามารถบันทึกร่างได้',
+
+    // Users
+    'users_cannot_delete_only_admin' => 'ไม่สามารถลบผู้ดูแลระบบคนเดียวได้',
+    'users_cannot_delete_guest' => 'ไม่สามารถลบผู้ใช้แบบผู้เยี่ยมชมได้',
+    'users_could_not_send_invite' => 'ไม่สามารถสร้างผู้ใช้ได้เนื่องจากส่งอีเมลเชิญล้มเหลว',
+
+    // Roles
+    'role_cannot_be_edited' => 'บทบาทนี้ไม่สามารถแก้ไขได้',
+    'role_system_cannot_be_deleted' => 'บทบาทนี้เป็นบทบาทระบบและไม่สามารถลบได้',
+    'role_registration_default_cannot_delete' => 'บทบาทนี้ไม่สามารถลบได้ในขณะที่ตั้งเป็นบทบาทลงทะเบียนเริ่มต้น',
+    'role_cannot_remove_only_admin' => 'ผู้ใช้นี้เป็นผู้ใช้คนเดียวที่ได้รับบทบาทผู้ดูแลระบบ กรุณากำหนดบทบาทผู้ดูแลระบบให้ผู้ใช้อื่นก่อนที่จะลบออกที่นี่',
+
+    // Comments
+    'comment_list' => 'เกิดข้อผิดพลาดขณะดึงความคิดเห็น',
+    'cannot_add_comment_to_draft' => 'ไม่สามารถเพิ่มความคิดเห็นในร่างได้',
+    'comment_add' => 'เกิดข้อผิดพลาดขณะเพิ่ม/อัปเดตความคิดเห็น',
+    'comment_delete' => 'เกิดข้อผิดพลาดขณะลบความคิดเห็น',
+    'empty_comment' => 'ไม่สามารถเพิ่มความคิดเห็นที่ว่างเปล่าได้',
+
+    // Error pages
+    '404_page_not_found' => 'ไม่พบหน้า',
+    'sorry_page_not_found' => 'ขออภัย ไม่พบหน้าที่คุณกำลังมองหา',
+    'sorry_page_not_found_permission_warning' => 'หากคุณคาดว่าหน้านี้มีอยู่ คุณอาจไม่มีสิทธิ์ดูหน้านี้',
+    'image_not_found' => 'ไม่พบรูปภาพ',
+    'image_not_found_subtitle' => 'ขออภัย ไม่พบไฟล์รูปภาพที่คุณกำลังมองหา',
+    'image_not_found_details' => 'หากคุณคาดว่ารูปภาพนี้มีอยู่ อาจถูกลบไปแล้ว',
+    'return_home' => 'กลับไปหน้าแรก',
+    'error_occurred' => 'เกิดข้อผิดพลาด',
+    'app_down' => ':appName ไม่พร้อมใช้งานในขณะนี้',
+    'back_soon' => 'จะกลับมาให้บริการเร็วๆ นี้',
+
+    // Import
+    'import_zip_cant_read' => 'ไม่สามารถอ่านไฟล์ ZIP ได้',
+    'import_zip_cant_decode_data' => 'ไม่สามารถค้นหาและถอดรหัสเนื้อหา data.json ใน ZIP ได้',
+    'import_zip_no_data' => 'ข้อมูลในไฟล์ ZIP ไม่มีเนื้อหาหนังสือ บท หรือหน้าที่คาดไว้',
+    'import_zip_data_too_large' => 'เนื้อหา data.json ใน ZIP เกินขนาดอัปโหลดสูงสุดที่กำหนดในแอปพลิเคชัน',
+    'import_validation_failed' => 'ตรวจสอบ ZIP นำเข้าล้มเหลวพร้อมข้อผิดพลาด:',
+    'import_zip_failed_notification' => 'นำเข้าไฟล์ ZIP ล้มเหลว',
+    'import_perms_books' => 'คุณขาดสิทธิ์ที่จำเป็นในการสร้างหนังสือ',
+    'import_perms_chapters' => 'คุณขาดสิทธิ์ที่จำเป็นในการสร้างบท',
+    'import_perms_pages' => 'คุณขาดสิทธิ์ที่จำเป็นในการสร้างหน้า',
+    'import_perms_images' => 'คุณขาดสิทธิ์ที่จำเป็นในการสร้างรูปภาพ',
+    'import_perms_attachments' => 'คุณขาดสิทธิ์ที่จำเป็นในการสร้างไฟล์แนบ',
+
+    // API errors
+    'api_no_authorization_found' => 'ไม่พบโทเค็นการอนุญาตในคำขอ',
+    'api_bad_authorization_format' => 'พบโทเค็นการอนุญาตในคำขอแต่รูปแบบดูเหมือนไม่ถูกต้อง',
+    'api_user_token_not_found' => 'ไม่พบ API token ที่ตรงกับโทเค็นการอนุญาตที่ให้มา',
+    'api_incorrect_token_secret' => 'รหัสลับที่ให้มาสำหรับ API token ที่ใช้ไม่ถูกต้อง',
+    'api_user_no_api_permission' => 'เจ้าของ API token ที่ใช้ไม่มีสิทธิ์เรียกใช้ API',
+    'api_user_token_expired' => 'โทเค็นการอนุญาตที่ใช้หมดอายุแล้ว',
+    'api_cookie_auth_only_get' => 'อนุญาตเฉพาะคำขอ GET เมื่อใช้ API ด้วยการยืนยันตัวตนแบบ cookie',
+
+    // Settings & Maintenance
+    'maintenance_test_email_failure' => 'เกิดข้อผิดพลาดขณะส่งอีเมลทดสอบ:',
+
+    // HTTP errors
+    'http_ssr_url_no_match' => 'URL ไม่ตรงกับโฮสต์ SSR ที่อนุญาตที่กำหนดค่าไว้',
+];
diff --git a/lang/th/notifications.php b/lang/th/notifications.php
new file mode 100644
index 00000000000..661c83fdb25
--- /dev/null
+++ b/lang/th/notifications.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Text used for activity-based notifications.
+ */
+return [
+
+    'new_comment_subject' => 'ความคิดเห็นใหม่ในหน้า: :pageName',
+    'new_comment_intro' => 'มีผู้ใช้แสดงความคิดเห็นในหน้าใน :appName:',
+    'new_page_subject' => 'หน้าใหม่: :pageName',
+    'new_page_intro' => 'มีการสร้างหน้าใหม่ใน :appName:',
+    'updated_page_subject' => 'แก้ไขหน้า: :pageName',
+    'updated_page_intro' => 'มีการแก้ไขหน้าใน :appName:',
+    'updated_page_debounce' => 'เพื่อป้องกันการแจ้งเตือนจำนวนมาก คุณจะไม่ได้รับการแจ้งเตือนสำหรับการแก้ไขเพิ่มเติมในหน้านี้โดยผู้แก้ไขคนเดิมในช่วงเวลาหนึ่ง',
+    'comment_mention_subject' => 'คุณถูกกล่าวถึงในความคิดเห็นในหน้า: :pageName',
+    'comment_mention_intro' => 'คุณถูกกล่าวถึงในความคิดเห็นใน :appName:',
+
+    'detail_page_name' => 'ชื่อหน้า:',
+    'detail_page_path' => 'พาธหน้า:',
+    'detail_commenter' => 'ผู้แสดงความคิดเห็น:',
+    'detail_comment' => 'ความคิดเห็น:',
+    'detail_created_by' => 'สร้างโดย:',
+    'detail_updated_by' => 'แก้ไขโดย:',
+
+    'action_view_comment' => 'ดูความคิดเห็น',
+    'action_view_page' => 'ดูหน้า',
+
+    'footer_reason' => 'คุณได้รับการแจ้งเตือนนี้เพราะ :link ครอบคลุมกิจกรรมประเภทนี้สำหรับรายการนี้',
+    'footer_reason_link' => 'การตั้งค่าการแจ้งเตือนของคุณ',
+];
diff --git a/lang/th/pagination.php b/lang/th/pagination.php
new file mode 100644
index 00000000000..c29e7d0d9ce
--- /dev/null
+++ b/lang/th/pagination.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Pagination Language Lines
+ * The following language lines are used by the paginator library to build
+ * the simple pagination links.
+ */
+return [
+
+    'previous' => '&laquo; ก่อนหน้า',
+    'next'     => 'ถัดไป &raquo;',
+
+];
diff --git a/lang/th/passwords.php b/lang/th/passwords.php
new file mode 100644
index 00000000000..3429c776394
--- /dev/null
+++ b/lang/th/passwords.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Password Reminder Language Lines
+ * The following language lines are the default lines which match reasons
+ * that are given by the password broker for a password update attempt has failed.
+ */
+return [
+
+    'password' => 'รหัสผ่านต้องมีอย่างน้อยแปดตัวอักษรและต้องตรงกับการยืนยัน',
+    'user' => "ไม่พบผู้ใช้ที่ใช้ที่อยู่อีเมลนี้",
+    'token' => 'โทเค็นรีเซ็ตรหัสผ่านไม่ถูกต้องสำหรับที่อยู่อีเมลนี้',
+    'sent' => 'ส่งลิงก์รีเซ็ตรหัสผ่านไปยังอีเมลของคุณแล้ว!',
+    'reset' => 'รีเซ็ตรหัสผ่านของคุณแล้ว!',
+
+];
diff --git a/lang/th/preferences.php b/lang/th/preferences.php
new file mode 100644
index 00000000000..41b761f73f3
--- /dev/null
+++ b/lang/th/preferences.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Text used for user-preference specific views within bookstack.
+ */
+
+return [
+    'my_account' => 'บัญชีของฉัน',
+
+    'shortcuts' => 'แป้นพิมพ์ลัด',
+    'shortcuts_interface' => 'การตั้งค่าแป้นพิมพ์ลัด UI',
+    'shortcuts_toggle_desc' => 'คุณสามารถเปิดหรือปิดแป้นพิมพ์ลัดของระบบที่ใช้สำหรับการนำทางและการดำเนินการได้ที่นี่',
+    'shortcuts_customize_desc' => 'คุณสามารถปรับแต่งแป้นพิมพ์ลัดแต่ละรายการด้านล่างได้ เพียงกดคีย์ผสมที่ต้องการหลังจากเลือกช่องป้อนข้อมูลสำหรับแป้นลัดนั้น',
+    'shortcuts_toggle_label' => 'เปิดใช้งานแป้นพิมพ์ลัด',
+    'shortcuts_section_navigation' => 'การนำทาง',
+    'shortcuts_section_actions' => 'การดำเนินการทั่วไป',
+    'shortcuts_save' => 'บันทึกแป้นพิมพ์ลัด',
+    'shortcuts_overlay_desc' => 'หมายเหตุ: เมื่อเปิดใช้งานแป้นพิมพ์ลัด จะมีแผงช่วยเหลือที่เข้าถึงได้โดยกด "?" ซึ่งจะแสดงแป้นพิมพ์ลัดที่ใช้ได้สำหรับการดำเนินการที่แสดงอยู่บนหน้าจอ',
+    'shortcuts_update_success' => 'อัปเดตการตั้งค่าแป้นพิมพ์ลัดแล้ว!',
+    'shortcuts_overview_desc' => 'จัดการแป้นพิมพ์ลัดที่ใช้นำทางในส่วนติดต่อผู้ใช้ของระบบ',
+
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
+    'notifications' => 'การตั้งค่าการแจ้งเตือน',
+    'notifications_desc' => 'ควบคุมการแจ้งเตือนทางอีเมลที่คุณได้รับเมื่อมีกิจกรรมบางอย่างในระบบ',
+    'notifications_opt_own_page_changes' => 'แจ้งเตือนเมื่อมีการเปลี่ยนแปลงหน้าที่ฉันเป็นเจ้าของ',
+    'notifications_opt_own_page_comments' => 'แจ้งเตือนเมื่อมีความคิดเห็นในหน้าที่ฉันเป็นเจ้าของ',
+    'notifications_opt_comment_mentions' => 'แจ้งเตือนเมื่อฉันถูกกล่าวถึงในความคิดเห็น',
+    'notifications_opt_comment_replies' => 'แจ้งเตือนเมื่อมีการตอบกลับความคิดเห็นของฉัน',
+    'notifications_save' => 'บันทึกการตั้งค่า',
+    'notifications_update_success' => 'อัปเดตการตั้งค่าการแจ้งเตือนแล้ว!',
+    'notifications_watched' => 'รายการที่ติดตามและไม่สนใจ',
+    'notifications_watched_desc' => 'รายการด้านล่างมีการตั้งค่าการติดตามแบบกำหนดเอง หากต้องการอัปเดตการตั้งค่า ให้ดูรายการนั้นแล้วค้นหาตัวเลือกการติดตามในแถบด้านข้าง',
+
+    'auth' => 'การเข้าถึงและความปลอดภัย',
+    'auth_change_password' => 'เปลี่ยนรหัสผ่าน',
+    'auth_change_password_desc' => 'เปลี่ยนรหัสผ่านที่ใช้เข้าสู่ระบบ ต้องมีความยาวอย่างน้อย 8 ตัวอักษร',
+    'auth_change_password_success' => 'อัปเดตรหัสผ่านแล้ว!',
+
+    'profile' => 'รายละเอียดโปรไฟล์',
+    'profile_desc' => 'จัดการรายละเอียดบัญชีที่แสดงตัวตนต่อผู้ใช้อื่น รวมถึงรายละเอียดที่ใช้สำหรับการสื่อสารและการปรับแต่งระบบ',
+    'profile_view_public' => 'ดูโปรไฟล์สาธารณะ',
+    'profile_name_desc' => 'กำหนดชื่อที่แสดงซึ่งจะมองเห็นได้โดยผู้ใช้อื่นในระบบผ่านกิจกรรมที่คุณดำเนินการและเนื้อหาที่คุณเป็นเจ้าของ',
+    'profile_email_desc' => 'อีเมลนี้จะใช้สำหรับการแจ้งเตือนและการเข้าถึงระบบขึ้นอยู่กับการยืนยันตัวตนที่ใช้งานอยู่',
+    'profile_email_no_permission' => 'ขออภัย คุณไม่มีสิทธิ์เปลี่ยนที่อยู่อีเมล หากต้องการเปลี่ยน กรุณาติดต่อผู้ดูแลระบบ',
+    'profile_avatar_desc' => 'เลือกรูปภาพที่จะใช้แสดงตัวตนต่อผู้อื่นในระบบ รูปภาพควรเป็นรูปสี่เหลี่ยมจัตุรัสขนาดประมาณ 256px',
+    'profile_admin_options' => 'ตัวเลือกสำหรับผู้ดูแลระบบ',
+    'profile_admin_options_desc' => 'ตัวเลือกระดับผู้ดูแลระบบเพิ่มเติม เช่น การจัดการการกำหนดบทบาท สามารถพบได้ในพื้นที่ "การตั้งค่า > ผู้ใช้" ของแอปพลิเคชัน',
+
+    'delete_account' => 'ลบบัญชี',
+    'delete_my_account' => 'ลบบัญชีของฉัน',
+    'delete_my_account_desc' => 'การดำเนินการนี้จะลบบัญชีผู้ใช้ของคุณออกจากระบบทั้งหมด คุณจะไม่สามารถกู้คืนบัญชีหรือยกเลิกการดำเนินการนี้ได้ เนื้อหาที่คุณสร้าง เช่น หน้าที่สร้างและรูปภาพที่อัปโหลด จะยังคงอยู่',
+    'delete_my_account_warning' => 'คุณแน่ใจหรือไม่ว่าต้องการลบบัญชีของคุณ?',
+];
diff --git a/lang/th/settings.php b/lang/th/settings.php
new file mode 100644
index 00000000000..a4e94af4e48
--- /dev/null
+++ b/lang/th/settings.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * Settings text strings
+ * Contains all text strings used in the general settings sections of BookStack
+ * including users and roles.
+ */
+return [
+
+    // Common Messages
+    'settings' => 'การตั้งค่า',
+    'settings_save' => 'บันทึกการตั้งค่า',
+    'system_version' => 'เวอร์ชันระบบ',
+    'categories' => 'หมวดหมู่',
+
+    // App Settings
+    'app_customization' => 'การปรับแต่ง',
+    'app_features_security' => 'คุณสมบัติและความปลอดภัย',
+    'app_name' => 'ชื่อแอปพลิเคชัน',
+    'app_name_desc' => 'ชื่อนี้จะแสดงในส่วนหัวและอีเมลที่ส่งโดยระบบ',
+    'app_name_header' => 'แสดงชื่อในส่วนหัว',
+    'app_public_access' => 'การเข้าถึงสาธารณะ',
+    'app_public_access_desc' => 'การเปิดใช้งานตัวเลือกนี้จะอนุญาตให้ผู้เยี่ยมชมที่ไม่ได้เข้าสู่ระบบสามารถเข้าถึงเนื้อหาใน BookStack ของคุณได้',
+    'app_public_access_desc_guest' => 'การเข้าถึงของผู้เยี่ยมชมสาธารณะสามารถควบคุมได้ผ่านผู้ใช้ "Guest"',
+    'app_public_access_toggle' => 'อนุญาตการเข้าถึงสาธารณะ',
+    'app_public_viewing' => 'อนุญาตให้ดูแบบสาธารณะ?',
+    'app_secure_images' => 'การอัปโหลดรูปภาพแบบความปลอดภัยสูง',
+    'app_secure_images_toggle' => 'เปิดใช้งานการอัปโหลดรูปภาพแบบความปลอดภัยสูง',
+    'app_secure_images_desc' => 'เพื่อประสิทธิภาพ รูปภาพทั้งหมดเป็นสาธารณะ ตัวเลือกนี้จะเพิ่มสตริงสุ่มที่คาดเดาได้ยากหน้า URL รูปภาพ ตรวจสอบให้แน่ใจว่าไม่ได้เปิดใช้งานการแสดงรายการไดเรกทอรีเพื่อป้องกันการเข้าถึงที่ง่าย',
+    'app_default_editor' => 'ตัวแก้ไขหน้าเริ่มต้น',
+    'app_default_editor_desc' => 'เลือกตัวแก้ไขที่จะใช้โดยค่าเริ่มต้นเมื่อแก้ไขหน้าใหม่ ซึ่งสามารถแทนที่ได้ในระดับหน้าเมื่อมีสิทธิ์อนุญาต',
+    'app_custom_html' => 'เนื้อหา HTML Head แบบกำหนดเอง',
+    'app_custom_html_desc' => 'เนื้อหาที่เพิ่มที่นี่จะถูกแทรกที่ด้านล่างของส่วน <head> ของทุกหน้า มีประโยชน์สำหรับการแทนที่สไตล์หรือเพิ่มโค้ด Analytics',
+    'app_custom_html_disabled_notice' => 'เนื้อหา HTML head แบบกำหนดเองถูกปิดใช้งานในหน้าการตั้งค่านี้เพื่อให้สามารถเปลี่ยนแปลงที่ทำให้ใช้งานไม่ได้กลับคืนได้',
+    'app_logo' => 'โลโก้แอปพลิเคชัน',
+    'app_logo_desc' => 'ใช้ในแถบส่วนหัวของแอปพลิเคชัน รูปภาพควรมีความสูง 86px รูปภาพขนาดใหญ่จะถูกย่อขนาด',
+    'app_icon' => 'ไอคอนแอปพลิเคชัน',
+    'app_icon_desc' => 'ไอคอนนี้ใช้สำหรับแท็บเบราว์เซอร์และไอคอนทางลัด ควรเป็นรูปภาพ PNG สี่เหลี่ยมขนาด 256px',
+    'app_homepage' => 'หน้าแรกของแอปพลิเคชัน',
+    'app_homepage_desc' => 'เลือกมุมมองที่จะแสดงบนหน้าแรกแทนมุมมองเริ่มต้น สิทธิ์หน้าจะถูกละเว้นสำหรับหน้าที่เลือก',
+    'app_homepage_select' => 'เลือกหน้า',
+    'app_footer_links' => 'ลิงก์ส่วนท้าย',
+    'app_footer_links_desc' => 'เพิ่มลิงก์เพื่อแสดงในส่วนท้ายของเว็บไซต์ จะแสดงที่ด้านล่างของส่วนใหญ่ของหน้า รวมถึงหน้าที่ไม่ต้องเข้าสู่ระบบ คุณสามารถใช้ป้ายชื่อ "trans::<key>" เพื่อใช้การแปลที่ระบบกำหนดไว้ เช่น "trans::common.privacy_policy" จะให้ข้อความ "นโยบายความเป็นส่วนตัว"',
+    'app_footer_links_label' => 'ป้ายชื่อลิงก์',
+    'app_footer_links_url' => 'URL ลิงก์',
+    'app_footer_links_add' => 'เพิ่มลิงก์ส่วนท้าย',
+    'app_disable_comments' => 'ปิดใช้งานความคิดเห็น',
+    'app_disable_comments_toggle' => 'ปิดใช้งานความคิดเห็น',
+    'app_disable_comments_desc' => 'ปิดใช้งานความคิดเห็นในทุกหน้าในแอปพลิเคชัน <br> ความคิดเห็นที่มีอยู่จะไม่ถูกแสดง',
+
+    // Color settings
+    'color_scheme' => 'โครงสีของแอปพลิเคชัน',
+    'color_scheme_desc' => 'ตั้งค่าสีที่จะใช้ในส่วนติดต่อผู้ใช้ของแอปพลิเคชัน สามารถกำหนดค่าสีแยกกันสำหรับโหมดมืดและโหมดสว่างเพื่อให้เหมาะกับธีมและรับประกันการอ่านง่าย',
+    'ui_colors_desc' => 'ตั้งค่าสีหลักและสีลิงก์เริ่มต้นของแอปพลิเคชัน สีหลักใช้สำหรับแบนเนอร์ส่วนหัว ปุ่ม และการตกแต่งส่วนติดต่อ สีลิงก์เริ่มต้นใช้สำหรับลิงก์และการดำเนินการที่เป็นข้อความ',
+    'app_color' => 'สีหลัก',
+    'link_color' => 'สีลิงก์เริ่มต้น',
+    'content_colors_desc' => 'ตั้งค่าสีสำหรับองค์ประกอบทั้งหมดในลำดับชั้นการจัดระเบียบหน้า แนะนำให้เลือกสีที่มีความสว่างใกล้เคียงกับสีเริ่มต้นเพื่อการอ่านง่าย',
+    'bookshelf_color' => 'สีชั้นวาง',
+    'book_color' => 'สีหนังสือ',
+    'chapter_color' => 'สีบท',
+    'page_color' => 'สีหน้า',
+    'page_draft_color' => 'สีร่างหน้า',
+
+    // Registration Settings
+    'reg_settings' => 'การลงทะเบียน',
+    'reg_enable' => 'เปิดใช้งานการลงทะเบียน',
+    'reg_enable_toggle' => 'เปิดใช้งานการลงทะเบียน',
+    'reg_enable_desc' => 'เมื่อเปิดใช้งานการลงทะเบียน ผู้ใช้จะสามารถสมัครเป็นผู้ใช้แอปพลิเคชันได้ด้วยตนเอง เมื่อลงทะเบียนแล้วจะได้รับบทบาทผู้ใช้เริ่มต้นหนึ่งบทบาท',
+    'reg_default_role' => 'บทบาทผู้ใช้เริ่มต้นหลังการลงทะเบียน',
+    'reg_enable_external_warning' => 'ตัวเลือกด้านบนจะถูกละเว้นเมื่อการยืนยันตัวตน LDAP หรือ SAML ภายนอกเปิดใช้งานอยู่ บัญชีผู้ใช้สำหรับสมาชิกที่ไม่มีอยู่จะถูกสร้างอัตโนมัติหากการยืนยันตัวตนกับระบบภายนอกที่ใช้งานอยู่สำเร็จ',
+    'reg_email_confirmation' => 'การยืนยันอีเมล',
+    'reg_email_confirmation_toggle' => 'ต้องยืนยันอีเมล',
+    'reg_confirm_email_desc' => 'หากใช้การจำกัดโดเมน จะต้องยืนยันอีเมลและตัวเลือกนี้จะถูกละเว้น',
+    'reg_confirm_restrict_domain' => 'การจำกัดโดเมน',
+    'reg_confirm_restrict_domain_desc' => 'กรอกรายการโดเมนอีเมลที่คั่นด้วยเครื่องหมายจุลภาคที่ต้องการจำกัดการลงทะเบียน ผู้ใช้จะได้รับอีเมลเพื่อยืนยันที่อยู่ก่อนที่จะสามารถโต้ตอบกับแอปพลิเคชัน <br> ผู้ใช้จะสามารถเปลี่ยนที่อยู่อีเมลได้หลังจากลงทะเบียนสำเร็จ',
+    'reg_confirm_restrict_domain_placeholder' => 'ไม่มีการจำกัด',
+
+    // Sorting Settings
+    'sorting' => 'รายการและการจัดเรียง',
+    'sorting_book_default' => 'กฎการจัดเรียงหนังสือเริ่มต้น',
+    'sorting_book_default_desc' => 'เลือกกฎการจัดเรียงเริ่มต้นที่จะใช้กับหนังสือใหม่ ไม่มีผลกับหนังสือที่มีอยู่แล้ว และสามารถแทนที่ได้ต่อหนังสือ',
+    'sorting_rules' => 'กฎการจัดเรียง',
+    'sorting_rules_desc' => 'นี่คือการดำเนินการจัดเรียงที่กำหนดไว้ล่วงหน้าซึ่งสามารถนำไปใช้กับเนื้อหาในระบบ',
+    'sort_rule_assigned_to_x_books' => 'กำหนดให้ :count หนังสือ',
+    'sort_rule_create' => 'สร้างกฎการจัดเรียง',
+    'sort_rule_edit' => 'แก้ไขกฎการจัดเรียง',
+    'sort_rule_delete' => 'ลบกฎการจัดเรียง',
+    'sort_rule_delete_desc' => 'ลบกฎการจัดเรียงนี้ออกจากระบบ หนังสือที่ใช้กฎนี้จะกลับไปใช้การจัดเรียงแบบกำหนดเอง',
+    'sort_rule_delete_warn_books' => 'กฎการจัดเรียงนี้ใช้งานอยู่กับ :count เล่ม คุณแน่ใจหรือไม่ว่าต้องการลบ?',
+    'sort_rule_delete_warn_default' => 'กฎการจัดเรียงนี้ใช้งานอยู่เป็นค่าเริ่มต้นสำหรับหนังสือ คุณแน่ใจหรือไม่ว่าต้องการลบ?',
+    'sort_rule_details' => 'รายละเอียดกฎการจัดเรียง',
+    'sort_rule_details_desc' => 'ตั้งชื่อสำหรับกฎการจัดเรียงนี้ ซึ่งจะปรากฏในรายการเมื่อผู้ใช้เลือกการจัดเรียง',
+    'sort_rule_operations' => 'การดำเนินการจัดเรียง',
+    'sort_rule_operations_desc' => 'กำหนดการดำเนินการจัดเรียงโดยย้ายจากรายการที่มีให้ เมื่อใช้งาน การดำเนินการจะถูกนำไปใช้ตามลำดับจากบนลงล่าง การเปลี่ยนแปลงจะถูกนำไปใช้กับหนังสือที่กำหนดทั้งหมดเมื่อบันทึก',
+    'sort_rule_available_operations' => 'การดำเนินการที่มีให้',
+    'sort_rule_available_operations_empty' => 'ไม่มีการดำเนินการเหลือ',
+    'sort_rule_configured_operations' => 'การดำเนินการที่กำหนดค่า',
+    'sort_rule_configured_operations_empty' => 'ลาก/เพิ่มการดำเนินการจากรายการ "การดำเนินการที่มีให้"',
+    'sort_rule_op_asc' => '(น้อยไปมาก)',
+    'sort_rule_op_desc' => '(มากไปน้อย)',
+    'sort_rule_op_name' => 'ชื่อ - ตามตัวอักษร',
+    'sort_rule_op_name_numeric' => 'ชื่อ - ตามตัวเลข',
+    'sort_rule_op_created_date' => 'วันที่สร้าง',
+    'sort_rule_op_updated_date' => 'วันที่แก้ไข',
+    'sort_rule_op_chapters_first' => 'บทอยู่ก่อน',
+    'sort_rule_op_chapters_last' => 'บทอยู่หลัง',
+    'sorting_page_limits' => 'ขีดจำกัดการแสดงผลต่อหน้า',
+    'sorting_page_limits_desc' => 'ตั้งค่าจำนวนรายการที่จะแสดงต่อหน้าในรายการต่างๆ ในระบบ โดยทั่วไปจำนวนน้อยจะมีประสิทธิภาพดีกว่า ขณะที่จำนวนมากจะลดความจำเป็นในการคลิกผ่านหลายหน้า แนะนำให้ใช้ทวีคูณของ 6',
+
+    // Maintenance settings
+    'maint' => 'การบำรุงรักษา',
+    'maint_image_cleanup' => 'ล้างรูปภาพ',
+    'maint_image_cleanup_desc' => 'สแกนเนื้อหาหน้าและการแก้ไขเพื่อตรวจสอบว่ารูปภาพและภาพวาดใดกำลังใช้งานอยู่และรูปภาพใดซ้ำซ้อน ตรวจสอบให้แน่ใจว่าสร้างข้อมูลสำรองฐานข้อมูลและรูปภาพฉบับสมบูรณ์ก่อนรัน',
+    'maint_delete_images_only_in_revisions' => 'ลบรูปภาพที่มีเฉพาะในการแก้ไขหน้าเก่าด้วย',
+    'maint_image_cleanup_run' => 'รันการล้างข้อมูล',
+    'maint_image_cleanup_warning' => 'พบรูปภาพที่อาจไม่ได้ใช้งาน :count รายการ คุณแน่ใจหรือไม่ว่าต้องการลบรูปภาพเหล่านี้?',
+    'maint_image_cleanup_success' => 'พบและลบรูปภาพที่อาจไม่ได้ใช้งาน :count รายการ!',
+    'maint_image_cleanup_nothing_found' => 'ไม่พบรูปภาพที่ไม่ได้ใช้งาน ไม่มีการลบ!',
+    'maint_send_test_email' => 'ส่งอีเมลทดสอบ',
+    'maint_send_test_email_desc' => 'ส่งอีเมลทดสอบไปยังที่อยู่อีเมลที่ระบุในโปรไฟล์ของคุณ',
+    'maint_send_test_email_run' => 'ส่งอีเมลทดสอบ',
+    'maint_send_test_email_success' => 'ส่งอีเมลไปยัง :address แล้ว',
+    'maint_send_test_email_mail_subject' => 'อีเมลทดสอบ',
+    'maint_send_test_email_mail_greeting' => 'การส่งอีเมลดูเหมือนจะทำงานได้!',
+    'maint_send_test_email_mail_text' => 'ยินดีด้วย! เนื่องจากคุณได้รับการแจ้งเตือนทางอีเมลนี้ การตั้งค่าอีเมลของคุณดูเหมือนจะได้รับการกำหนดค่าอย่างถูกต้อง',
+    'maint_recycle_bin_desc' => 'ชั้นวาง หนังสือ บท และหน้าที่ถูกลบจะถูกส่งไปยังถังรีไซเคิลเพื่อให้สามารถกู้คืนหรือลบถาวรได้ รายการเก่าในถังรีไซเคิลอาจถูกลบโดยอัตโนมัติหลังจากสักพักขึ้นอยู่กับการกำหนดค่าระบบ',
+    'maint_recycle_bin_open' => 'เปิดถังรีไซเคิล',
+    'maint_regen_references' => 'สร้างการอ้างอิงใหม่',
+    'maint_regen_references_desc' => 'การดำเนินการนี้จะสร้างดัชนีการอ้างอิงข้ามรายการในฐานข้อมูลใหม่ โดยปกติจะจัดการโดยอัตโนมัติ แต่การดำเนินการนี้มีประโยชน์สำหรับการสร้างดัชนีเนื้อหาเก่าหรือเนื้อหาที่เพิ่มผ่านวิธีที่ไม่เป็นทางการ',
+    'maint_regen_references_success' => 'สร้างดัชนีการอ้างอิงใหม่แล้ว!',
+    'maint_timeout_command_note' => 'หมายเหตุ: การดำเนินการนี้อาจใช้เวลานาน ซึ่งอาจทำให้เกิดปัญหา timeout ในบางสภาพแวดล้อมเว็บ ทางเลือกหนึ่งคือดำเนินการผ่านคำสั่ง terminal',
+
+    // Recycle Bin
+    'recycle_bin' => 'ถังรีไซเคิล',
+    'recycle_bin_desc' => 'คุณสามารถกู้คืนรายการที่ถูกลบหรือเลือกลบออกจากระบบถาวรได้ที่นี่ รายการนี้ไม่ได้กรองต่างจากรายการกิจกรรมที่คล้ายกันในระบบซึ่งมีการกรองสิทธิ์',
+    'recycle_bin_deleted_item' => 'รายการที่ถูกลบ',
+    'recycle_bin_deleted_parent' => 'รายการแม่',
+    'recycle_bin_deleted_by' => 'ลบโดย',
+    'recycle_bin_deleted_at' => 'เวลาที่ลบ',
+    'recycle_bin_permanently_delete' => 'ลบถาวร',
+    'recycle_bin_restore' => 'กู้คืน',
+    'recycle_bin_contents_empty' => 'ถังรีไซเคิลว่างเปล่า',
+    'recycle_bin_empty' => 'ล้างถังรีไซเคิล',
+    'recycle_bin_empty_confirm' => 'การดำเนินการนี้จะทำลายรายการทั้งหมดในถังรีไซเคิลอย่างถาวร รวมถึงเนื้อหาที่อยู่ในแต่ละรายการ คุณแน่ใจหรือไม่ว่าต้องการล้างถังรีไซเคิล?',
+    'recycle_bin_destroy_confirm' => 'การดำเนินการนี้จะลบรายการนี้ออกจากระบบอย่างถาวร พร้อมกับองค์ประกอบลูกที่แสดงด้านล่าง และคุณจะไม่สามารถกู้คืนเนื้อหานี้ได้ คุณแน่ใจหรือไม่?',
+    'recycle_bin_destroy_list' => 'รายการที่จะถูกทำลาย',
+    'recycle_bin_restore_list' => 'รายการที่จะถูกกู้คืน',
+    'recycle_bin_restore_confirm' => 'การดำเนินการนี้จะกู้คืนรายการที่ถูกลบ รวมถึงองค์ประกอบลูก ไปยังตำแหน่งเดิม หากตำแหน่งเดิมถูกลบไปแล้วและอยู่ในถังรีไซเคิล จะต้องกู้คืนรายการแม่ด้วย',
+    'recycle_bin_restore_deleted_parent' => 'รายการแม่ของรายการนี้ถูกลบเช่นกัน จะยังคงถูกลบจนกว่าจะกู้คืนรายการแม่',
+    'recycle_bin_restore_parent' => 'กู้คืนรายการแม่',
+    'recycle_bin_destroy_notification' => 'ลบรายการทั้งหมด :count รายการจากถังรีไซเคิล',
+    'recycle_bin_restore_notification' => 'กู้คืนรายการทั้งหมด :count รายการจากถังรีไซเคิล',
+
+    // Audit Log
+    'audit' => 'บันทึกการตรวจสอบ',
+    'audit_desc' => 'บันทึกการตรวจสอบนี้แสดงรายการกิจกรรมที่ติดตามในระบบ รายการนี้ไม่ได้กรองต่างจากรายการกิจกรรมที่คล้ายกันในระบบซึ่งมีการกรองสิทธิ์',
+    'audit_event_filter' => 'ตัวกรองกิจกรรม',
+    'audit_event_filter_no_filter' => 'ไม่มีตัวกรอง',
+    'audit_deleted_item' => 'รายการที่ถูกลบ',
+    'audit_deleted_item_name' => 'ชื่อ: :name',
+    'audit_table_user' => 'ผู้ใช้',
+    'audit_table_event' => 'กิจกรรม',
+    'audit_table_related' => 'รายการหรือรายละเอียดที่เกี่ยวข้อง',
+    'audit_table_ip' => 'IP Address',
+    'audit_table_date' => 'วันที่กิจกรรม',
+    'audit_date_from' => 'ช่วงวันที่ตั้งแต่',
+    'audit_date_to' => 'ช่วงวันที่ถึง',
+
+    // Role Settings
+    'roles' => 'บทบาท',
+    'role_user_roles' => 'บทบาทผู้ใช้',
+    'roles_index_desc' => 'บทบาทใช้สำหรับจัดกลุ่มผู้ใช้และให้สิทธิ์ระบบแก่สมาชิก เมื่อผู้ใช้เป็นสมาชิกของหลายบทบาท สิทธิ์ที่ได้รับจะสะสมกัน และผู้ใช้จะได้รับความสามารถทั้งหมด',
+    'roles_x_users_assigned' => 'กำหนด :count ผู้ใช้',
+    'roles_x_permissions_provided' => ':count สิทธิ์',
+    'roles_assigned_users' => 'ผู้ใช้ที่กำหนด',
+    'roles_permissions_provided' => 'สิทธิ์ที่ให้',
+    'role_create' => 'สร้างบทบาทใหม่',
+    'role_delete' => 'ลบบทบาท',
+    'role_delete_confirm' => 'การดำเนินการนี้จะลบบทบาทชื่อ \':roleName\'',
+    'role_delete_users_assigned' => 'บทบาทนี้มีผู้ใช้ :userCount คนที่กำหนดไว้ หากต้องการย้ายผู้ใช้จากบทบาทนี้ให้เลือกบทบาทใหม่ด้านล่าง',
+    'role_delete_no_migration' => "ไม่ต้องย้ายผู้ใช้",
+    'role_delete_sure' => 'คุณแน่ใจหรือไม่ว่าต้องการลบบทบาทนี้?',
+    'role_edit' => 'แก้ไขบทบาท',
+    'role_details' => 'รายละเอียดบทบาท',
+    'role_name' => 'ชื่อบทบาท',
+    'role_desc' => 'คำอธิบายสั้นของบทบาท',
+    'role_mfa_enforced' => 'ต้องใช้การยืนยันตัวตนแบบหลายขั้นตอน',
+    'role_external_auth_id' => 'ID การยืนยันตัวตนภายนอก',
+    'role_system' => 'สิทธิ์ระบบ',
+    'role_manage_users' => 'จัดการผู้ใช้',
+    'role_manage_roles' => 'จัดการบทบาทและสิทธิ์บทบาท',
+    'role_manage_entity_permissions' => 'จัดการสิทธิ์หนังสือ บท และหน้าทั้งหมด',
+    'role_manage_own_entity_permissions' => 'จัดการสิทธิ์บนหนังสือ บท และหน้าของตัวเอง',
+    'role_manage_page_templates' => 'จัดการแม่แบบหน้า',
+    'role_access_api' => 'เข้าถึง API ระบบ',
+    'role_manage_settings' => 'จัดการการตั้งค่าแอปพลิเคชัน',
+    'role_export_content' => 'ส่งออกเนื้อหา',
+    'role_import_content' => 'นำเข้าเนื้อหา',
+    'role_editor_change' => 'เปลี่ยนตัวแก้ไขหน้า',
+    'role_notifications' => 'รับและจัดการการแจ้งเตือน',
+    'role_permission_note_users_and_roles' => 'สิทธิ์เหล่านี้จะให้การมองเห็นและการค้นหาผู้ใช้และบทบาทในระบบด้วยในทางเทคนิค',
+    'role_asset' => 'สิทธิ์ Asset',
+    'roles_system_warning' => 'โปรดทราบว่าการเข้าถึงสิทธิ์ใดๆ ในสามสิทธิ์ข้างต้นอาจอนุญาตให้ผู้ใช้เปลี่ยนแปลงสิทธิ์ของตัวเองหรือของผู้อื่นในระบบ กรุณากำหนดบทบาทที่มีสิทธิ์เหล่านี้เฉพาะกับผู้ใช้ที่เชื่อถือได้เท่านั้น',
+    'role_asset_desc' => 'สิทธิ์เหล่านี้ควบคุมการเข้าถึงเริ่มต้นสำหรับ asset ในระบบ สิทธิ์บนหนังสือ บท และหน้าจะแทนที่สิทธิ์เหล่านี้',
+    'role_asset_admins' => 'ผู้ดูแลระบบได้รับสิทธิ์เข้าถึงเนื้อหาทั้งหมดโดยอัตโนมัติ แต่ตัวเลือกเหล่านี้อาจแสดงหรือซ่อนตัวเลือก UI',
+    'role_asset_image_view_note' => 'เกี่ยวข้องกับการมองเห็นภายในตัวจัดการรูปภาพ การเข้าถึงไฟล์รูปภาพที่อัปโหลดจริงจะขึ้นอยู่กับตัวเลือกการจัดเก็บรูปภาพของระบบ',
+    'role_asset_users_note' => 'สิทธิ์เหล่านี้จะให้การมองเห็นและการค้นหาผู้ใช้ในระบบด้วยในทางเทคนิค',
+    'role_all' => 'ทั้งหมด',
+    'role_own' => 'ของตัวเอง',
+    'role_permission_aria' => ':action :resource: :value',
+    'role_controlled_by_asset' => 'ควบคุมโดย asset ที่อัปโหลดไปยัง',
+    'role_controlled_by_page_delete' => 'ควบคุมโดยสิทธิ์ลบหน้า',
+    'role_save' => 'บันทึกบทบาท',
+    'role_users' => 'ผู้ใช้ในบทบาทนี้',
+    'role_users_none' => 'ยังไม่มีผู้ใช้ที่กำหนดให้บทบาทนี้',
+
+    // Users
+    'users' => 'ผู้ใช้',
+    'users_index_desc' => 'สร้างและจัดการบัญชีผู้ใช้แต่ละรายในระบบ บัญชีผู้ใช้ใช้สำหรับเข้าสู่ระบบและระบุที่มาของเนื้อหาและกิจกรรม สิทธิ์การเข้าถึงหลักอิงตามบทบาท แต่ความเป็นเจ้าของเนื้อหาและปัจจัยอื่นๆ อาจส่งผลต่อสิทธิ์และการเข้าถึงด้วย',
+    'user_profile' => 'โปรไฟล์ผู้ใช้',
+    'users_add_new' => 'เพิ่มผู้ใช้ใหม่',
+    'users_search' => 'ค้นหาผู้ใช้',
+    'users_latest_activity' => 'กิจกรรมล่าสุด',
+    'users_details' => 'รายละเอียดผู้ใช้',
+    'users_details_desc' => 'ตั้งชื่อที่แสดงและที่อยู่อีเมลสำหรับผู้ใช้นี้ ที่อยู่อีเมลจะใช้สำหรับเข้าสู่ระบบแอปพลิเคชัน',
+    'users_details_desc_no_email' => 'ตั้งชื่อที่แสดงสำหรับผู้ใช้นี้เพื่อให้ผู้อื่นรู้จัก',
+    'users_role' => 'บทบาทผู้ใช้',
+    'users_role_desc' => 'เลือกบทบาทที่จะกำหนดให้ผู้ใช้นี้ หากผู้ใช้ถูกกำหนดให้หลายบทบาท สิทธิ์จากบทบาทเหล่านั้นจะสะสมกัน',
+    'users_password' => 'รหัสผ่านผู้ใช้',
+    'users_password_desc' => 'ตั้งรหัสผ่านสำหรับเข้าสู่ระบบ ต้องมีความยาวอย่างน้อย 8 ตัวอักษร',
+    'users_send_invite_text' => 'คุณสามารถเลือกส่งอีเมลเชิญให้ผู้ใช้นี้เพื่อให้ตั้งรหัสผ่านของตัวเอง หรือตั้งรหัสผ่านให้เองก็ได้',
+    'users_send_invite_option' => 'ส่งอีเมลเชิญผู้ใช้',
+    'users_external_auth_id' => 'ID การยืนยันตัวตนภายนอก',
+    'users_external_auth_id_desc' => 'เมื่อใช้ระบบยืนยันตัวตนภายนอก (เช่น SAML2, OIDC หรือ LDAP) นี่คือ ID ที่เชื่อมผู้ใช้ BookStack นี้กับบัญชีระบบยืนยันตัวตน สามารถละเว้นช่องนี้หากใช้การยืนยันตัวตนแบบอีเมลเริ่มต้น',
+    'users_password_warning' => 'กรอกด้านล่างเฉพาะเมื่อต้องการเปลี่ยนรหัสผ่านสำหรับผู้ใช้นี้',
+    'users_system_public' => 'ผู้ใช้นี้แทนผู้เยี่ยมชมที่เข้าถึง instance ของคุณ ไม่สามารถใช้เข้าสู่ระบบได้ แต่จะถูกกำหนดโดยอัตโนมัติ',
+    'users_delete' => 'ลบผู้ใช้',
+    'users_delete_named' => 'ลบผู้ใช้ :userName',
+    'users_delete_warning' => 'การดำเนินการนี้จะลบผู้ใช้ชื่อ \':userName\' ออกจากระบบทั้งหมด',
+    'users_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบผู้ใช้นี้?',
+    'users_migrate_ownership' => 'ย้ายความเป็นเจ้าของ',
+    'users_migrate_ownership_desc' => 'เลือกผู้ใช้ที่นี่หากต้องการให้ผู้ใช้อื่นเป็นเจ้าของรายการทั้งหมดที่เป็นของผู้ใช้นี้ในปัจจุบัน',
+    'users_none_selected' => 'ไม่มีผู้ใช้ที่เลือก',
+    'users_edit' => 'แก้ไขผู้ใช้',
+    'users_edit_profile' => 'แก้ไขโปรไฟล์',
+    'users_avatar' => 'รูปโปรไฟล์ผู้ใช้',
+    'users_avatar_desc' => 'เลือกรูปภาพเพื่อแสดงตัวผู้ใช้นี้ ควรเป็นรูปสี่เหลี่ยมขนาดประมาณ 256px',
+    'users_preferred_language' => 'ภาษาที่ต้องการ',
+    'users_preferred_language_desc' => 'ตัวเลือกนี้จะเปลี่ยนภาษาที่ใช้สำหรับส่วนติดต่อผู้ใช้ของแอปพลิเคชัน ไม่มีผลต่อเนื้อหาที่ผู้ใช้สร้าง',
+    'users_social_accounts' => 'บัญชี Social',
+    'users_social_accounts_desc' => 'ดูสถานะของบัญชี Social ที่เชื่อมต่อสำหรับผู้ใช้นี้ บัญชี Social สามารถใช้นอกเหนือจากระบบยืนยันตัวตนหลักสำหรับการเข้าถึงระบบ',
+    'users_social_accounts_info' => 'คุณสามารถเชื่อมต่อบัญชีอื่นที่นี่เพื่อเข้าสู่ระบบที่เร็วและง่ายขึ้น การตัดการเชื่อมต่อบัญชีที่นี่ไม่ได้เพิกถอนสิทธิ์ที่ให้ไว้ก่อนหน้า กรุณาเพิกถอนสิทธิ์จากการตั้งค่าโปรไฟล์บนบัญชี Social ที่เชื่อมต่อ',
+    'users_social_connect' => 'เชื่อมต่อบัญชี',
+    'users_social_disconnect' => 'ตัดการเชื่อมต่อบัญชี',
+    'users_social_status_connected' => 'เชื่อมต่อแล้ว',
+    'users_social_status_disconnected' => 'ตัดการเชื่อมต่อแล้ว',
+    'users_social_connected' => 'เชื่อมต่อบัญชี :socialAccount กับโปรไฟล์ของคุณสำเร็จแล้ว',
+    'users_social_disconnected' => 'ตัดการเชื่อมต่อบัญชี :socialAccount จากโปรไฟล์ของคุณสำเร็จแล้ว',
+    'users_api_tokens' => 'API Tokens',
+    'users_api_tokens_desc' => 'สร้างและจัดการโทเค็นการเข้าถึงที่ใช้ยืนยันตัวตนกับ BookStack REST API สิทธิ์สำหรับ API จัดการผ่านผู้ใช้ที่โทเค็นนั้นสังกัด',
+    'users_api_tokens_none' => 'ยังไม่มี API token ที่สร้างสำหรับผู้ใช้นี้',
+    'users_api_tokens_create' => 'สร้าง Token',
+    'users_api_tokens_expires' => 'หมดอายุ',
+    'users_api_tokens_docs' => 'เอกสาร API',
+    'users_mfa' => 'การยืนยันตัวตนแบบหลายขั้นตอน',
+    'users_mfa_desc' => 'ตั้งค่าการยืนยันตัวตนแบบหลายขั้นตอนเป็นชั้นความปลอดภัยเพิ่มเติมสำหรับบัญชีผู้ใช้ของคุณ',
+    'users_mfa_x_methods' => 'กำหนดค่า :count วิธี',
+    'users_mfa_configure' => 'กำหนดค่าวิธี',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
+
+    // API Tokens
+    'user_api_token_create' => 'สร้าง API Token',
+    'user_api_token_name' => 'ชื่อ',
+    'user_api_token_name_desc' => 'ตั้งชื่อที่อ่านง่ายสำหรับ token นี้เพื่อเตือนความจำเกี่ยวกับวัตถุประสงค์ในอนาคต',
+    'user_api_token_expiry' => 'วันหมดอายุ',
+    'user_api_token_expiry_desc' => 'ตั้งวันที่ token นี้หมดอายุ หลังจากวันนี้ คำขอที่ใช้ token นี้จะไม่ทำงานอีกต่อไป การเว้นช่องนี้ว่างจะตั้งวันหมดอายุเป็น 100 ปีในอนาคต',
+    'user_api_token_create_secret_message' => 'ทันทีหลังจากสร้าง token นี้ "Token ID" และ "Token Secret" จะถูกสร้างและแสดง Secret จะแสดงเพียงครั้งเดียว ดังนั้นให้คัดลอกค่าไปยังที่ปลอดภัยก่อนดำเนินการต่อ',
+    'user_api_token' => 'API Token',
+    'user_api_token_id' => 'Token ID',
+    'user_api_token_id_desc' => 'นี่คือตัวระบุที่สร้างโดยระบบซึ่งไม่สามารถแก้ไขได้สำหรับ token นี้ ซึ่งจะต้องระบุในคำขอ API',
+    'user_api_token_secret' => 'Token Secret',
+    'user_api_token_secret_desc' => 'นี่คือ secret ที่สร้างโดยระบบสำหรับ token นี้ซึ่งจะต้องระบุในคำขอ API จะแสดงเพียงครั้งเดียวนี้เท่านั้น ดังนั้นให้คัดลอกค่าไปยังที่ปลอดภัย',
+    'user_api_token_created' => 'สร้าง Token เมื่อ :timeAgo',
+    'user_api_token_updated' => 'อัปเดต Token เมื่อ :timeAgo',
+    'user_api_token_delete' => 'ลบ Token',
+    'user_api_token_delete_warning' => 'การดำเนินการนี้จะลบ API token ชื่อ \':tokenName\' ออกจากระบบทั้งหมด',
+    'user_api_token_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบ API token นี้?',
+
+    // Webhooks
+    'webhooks' => 'Webhooks',
+    'webhooks_index_desc' => 'Webhooks เป็นวิธีส่งข้อมูลไปยัง URL ภายนอกเมื่อมีการดำเนินการและกิจกรรมบางอย่างในระบบ ซึ่งช่วยให้สามารถรวมกับแพลตฟอร์มภายนอก เช่น ระบบส่งข้อความหรือการแจ้งเตือน',
+    'webhooks_x_trigger_events' => ':count กิจกรรมทริกเกอร์',
+    'webhooks_create' => 'สร้าง Webhook ใหม่',
+    'webhooks_none_created' => 'ยังไม่มี Webhook ที่สร้าง',
+    'webhooks_edit' => 'แก้ไข Webhook',
+    'webhooks_save' => 'บันทึก Webhook',
+    'webhooks_details' => 'รายละเอียด Webhook',
+    'webhooks_details_desc' => 'ระบุชื่อที่เป็นมิตรกับผู้ใช้และ POST endpoint เป็นตำแหน่งสำหรับส่งข้อมูล Webhook',
+    'webhooks_events' => 'กิจกรรม Webhook',
+    'webhooks_events_desc' => 'เลือกกิจกรรมทั้งหมดที่ควรทริกเกอร์ให้เรียก Webhook นี้',
+    'webhooks_events_warning' => 'โปรดทราบว่ากิจกรรมเหล่านี้จะถูกทริกเกอร์สำหรับกิจกรรมที่เลือกทั้งหมด แม้จะมีสิทธิ์แบบกำหนดเองก็ตาม ตรวจสอบให้แน่ใจว่าการใช้ Webhook นี้จะไม่เปิดเผยเนื้อหาที่เป็นความลับ',
+    'webhooks_events_all' => 'กิจกรรมทั้งหมดในระบบ',
+    'webhooks_name' => 'ชื่อ Webhook',
+    'webhooks_timeout' => 'หมดเวลาคำขอ Webhook (วินาที)',
+    'webhooks_endpoint' => 'Endpoint ของ Webhook',
+    'webhooks_active' => 'Webhook เปิดใช้งาน',
+    'webhook_events_table_header' => 'กิจกรรม',
+    'webhooks_delete' => 'ลบ Webhook',
+    'webhooks_delete_warning' => 'การดำเนินการนี้จะลบ Webhook ชื่อ \':webhookName\' ออกจากระบบทั้งหมด',
+    'webhooks_delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบ Webhook นี้?',
+    'webhooks_format_example' => 'ตัวอย่างรูปแบบ Webhook',
+    'webhooks_format_example_desc' => 'ข้อมูล Webhook ถูกส่งเป็นคำขอ POST ไปยัง endpoint ที่กำหนดค่าเป็น JSON ตามรูปแบบด้านล่าง คุณสมบัติ "related_item" และ "url" เป็นทางเลือกและขึ้นอยู่กับประเภทกิจกรรมที่ทริกเกอร์',
+    'webhooks_status' => 'สถานะ Webhook',
+    'webhooks_last_called' => 'เรียกล่าสุด:',
+    'webhooks_last_errored' => 'เกิดข้อผิดพลาดล่าสุด:',
+    'webhooks_last_error_message' => 'ข้อความข้อผิดพลาดล่าสุด:',
+
+    // Licensing
+    'licenses' => 'สัญญาอนุญาต',
+    'licenses_desc' => 'หน้านี้แสดงข้อมูลสัญญาอนุญาตสำหรับ BookStack รวมถึงโปรเจกต์และไลบรารีที่ใช้ใน BookStack โปรเจกต์หลายรายการอาจใช้เฉพาะในบริบทการพัฒนา',
+    'licenses_bookstack' => 'สัญญาอนุญาต BookStack',
+    'licenses_php' => 'สัญญาอนุญาตไลบรารี PHP',
+    'licenses_js' => 'สัญญาอนุญาตไลบรารี JavaScript',
+    'licenses_other' => 'สัญญาอนุญาตอื่นๆ',
+    'license_details' => 'รายละเอียดสัญญาอนุญาต',
+
+    //! If editing translations files directly please ignore this in all
+    //! languages apart from en. Content will be auto-copied from en.
+    //!////////////////////////////////
+    'language_select' => [
+        'en' => 'English',
+        'ar' => 'العربية',
+        'bg' => 'Bǎlgarski',
+        'bs' => 'Bosanski',
+        'ca' => 'Català',
+        'cs' => 'Česky',
+        'cy' => 'Cymraeg',
+        'da' => 'Dansk',
+        'de' => 'Deutsch (Sie)',
+        'de_informal' => 'Deutsch (Du)',
+        'el' => 'ελληνικά',
+        'es' => 'Español',
+        'es_AR' => 'Español Argentina',
+        'et' => 'Eesti keel',
+        'eu' => 'Euskara',
+        'fa' => 'فارسی',
+        'fi' => 'Suomi',
+        'fr' => 'Français',
+        'he' => 'עברית',
+        'hr' => 'Hrvatski',
+        'hu' => 'Magyar',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => '日本語',
+        'ko' => '한국어',
+        'lt' => 'Lietuvių Kalba',
+        'lv' => 'Latviešu Valoda',
+        'nb' => 'Norsk (Bokmål)',
+        'ne' => 'नेपाली',
+        'nn' => 'Nynorsk',
+        'nl' => 'Nederlands',
+        'pl' => 'Polski',
+        'pt' => 'Português',
+        'pt_BR' => 'Português do Brasil',
+        'ro' => 'Română',
+        'ru' => 'Русский',
+        'sk' => 'Slovensky',
+        'sl' => 'Slovenščina',
+        'sr' => 'Српски',
+        'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
+        'tr' => 'Türkçe',
+        'uk' => 'Українська',
+        'uz' => 'O‘zbekcha',
+        'vi' => 'Tiếng Việt',
+        'zh_CN' => '简体中文',
+        'zh_TW' => '繁體中文',
+    ],
+    //!////////////////////////////////
+];
diff --git a/lang/th/validation.php b/lang/th/validation.php
new file mode 100644
index 00000000000..0ec3276c154
--- /dev/null
+++ b/lang/th/validation.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Validation Lines
+ * The following language lines contain the default error messages used by
+ * the validator class. Some of these rules have multiple versions such
+ * as the size rules. Feel free to tweak each of these messages here.
+ */
+return [
+
+    // Standard laravel validation lines
+    'accepted'             => 'ต้องยอมรับ :attribute',
+    'active_url'           => ':attribute ไม่ใช่ URL ที่ถูกต้อง',
+    'after'                => ':attribute ต้องเป็นวันที่หลังจาก :date',
+    'alpha'                => ':attribute ต้องมีเฉพาะตัวอักษรเท่านั้น',
+    'alpha_dash'           => ':attribute ต้องมีเฉพาะตัวอักษร ตัวเลข ขีดกลาง และขีดล่างเท่านั้น',
+    'alpha_num'            => ':attribute ต้องมีเฉพาะตัวอักษรและตัวเลขเท่านั้น',
+    'array'                => ':attribute ต้องเป็น array',
+    'backup_codes'         => 'รหัสที่ให้มาไม่ถูกต้องหรือถูกใช้ไปแล้ว',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
+    'before'               => ':attribute ต้องเป็นวันที่ก่อน :date',
+    'between'              => [
+        'numeric' => ':attribute ต้องอยู่ระหว่าง :min ถึง :max',
+        'file'    => ':attribute ต้องมีขนาดระหว่าง :min ถึง :max กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวระหว่าง :min ถึง :max ตัวอักษร',
+        'array'   => ':attribute ต้องมีระหว่าง :min ถึง :max รายการ',
+    ],
+    'boolean'              => 'ฟิลด์ :attribute ต้องเป็น true หรือ false',
+    'confirmed'            => 'การยืนยัน :attribute ไม่ตรงกัน',
+    'current_password'     => 'This does not match your current password.',
+    'date'                 => ':attribute ไม่ใช่วันที่ที่ถูกต้อง',
+    'date_format'          => ':attribute ไม่ตรงกับรูปแบบ :format',
+    'different'            => ':attribute และ :other ต้องแตกต่างกัน',
+    'digits'               => ':attribute ต้องมี :digits หลัก',
+    'digits_between'       => ':attribute ต้องมีระหว่าง :min ถึง :max หลัก',
+    'email'                => ':attribute ต้องเป็นที่อยู่อีเมลที่ถูกต้อง',
+    'ends_with' => ':attribute ต้องลงท้ายด้วยหนึ่งในนี้: :values',
+    'file'                 => ':attribute ต้องเป็นไฟล์ที่ถูกต้อง',
+    'filled'               => 'ฟิลด์ :attribute จำเป็นต้องกรอก',
+    'gt'                   => [
+        'numeric' => ':attribute ต้องมากกว่า :value',
+        'file'    => ':attribute ต้องมากกว่า :value กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวมากกว่า :value ตัวอักษร',
+        'array'   => ':attribute ต้องมีมากกว่า :value รายการ',
+    ],
+    'gte'                  => [
+        'numeric' => ':attribute ต้องมากกว่าหรือเท่ากับ :value',
+        'file'    => ':attribute ต้องมากกว่าหรือเท่ากับ :value กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวมากกว่าหรือเท่ากับ :value ตัวอักษร',
+        'array'   => ':attribute ต้องมี :value รายการขึ้นไป',
+    ],
+    'exists'               => ':attribute ที่เลือกไม่ถูกต้อง',
+    'image'                => ':attribute ต้องเป็นรูปภาพ',
+    'image_extension'      => ':attribute ต้องมีนามสกุลรูปภาพที่ถูกต้องและรองรับ',
+    'in'                   => ':attribute ที่เลือกไม่ถูกต้อง',
+    'integer'              => ':attribute ต้องเป็นจำนวนเต็ม',
+    'ip'                   => ':attribute ต้องเป็นที่อยู่ IP ที่ถูกต้อง',
+    'ipv4'                 => ':attribute ต้องเป็นที่อยู่ IPv4 ที่ถูกต้อง',
+    'ipv6'                 => ':attribute ต้องเป็นที่อยู่ IPv6 ที่ถูกต้อง',
+    'json'                 => ':attribute ต้องเป็น JSON string ที่ถูกต้อง',
+    'lt'                   => [
+        'numeric' => ':attribute ต้องน้อยกว่า :value',
+        'file'    => ':attribute ต้องน้อยกว่า :value กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวน้อยกว่า :value ตัวอักษร',
+        'array'   => ':attribute ต้องมีน้อยกว่า :value รายการ',
+    ],
+    'lte'                  => [
+        'numeric' => ':attribute ต้องน้อยกว่าหรือเท่ากับ :value',
+        'file'    => ':attribute ต้องน้อยกว่าหรือเท่ากับ :value กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวน้อยกว่าหรือเท่ากับ :value ตัวอักษร',
+        'array'   => ':attribute ต้องไม่มีมากกว่า :value รายการ',
+    ],
+    'max'                  => [
+        'numeric' => ':attribute ต้องไม่มากกว่า :max',
+        'file'    => ':attribute ต้องไม่มากกว่า :max กิโลไบต์',
+        'string'  => ':attribute ต้องไม่มากกว่า :max ตัวอักษร',
+        'array'   => ':attribute ต้องไม่มีมากกว่า :max รายการ',
+    ],
+    'mimes'                => ':attribute ต้องเป็นไฟล์ประเภท: :values',
+    'min'                  => [
+        'numeric' => ':attribute ต้องอย่างน้อย :min',
+        'file'    => ':attribute ต้องอย่างน้อย :min กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาวอย่างน้อย :min ตัวอักษร',
+        'array'   => ':attribute ต้องมีอย่างน้อย :min รายการ',
+    ],
+    'not_in'               => ':attribute ที่เลือกไม่ถูกต้อง',
+    'not_regex'            => 'รูปแบบ :attribute ไม่ถูกต้อง',
+    'numeric'              => ':attribute ต้องเป็นตัวเลข',
+    'regex'                => 'รูปแบบ :attribute ไม่ถูกต้อง',
+    'required'             => 'ฟิลด์ :attribute จำเป็นต้องกรอก',
+    'required_if'          => 'ฟิลด์ :attribute จำเป็นต้องกรอกเมื่อ :other เป็น :value',
+    'required_with'        => 'ฟิลด์ :attribute จำเป็นต้องกรอกเมื่อมี :values',
+    'required_with_all'    => 'ฟิลด์ :attribute จำเป็นต้องกรอกเมื่อมี :values',
+    'required_without'     => 'ฟิลด์ :attribute จำเป็นต้องกรอกเมื่อไม่มี :values',
+    'required_without_all' => 'ฟิลด์ :attribute จำเป็นต้องกรอกเมื่อไม่มีสิ่งใดใน :values',
+    'same'                 => ':attribute และ :other ต้องตรงกัน',
+    'safe_url'             => 'ลิงก์ที่ให้มาอาจไม่ปลอดภัย',
+    'size'                 => [
+        'numeric' => ':attribute ต้องเป็น :size',
+        'file'    => ':attribute ต้องมีขนาด :size กิโลไบต์',
+        'string'  => ':attribute ต้องมีความยาว :size ตัวอักษร',
+        'array'   => ':attribute ต้องมี :size รายการ',
+    ],
+    'string'               => ':attribute ต้องเป็น string',
+    'timezone'             => ':attribute ต้องเป็นเขตเวลาที่ถูกต้อง',
+    'totp'                 => 'รหัสที่ให้มาไม่ถูกต้องหรือหมดอายุแล้ว',
+    'unique'               => ':attribute ถูกใช้งานแล้ว',
+    'url'                  => 'รูปแบบ :attribute ไม่ถูกต้อง',
+    'uploaded'             => 'ไม่สามารถอัปโหลดไฟล์ได้ เซิร์ฟเวอร์อาจไม่รับไฟล์ขนาดนี้',
+
+    'zip_file' => ':attribute ต้องอ้างอิงถึงไฟล์ภายใน ZIP',
+    'zip_file_size' => 'ไฟล์ :attribute ต้องไม่เกิน :size MB',
+    'zip_file_mime' => ':attribute ต้องอ้างอิงถึงไฟล์ประเภท :validTypes แต่พบ :foundType',
+    'zip_model_expected' => 'คาดหวัง data object แต่พบ ":type"',
+    'zip_unique' => ':attribute ต้องไม่ซ้ำกันสำหรับประเภท object ภายใน ZIP',
+
+    // Custom validation lines
+    'custom' => [
+        'password-confirm' => [
+            'required_with' => 'จำเป็นต้องยืนยันรหัสผ่าน',
+        ],
+    ],
+
+    // Custom validation attributes
+    'attributes' => [],
+];
diff --git a/lang/tk/activities.php b/lang/tk/activities.php
index 4362fc02958..e9344a3d477 100644
--- a/lang/tk/activities.php
+++ b/lang/tk/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'User successfully updated',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'User successfully removed',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/tk/auth.php b/lang/tk/auth.php
index 57f0cb5c632..13247c73194 100644
--- a/lang/tk/auth.php
+++ b/lang/tk/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'These credentials do not match our records.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Sign up',
@@ -20,6 +21,9 @@
     'username' => 'Username',
     'email' => 'Email',
     'password' => 'Password',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Confirm Password',
     'password_hint' => 'Must be at least 8 characters',
     'forgot_password' => 'Forgot Password?',
diff --git a/lang/tk/common.php b/lang/tk/common.php
index 06a9e855ce3..46b2a187c25 100644
--- a/lang/tk/common.php
+++ b/lang/tk/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Inactive',
     'never' => 'Never',
     'none' => 'None',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Homepage',
diff --git a/lang/tk/entities.php b/lang/tk/entities.php
index 74c50be3b2f..58c00ec4b27 100644
--- a/lang/tk/entities.php
+++ b/lang/tk/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sort Book :bookName',
     'books_sort_name' => 'Sort by Name',
     'books_sort_created' => 'Sort by Created Date',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Page Tags',
     'chapter_tags' => 'Chapter Tags',
     'book_tags' => 'Book Tags',
diff --git a/lang/tk/errors.php b/lang/tk/errors.php
index 9d738379648..20537d59f0c 100644
--- a/lang/tk/errors.php
+++ b/lang/tk/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'The secret provided for the given used API token is incorrect',
     'api_user_no_api_permission' => 'The owner of the used API token does not have permission to make API calls',
     'api_user_token_expired' => 'The authorization token used has expired',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Error thrown when sending a test email:',
diff --git a/lang/tk/notifications.php b/lang/tk/notifications.php
index 1afd23f1dc4..563ac24e84d 100644
--- a/lang/tk/notifications.php
+++ b/lang/tk/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/tk/preferences.php b/lang/tk/preferences.php
index 2872f5f3c65..1b874efa2f1 100644
--- a/lang/tk/preferences.php
+++ b/lang/tk/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Shortcut preferences have been updated!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/tk/settings.php b/lang/tk/settings.php
index 81c2c0a93c3..ac483f8fd10 100644
--- a/lang/tk/settings.php
+++ b/lang/tk/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'No restriction set',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Maintenance',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Change page editor',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Asset Permissions',
     'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.',
     'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.',
     'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'All',
     'role_own' => 'Own',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Save Role',
     'role_users' => 'Users in this role',
     'role_users_none' => 'No users are currently assigned to this role',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Configure Methods',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Create API Token',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/tk/validation.php b/lang/tk/validation.php
index d9b982d1e23..3b76b99d1c9 100644
--- a/lang/tk/validation.php
+++ b/lang/tk/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'The :attribute may only contain letters and numbers.',
     'array'                => 'The :attribute must be an array.',
     'backup_codes'         => 'The provided code is not valid or has already been used.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'The :attribute must be a date before :date.',
     'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'The :attribute field must be true or false.',
     'confirmed'            => 'The :attribute confirmation does not match.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
     'different'            => 'The :attribute and :other must be different.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'The file could not be uploaded. The server may not accept files of this size.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/tr/activities.php b/lang/tr/activities.php
index 5bed9ea303b..71282e448d7 100644
--- a/lang/tr/activities.php
+++ b/lang/tr/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Kullanıcı başarıyla güncellendi',
     'user_delete' => 'kullanıcı silindi',
     'user_delete_notification' => 'Kullanıcı başarıyla silindi',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/tr/auth.php b/lang/tr/auth.php
index c9663f21e00..25f5f8bb9a5 100644
--- a/lang/tr/auth.php
+++ b/lang/tr/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Girdiğiniz bilgiler kayıtlarımızla uyuşmuyor.',
     'throttle' => 'Çok fazla giriş yapmaya çalıştınız. Lütfen :seconds saniye içinde tekrar deneyin.',
+    'mfa_throttle' => 'Çok fazla çok faktörlü doğrulama denemesi yapıldı. Lütfen :seconds içinde tekrar deneyin.',
 
     // Login & Register
     'sign_up' => 'Kaydol',
@@ -20,6 +21,9 @@
     'username' => 'Kullanıcı Adı',
     'email' => 'E-posta',
     'password' => 'Şifre',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Şifreyi Onaylayın',
     'password_hint' => 'En az 8 karakter olmalı',
     'forgot_password' => 'Şifrenizi mi unuttunuz?',
@@ -91,7 +95,7 @@
     'mfa_option_totp_title' => 'Mobil Uygulama',
     'mfa_option_totp_desc' => 'Çok aşamalı kimlik doğrulamayı kullanabilmek için Google Authenticator, Authy veya Microsoft Authenticator gibi TOTP destekleyen bir mobil uygulamaya ihtiyacınız olacaktır.',
     'mfa_option_backup_codes_title' => 'Yedekleme Kodları',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Kimliğinizi doğrulamak için giriş yaparken kullanacağınız tek kullanımlık yedek kodlar oluşturur. Bunları güvenli ve sağlam bir yerde sakladığınızdan emin olun.',
     'mfa_gen_confirm_and_enable' => 'Onayla ve aktive et',
     'mfa_gen_backup_codes_title' => 'Yedekleme Kodları Kurulumu',
     'mfa_gen_backup_codes_desc' => 'Aşağıdaki kod listesini güvenli bir yerde sakla. Sisteme giriş yaparken kodlardan birini ikinci bir kimlik doğrulama mekanizması olarak kullanabileceksin.',
diff --git a/lang/tr/common.php b/lang/tr/common.php
index 5b5e753873a..5ac5d2933b2 100644
--- a/lang/tr/common.php
+++ b/lang/tr/common.php
@@ -20,7 +20,7 @@
     'description' => 'Açıklama',
     'role' => 'Rol',
     'cover_image' => 'Kapak resmi',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Bu görüntü yaklaşık 440x250px olmalıdır, ancak kullanıcı arayüzüne farklı senaryolarda uyacak şekilde esnek ölçeklendirilip kırpılacak, bu yüzden gerçek ekran boyutları farklı olacaktır.',
 
     // Actions
     'actions' => 'İşlemler',
@@ -84,6 +84,8 @@
     'status_inactive' => 'Aktif değil',
     'never' => 'Hiçbir zaman',
     'none' => 'Hiçbiri',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Ana sayfa',
diff --git a/lang/tr/editor.php b/lang/tr/editor.php
index c020c82fddf..79a82fdf61b 100644
--- a/lang/tr/editor.php
+++ b/lang/tr/editor.php
@@ -13,7 +13,7 @@
     'cancel' => 'İptal',
     'save' => 'Kaydet',
     'close' => 'Kapat',
-    'apply' => 'Apply',
+    'apply' => 'Uygula',
     'undo' => 'Geri al',
     'redo' => 'Yeniden yap',
     'left' => 'Sol',
diff --git a/lang/tr/entities.php b/lang/tr/entities.php
index 39feb7e3917..e5bdacae791 100644
--- a/lang/tr/entities.php
+++ b/lang/tr/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => ':bookName Kitabını Sırala',
     'books_sort_name' => 'İsme Göre Sırala',
     'books_sort_created' => 'Oluşturulma Tarihine Göre Sırala',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Sayfa Etiketleri',
     'chapter_tags' => 'Bölüm Etiketleri',
     'book_tags' => 'Kitap Etiketleri',
diff --git a/lang/tr/errors.php b/lang/tr/errors.php
index fd742687127..66d836867c0 100644
--- a/lang/tr/errors.php
+++ b/lang/tr/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Kullanılan API için sağlanan gizli anahtar doğru değil',
     'api_user_no_api_permission' => 'Kullanılan API anahtarının sahibi API çağrısı yapmak için izne sahip değil',
     'api_user_token_expired' => 'Kullanılan yetkilendirme anahtarının süresi doldu',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Test e-postası gönderilirken bir hata meydana geldi:',
diff --git a/lang/tr/notifications.php b/lang/tr/notifications.php
index c26a90b32cb..5dfb719783e 100644
--- a/lang/tr/notifications.php
+++ b/lang/tr/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Updated page: :pageName',
     'updated_page_intro' => 'A page has been updated in :appName:',
     'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Page Name:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/tr/preferences.php b/lang/tr/preferences.php
index 1ce7b01fda4..1f6146298b0 100644
--- a/lang/tr/preferences.php
+++ b/lang/tr/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Kısayol tercihleri güncellendi!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/tr/settings.php b/lang/tr/settings.php
index 1eb15d9d4c0..e1b945ea78f 100644
--- a/lang/tr/settings.php
+++ b/lang/tr/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Hiçbir kısıtlama tanımlanmamış',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Bakım',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Yazı editörünü değiştir',
     'role_notifications' => 'Receive & manage notifications',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Varlık Yetkileri',
     'roles_system_warning' => 'Yukarıdaki üç izinden herhangi birine erişimin, kullanıcının kendi ayrıcalıklarını veya sistemdeki diğerlerinin ayrıcalıklarını değiştirmesine izin verebileceğini unutmayın. Yalnızca bu izinlere sahip rolleri güvenilir kullanıcılara atayın.',
     'role_asset_desc' => 'Bu izinler, sistem içindeki varlıklara varsayılan erişim izinlerini ayarlar. Kitaplar, bölümler ve sayfalar üzerindeki izinler, buradaki izinleri geçersiz kılar.',
     'role_asset_admins' => 'Yöneticilere otomatik olarak bütün içeriğe erişim yetkisi verilir ancak bu seçenekler, kullanıcı arayüzündeki bazı seçeneklerin gösterilmesine veya gizlenmesine neden olabilir.',
     'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Hepsi',
     'role_own' => 'Kendine Ait',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Yüklendikleri varlık tarafından kontrol ediliyor',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Rolü Kaydet',
     'role_users' => 'Bu roldeki kullanıcılar',
     'role_users_none' => 'Bu role henüz bir kullanıcı atanmadı',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Setup multi-factor authentication as an extra layer of security for your user account.',
     'users_mfa_x_methods' => ':count method configured|:count methods configured',
     'users_mfa_configure' => 'Yöntemleri Yapılandır',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'API Anahtarı Oluştur',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovence',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/tr/validation.php b/lang/tr/validation.php
index 9dbfadd6b9e..9e06fc3396d 100644
--- a/lang/tr/validation.php
+++ b/lang/tr/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute sadece harflerden ve rakamlardan oluşabilir.',
     'array'                => ':attribute bir dizi olmalıdır.',
     'backup_codes'         => 'Girilen kod geçersiz veya daha önce kullanılmış.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute tarihi, :date tarihinden önceki bir tarih olmalıdır.',
     'between'              => [
         'numeric' => ':attribute değeri, :min ve :max değerleri arasında olmalıdır.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute değeri true veya false olmalıdır.',
     'confirmed'            => ':attribute doğrulaması eşleşmiyor.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute geçerli bir tarih değil.',
     'date_format'          => ':attribute formatı, :format formatına uymuyor.',
     'different'            => ':attribute ve :other birbirinden farklı olmalıdır.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Dosya yüklemesi başarısız oldu. Sunucu, bu boyuttaki dosyaları kabul etmiyor olabilir.',
 
     'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
     'zip_model_expected' => 'Data object expected but ":type" found.',
     'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
diff --git a/lang/uk/activities.php b/lang/uk/activities.php
index e8b77e0d430..21ebcf970d9 100644
--- a/lang/uk/activities.php
+++ b/lang/uk/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Користувача було успішно оновлено',
     'user_delete' => 'вилучений користувач',
     'user_delete_notification' => 'Користувача успішно видалено',
+    'user_mfa_reset' => 'скинути MFA для користувача',
+    'user_mfa_reset_notification' => 'Скидання методів багатофакторної автентифікації',
 
     // API Tokens
     'api_token_create' => 'створений APi токен',
diff --git a/lang/uk/auth.php b/lang/uk/auth.php
index 27aae39367e..7b07d0a6373 100644
--- a/lang/uk/auth.php
+++ b/lang/uk/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Цей обліковий запис не знайдено.',
     'throttle' => 'Забагато спроб входу в систему. Будь ласка, спробуйте ще раз через :seconds секунд.',
+    'mfa_throttle' => 'Занадто багато спроб багатофакторної перевірки. Будь ласка, спробуйте ще раз через :seconds секунд.',
 
     // Login & Register
     'sign_up' => 'Реєстрація',
@@ -20,6 +21,9 @@
     'username' => 'Логін',
     'email' => 'Адреса електронної пошти',
     'password' => 'Пароль',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Підтвердження пароля',
     'password_hint' => 'Повинен бути щонайменше 8 символів',
     'forgot_password' => 'Забули пароль?',
diff --git a/lang/uk/common.php b/lang/uk/common.php
index d71f5716200..633c1855ba8 100644
--- a/lang/uk/common.php
+++ b/lang/uk/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Неактивний',
     'never' => 'Ніколи',
     'none' => 'Відсутньо',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Домашня Сторінка',
diff --git a/lang/uk/entities.php b/lang/uk/entities.php
index cf79b530cff..9e775c88bad 100644
--- a/lang/uk/entities.php
+++ b/lang/uk/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Перекладіть розділи та сторінки в межах книги, щоб реорганізувати вміст. Інші книги можна додати, що дозволяє легко переміщати глави та сторінки між книгами. При необхідності правило автоматичного сортування може бути встановлено для автоматичного сортування вмісту цієї книги при змінах.',
     'books_sort_auto_sort' => 'Опція автоматичного сортування',
     'books_sort_auto_sort_active' => 'Автосортування : :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Правила автоматичного сортування можуть бути створені в області налаштувань "Списки і сортування" за допомогою користувача з відповідними дозволами.',
     'books_sort_named' => 'Сортувати книгу :bookName',
     'books_sort_name' => 'Сортувати за назвою',
     'books_sort_created' => 'Сортувати за датою створення',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Перемикач бічної панелі',
+    'page_contents' => 'Вміст сторінки',
+    'page_contents_none' => 'У тексті сторінки не знайдено заголовків.',
+    'page_contents_info' => 'Вміст меню створюється з будь-яких форматів заголовків, використовуваних для сторінки.',
     'page_tags' => 'Теги сторінки',
     'chapter_tags' => 'Теги розділів',
     'book_tags' => 'Теги книг',
diff --git a/lang/uk/errors.php b/lang/uk/errors.php
index eed61e8a027..8e332bdedfb 100644
--- a/lang/uk/errors.php
+++ b/lang/uk/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Не вдалося прочитати ZIP-файл.',
     'import_zip_cant_decode_data' => 'Не вдалося знайти і розшифрувати контент ZIP data.json.',
     'import_zip_no_data' => 'ZIP-файл не містить очікуваної книги, глави або вмісту сторінки.',
+    'import_zip_data_too_large' => 'Вміст ZIP data.json перевищує налаштований максимальний розмір додатка.',
     'import_validation_failed' => 'Не вдалося виконати перевірку ZIP-адреси із помилками:',
     'import_zip_failed_notification' => 'Не вдалося імпортувати ZIP-файл.',
     'import_perms_books' => 'У Вас не вистачає необхідних прав для створення книг.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Секрет, наданий для даного використовуваного токена API є неправильним',
     'api_user_no_api_permission' => 'Власник використовуваного токена API не має дозволу здійснювати виклики API',
     'api_user_token_expired' => 'Термін дії токена авторизації закінчився',
+    'api_cookie_auth_only_get' => 'Дозволяються тільки запити GET при використанні API з автентифікацією на основі cookie',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Помилка під час надсилання тестового електронного листа:',
diff --git a/lang/uk/notifications.php b/lang/uk/notifications.php
index a08b9a100be..896808c7574 100644
--- a/lang/uk/notifications.php
+++ b/lang/uk/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Оновлено сторінку: :pageName',
     'updated_page_intro' => 'Оновлено сторінку у :appName:',
     'updated_page_debounce' => 'Для запобігання кількості сповіщень, деякий час ви не будете відправлені повідомлення для подальших змін на цій сторінці тим самим редактором.',
+    'comment_mention_subject' => 'Вас згадали в коментарях на сторінці: :pageName',
+    'comment_mention_intro' => 'Вас згадали в коментарі до :appName:',
 
     'detail_page_name' => 'Назва сторінки:',
     'detail_page_path' => 'Шлях до сторінки:',
diff --git a/lang/uk/preferences.php b/lang/uk/preferences.php
index 14989d2a740..7c07fdc5112 100644
--- a/lang/uk/preferences.php
+++ b/lang/uk/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Налаштування ярликів оновлено!',
     'shortcuts_overview_desc' => 'Керуйте комбінаціями клавіатур можна використовувати для навігації інтерфейсу системи користувача.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Налаштування сповіщень',
     'notifications_desc' => 'Контролюйте сповіщення по електронній пошті, які ви отримуєте, коли виконується певна активність у системі.',
     'notifications_opt_own_page_changes' => 'Повідомляти при змінах сторінок якими я володію',
     'notifications_opt_own_page_comments' => 'Повідомляти при коментарях на моїх сторінках',
+    'notifications_opt_comment_mentions' => 'Сповіщати, якщо мене згадали у коментарі',
     'notifications_opt_comment_replies' => 'Повідомляти про відповіді на мої коментарі',
     'notifications_save' => 'Зберегти налаштування',
     'notifications_update_success' => 'Налаштування сповіщень було оновлено!',
diff --git a/lang/uk/settings.php b/lang/uk/settings.php
index 3798f1b6078..2435525b953 100644
--- a/lang/uk/settings.php
+++ b/lang/uk/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Не встановлено обмежень',
 
     // Sorting Settings
-    'sorting' => 'Сортування',
-    'sorting_book_default' => 'Типовий порядок сортування',
+    'sorting' => 'Списки і сортування',
+    'sorting_book_default' => 'Типовий порядок сортування книги',
     'sorting_book_default_desc' => 'Виберіть правило сортування за замовчуванням для застосування нових книг. Це не вплине на існуючі книги, і може бути перевизначено для кожної книги.',
     'sorting_rules' => 'Сортувати правила',
     'sorting_rules_desc' => 'Це попередньо визначені операції сортування, які можуть бути застосовані до вмісту в системі.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Дата оновлення',
     'sort_rule_op_chapters_first' => 'Спочатку розділи',
     'sort_rule_op_chapters_last' => 'Розділи останні',
+    'sorting_page_limits' => 'Обмеження відображення сторінок',
+    'sorting_page_limits_desc' => 'Кількість елементів для відображення в різних списках в системі. Зазвичай менша кількість буде більш продуктивною, в той час як більша кількість уникає необхідність натискання на кілька сторінок. Використання кратного 6 рекомендується.',
 
     // Maintenance settings
     'maint' => 'Обслуговування',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Імпортувати вміст',
     'role_editor_change' => 'Змінити редактор сторінок',
     'role_notifications' => 'Отримувати та керувати повідомленнями',
+    'role_permission_note_users_and_roles' => 'Ці дозволи технічно також забезпечать видимість і пошук ролей у системі.',
     'role_asset' => 'Дозволи',
     'roles_system_warning' => 'Майте на увазі, що доступ до будь-якого з вищезазначених трьох дозволів може дозволити користувачеві змінювати власні привілеї або привілеї інших в системі. Ролі з цими дозволами призначайте лише довіреним користувачам.',
     'role_asset_desc' => 'Ці дозволи контролюють стандартні доступи всередині системи. Права на книги, розділи та сторінки перевизначать ці дозволи.',
     'role_asset_admins' => 'Адміністратори автоматично отримують доступ до всього вмісту, але ці параметри можуть відображати або приховувати параметри інтерфейсу користувача.',
     'role_asset_image_view_note' => 'Це стосується видимості в менеджері зображень. Фактичний доступ завантажуваних зображень буде залежний від опції зберігання системних зображень.',
+    'role_asset_users_note' => 'Ці дозволи технічно також забезпечать видимість і пошук користувачів і ролей у системі.',
     'role_all' => 'Все',
     'role_own' => 'Власне',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Контролюється за об\'єктом, до якого вони завантажуються',
+    'role_controlled_by_page_delete' => 'Керується правами доступу для видалення сторінки',
     'role_save' => 'Зберегти роль',
     'role_users' => 'Користувачі в цій ролі',
     'role_users_none' => 'Наразі жоден користувач не призначений для цієї ролі',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Двофакторна аутентифікація додає ще один рівень безпеки для вашого облікового запису.',
     'users_mfa_x_methods' => ':count метод налаштовано|:count методів налаштовано',
     'users_mfa_configure' => 'Налаштувати Методи',
+    'users_mfa_reset' => 'Скинути методи багатофакторної автентифікації',
+    'users_mfa_reset_desc' => 'Це скине та очистить всі налаштовані методи багатофакторної аутентифікації для цього користувача. Якщо багатофакторна аутентифікація обов\'язкова будь-якою зі своїх ролей, то вона буде запитана налаштувати нові способи при наступному вході в систему.',
+    'users_mfa_reset_confirm' => 'Ви впевнені, що хочете скинути багатофакторну аутентифікацію для цього користувача?',
 
     // API Tokens
     'user_api_token_create' => 'Створити токен API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'Тайська',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/uk/validation.php b/lang/uk/validation.php
index 6161aba671a..f2af28c142e 100644
--- a/lang/uk/validation.php
+++ b/lang/uk/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => 'Поле :attribute має містити лише літери та цифри.',
     'array'                => 'Поле :attribute має бути масивом.',
     'backup_codes'         => 'Наданий код є недійсним або вже використаний.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => 'Поле :attribute має містити дату не пізніше :date.',
     'between'              => [
         'numeric' => 'Поле :attribute має бути між :min та :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Поле :attribute повинне містити true чи false.',
     'confirmed'            => 'Поле :attribute не збігається з підтвердженням.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => 'Поле :attribute не є датою.',
     'date_format'          => 'Поле :attribute не відповідає формату :format.',
     'different'            => 'Поля :attribute та :other повинні бути різними.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Не вдалося завантажити файл. Сервер може не приймати файли такого розміру.',
 
     'zip_file' => 'Поле :attribute повинне вказувати файл в ZIP.',
+    'zip_file_size' => 'Файл :attribute не повинен перевищувати :size МБ.',
     'zip_file_mime' => 'Поле :attribute повинне посилатись на файл типу :validtypes, знайдений :foundType.',
     'zip_model_expected' => 'Очікувався об’єкт даних, але знайдено ":type".',
     'zip_unique' => 'Поле :attribute має бути унікальним для типу об\'єкта в ZIP.',
diff --git a/lang/uz/activities.php b/lang/uz/activities.php
index 84764192d77..f87a52870fa 100644
--- a/lang/uz/activities.php
+++ b/lang/uz/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Foydalanuvchi muvaffaqiyatli yangilandi',
     'user_delete' => 'deleted user',
     'user_delete_notification' => 'Foydalanuvchi muvaffaqiyatli olib tashlandi',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'created API token',
diff --git a/lang/uz/auth.php b/lang/uz/auth.php
index 1a22f0f1d33..90e97a1a6f0 100644
--- a/lang/uz/auth.php
+++ b/lang/uz/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Uchbu ma‘lumotlar, bizdagi ma‘lumotlarga mos kelmadi.',
     'throttle' => 'Kirishga urinishlar juda ko‘p. Iltimos :seconds soniyadan so‘ng urinib ko‘ring.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Ro‘yxatdan o‘tish',
@@ -20,6 +21,9 @@
     'username' => 'Foydalanuvchi nomi',
     'email' => 'Elektron pochta',
     'password' => 'Parol',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Parolni tasdiqlash',
     'password_hint' => 'Kamida 8 belgi bo‘lishi kerak',
     'forgot_password' => 'Parolni unutdingizmi?',
@@ -91,7 +95,7 @@
     'mfa_option_totp_title' => 'Mobil ilova',
     'mfa_option_totp_desc' => 'Ko‘p faktorli autentifikatsiyadan foydalanish uchun sizga Google Authenticator, Authy yoki Microsoft Authenticator kabi OTPni qo‘llab-quvvatlaydigan mobil ilova kerak bo‘ladi.',
     'mfa_option_backup_codes_title' => 'Zaxira kodlari',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Shaxsingizni tasdiqlash uchun tizimga kirishda kiritadigan bir martalik zaxira kodlari to\'plamini yaratadi. Bularni xavfsiz va ishonchli joyda saqlang.',
     'mfa_gen_confirm_and_enable' => 'Tasdiqlash va yoqish',
     'mfa_gen_backup_codes_title' => 'Zaxira kodlarini sozlash',
     'mfa_gen_backup_codes_desc' => 'Quyidagi kodlar ro‘yxatini xavfsiz joyda saqlang. Tizimga kirishda siz kodlardan birini ikkinchi autentifikatsiya mexanizmi sifatida ishlatishingiz mumkin.',
diff --git a/lang/uz/common.php b/lang/uz/common.php
index 2c1788bee01..9411502bd73 100644
--- a/lang/uz/common.php
+++ b/lang/uz/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Faol emas',
     'never' => 'Hech qachon',
     'none' => 'Yo‘q',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Bosh sahifa',
diff --git a/lang/uz/entities.php b/lang/uz/entities.php
index e35a485b65d..f8702892617 100644
--- a/lang/uz/entities.php
+++ b/lang/uz/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books. Optionally an auto sort rule can be set to automatically sort this book\'s contents upon changes.',
     'books_sort_auto_sort' => 'Auto Sort Option',
     'books_sort_auto_sort_active' => 'Auto Sort Active: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Kitobni tartiblash: kitob nomi',
     'books_sort_name' => 'Nomi bo\'yicha saralash',
     'books_sort_created' => 'Yaratilgan sana bo\'yicha saralash',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Toggle Sidebar',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Sahifa teglari',
     'chapter_tags' => 'Bo\'lim teglari',
     'book_tags' => 'Kitob teglari',
diff --git a/lang/uz/errors.php b/lang/uz/errors.php
index a0d86c44191..50593eae6bf 100644
--- a/lang/uz/errors.php
+++ b/lang/uz/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Could not read ZIP file.',
     'import_zip_cant_decode_data' => 'Could not find and decode ZIP data.json content.',
     'import_zip_no_data' => 'ZIP file data has no expected book, chapter or page content.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Import ZIP failed to validate with errors:',
     'import_zip_failed_notification' => 'Failed to import ZIP file.',
     'import_perms_books' => 'You are lacking the required permissions to create books.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Foydalanilgan API tokeni uchun berilgan sir notoʻgʻri',
     'api_user_no_api_permission' => 'Foydalanilgan API tokeni egasi API qoʻngʻiroqlarini amalga oshirishga ruxsatga ega emas',
     'api_user_token_expired' => 'Amaldagi avtorizatsiya tokeni muddati tugagan',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Sinov xatini yuborishda xatolik yuz berdi:',
diff --git a/lang/uz/notifications.php b/lang/uz/notifications.php
index bec9b3925e2..ece09441e9c 100644
--- a/lang/uz/notifications.php
+++ b/lang/uz/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => ':pageName sahifasi yangilandi',
     'updated_page_intro' => ':appName ichida sahifa yangilandi:',
     'updated_page_debounce' => 'Xabarnomalar koʻp boʻlishining oldini olish uchun bir muncha vaqt oʻsha muharrir tomonidan ushbu sahifaga keyingi tahrirlar haqida bildirishnomalar yuborilmaydi.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Sahifa nomi:',
     'detail_page_path' => 'Page Path:',
diff --git a/lang/uz/preferences.php b/lang/uz/preferences.php
index de36b953e85..372d2a12351 100644
--- a/lang/uz/preferences.php
+++ b/lang/uz/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Qisqa klavishlar sozlamalari yangilandi!',
     'shortcuts_overview_desc' => 'Tizim foydalanuvchi interfeysida harakatlanish uchun foydalanishingiz mumkin boʻlgan klaviatura yorliqlarini boshqaring.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Bildirishnoma sozlamalari',
     'notifications_desc' => 'Tizimda muayyan harakatlar amalga oshirilganda qabul qilinadigan elektron pochta xabarnomalarini boshqaring.',
     'notifications_opt_own_page_changes' => 'Menga tegishli boʻlgan sahifalarimdagi oʻzgarishlar haqida xabar bering',
     'notifications_opt_own_page_comments' => 'Menga tegishli sahifalardagi sharhlar haqida xabar bering',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Fikrlarimga javoblarim haqida xabar bering',
     'notifications_save' => 'Afzalliklarni saqlash',
     'notifications_update_success' => 'Bildirishnoma sozlamalari yangilandi!',
diff --git a/lang/uz/settings.php b/lang/uz/settings.php
index 83fedc569ef..149af9a4fc9 100644
--- a/lang/uz/settings.php
+++ b/lang/uz/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Cheklov oʻrnatilmagan',
 
     // Sorting Settings
-    'sorting' => 'Sorting',
-    'sorting_book_default' => 'Default Book Sort',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Select the default sort rule to apply to new books. This won\'t affect existing books, and can be overridden per-book.',
     'sorting_rules' => 'Sort Rules',
     'sorting_rules_desc' => 'These are predefined sorting operations which can be applied to content in the system.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Updated Date',
     'sort_rule_op_chapters_first' => 'Chapters First',
     'sort_rule_op_chapters_last' => 'Chapters Last',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Xizmat',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Import content',
     'role_editor_change' => 'Sahifa muharririni o\'zgartirish',
     'role_notifications' => 'Bildirishnomalarni qabul qilish va boshqarish',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Obyektga ruxsatlar',
     'roles_system_warning' => 'Shuni yodda tutingki, yuqoridagi uchta ruxsatdan birortasiga kirish foydalanuvchiga o\'z imtiyozlarini yoki tizimdagi boshqalarning imtiyozlarini o\'zgartirishi mumkin. Ishonchli foydalanuvchilarga faqat ushbu ruxsatlarga ega rollarni tayinlang.',
     'role_asset_desc' => 'Bu ruxsatlar tizim ichidagi aktivlarga standart kirishni nazorat qiladi. Kitoblar, boblar va sahifalardagi ruxsatlar bu ruxsatlarni bekor qiladi.',
     'role_asset_admins' => 'Administratorlarga avtomatik ravishda barcha kontentga kirish huquqi beriladi, lekin bu parametrlar UI parametrlarini koʻrsatishi yoki yashirishi mumkin.',
     'role_asset_image_view_note' => 'Bu tasvir menejeridagi ko\'rinishga tegishli. Yuklangan rasm fayllariga haqiqiy kirish tizim tasvirini saqlash opsiyasiga bog\'liq bo\'ladi.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Hammasi',
     'role_own' => 'Shaxsiy',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Ular yuklangan obyekt tomonidan nazorat qilinadi',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Rolni saqlash',
     'role_users' => 'Ushbu roldagi foydalanuvchilar',
     'role_users_none' => 'Hozirda bu rolga hech qanday foydalanuvchi tayinlanmagan',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Ko\'p faktorli autentifikatsiyani foydalanuvchi hisobingiz uchun qo\'shimcha xavfsizlik qatlami sifatida o\'rnating.',
     'users_mfa_x_methods' => ':count usuli tuzilgan|:count usullari sozlangan',
     'users_mfa_configure' => 'Usullarni sozlash',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'API tokenini yarating',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/uz/validation.php b/lang/uz/validation.php
index d9d0fa0b2af..1ee4dfc01b9 100644
--- a/lang/uz/validation.php
+++ b/lang/uz/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute qiymati faqat harflar va raqamlardan iborat bo‘lishi kerak.',
     'array'                => ':attribute qiymati massiv bo‘lishi kerak.',
     'backup_codes'         => 'Kiritilgan kod to‘g‘ri emas yoki ishlatib bo‘lingan.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute qiymati :date sanadan oldingi sana bo‘lishi kerak.',
     'between'              => [
         'numeric' => ':attribute qiymati :min va :max orasida bo‘lishi kerak.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute qiymati faqat «true» yoki «false» bo`lishi kerak.',
     'confirmed'            => ':attribute tasdiqlash qiymati mos emas.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute qiymati sana emas.',
     'date_format'          => ':attribute qiymati :format formatdagi sana emas.',
     'different'            => ':attribute va :other qiymatlari har xil bo‘lishi kerak.',
@@ -105,10 +107,11 @@
     'url'                  => ':attribute URL formatida emas.',
     'uploaded'             => 'Faylni yuklashda xatolik. Server bunday hajmdagi faylllarni yuklamasligi mumkin.',
 
-    'zip_file' => 'The :attribute needs to reference a file within the ZIP.',
-    'zip_file_mime' => 'The :attribute needs to reference a file of type :validTypes, found :foundType.',
-    'zip_model_expected' => 'Data object expected but ":type" found.',
-    'zip_unique' => 'The :attribute must be unique for the object type within the ZIP.',
+    'zip_file' => ':attribute ZIP ichidagi faylga havola qilishi kerak.',
+    'zip_file_size' => ':attribute fayli :size MB dan oshmasligi kerak.',
+    'zip_file_mime' => ':attribute :validTypes turidagi faylga havola qilishi kerak, lekin :foundType turida keldi.',
+    'zip_model_expected' => 'Ma\'lumotlar obyekti kutilmoqda, ammo ":type" topildi.',
+    'zip_unique' => ':attribute ZIP ichidagi obyekt turi uchun noyob bo\'lishi kerak.',
 
     // Custom validation lines
     'custom' => [
diff --git a/lang/vi/activities.php b/lang/vi/activities.php
index 00ec6ce04d5..0625bb529a5 100644
--- a/lang/vi/activities.php
+++ b/lang/vi/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => 'Người dùng được cập nhật thành công',
     'user_delete' => 'người dùng đã bị xóa',
     'user_delete_notification' => 'Người dùng đã được xóa thành công',
+    'user_mfa_reset' => 'reset MFA for user',
+    'user_mfa_reset_notification' => 'Multi-factor authentication methods reset',
 
     // API Tokens
     'api_token_create' => 'Đã tạo Token API ',
diff --git a/lang/vi/auth.php b/lang/vi/auth.php
index d53d2cf4cb6..e53d16ad639 100644
--- a/lang/vi/auth.php
+++ b/lang/vi/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => 'Thông tin đăng nhập này không khớp với dữ liệu của chúng tôi.',
     'throttle' => 'Quá nhiều lần đăng nhập sai. Vui lòng thử lại sau :seconds giây.',
+    'mfa_throttle' => 'Too many multi-factor verification attempts. Please try again in :seconds seconds.',
 
     // Login & Register
     'sign_up' => 'Đăng ký',
@@ -20,6 +21,9 @@
     'username' => 'Tên đăng nhập',
     'email' => 'Email',
     'password' => 'Mật khẩu',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => 'Xác nhận mật khẩu',
     'password_hint' => 'Phải có ít nhất 8 ký tự',
     'forgot_password' => 'Quên Mật khẩu?',
diff --git a/lang/vi/common.php b/lang/vi/common.php
index 5035788f8fd..af43cadca92 100644
--- a/lang/vi/common.php
+++ b/lang/vi/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => 'Không hoạt động',
     'never' => 'Không bao giờ',
     'none' => 'Không',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => 'Trang chủ',
diff --git a/lang/vi/entities.php b/lang/vi/entities.php
index f538f993ca2..a3f92e03024 100644
--- a/lang/vi/entities.php
+++ b/lang/vi/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => 'Di chuyển các chương và trang trong một cuốn sách để sắp xếp lại nội dung của nó. Các sách khác có thể được thêm vào để dễ dàng di chuyển các chương và trang giữa các sách. Tùy chọn, một quy tắc sắp xếp tự động có thể được đặt để tự động sắp xếp nội dung cuốn sách này khi có thay đổi.',
     'books_sort_auto_sort' => 'Tùy chọn sắp xếp tự động',
     'books_sort_auto_sort_active' => 'Sắp xếp tự động đang hoạt động: :sortName',
+    'books_sort_auto_sort_creation_hint' => 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.',
     'books_sort_named' => 'Sắp xếp sách :bookName',
     'books_sort_name' => 'Sắp xếp theo tên',
     'books_sort_created' => 'Sắp xếp theo ngày tạo',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => 'Chuyển đổi thanh bên',
+    'page_contents' => 'Page Contents',
+    'page_contents_none' => 'No headings were found in the page content.',
+    'page_contents_info' => 'The contents menu is generated from any heading formats used in the page.',
     'page_tags' => 'Các Thẻ Trang',
     'chapter_tags' => 'Các Thẻ Chương',
     'book_tags' => 'Các Thẻ Sách',
diff --git a/lang/vi/errors.php b/lang/vi/errors.php
index bae87dc38cd..18980c17ea2 100644
--- a/lang/vi/errors.php
+++ b/lang/vi/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => 'Không thể đọc tệp ZIP.',
     'import_zip_cant_decode_data' => 'Không thể tìm và giải mã nội dung ZIP data.json.',
     'import_zip_no_data' => 'Dữ liệu tệp ZIP không có nội dung sách, chương hoặc trang mong đợi.',
+    'import_zip_data_too_large' => 'ZIP data.json content exceeds the configured application maximum upload size.',
     'import_validation_failed' => 'Nhập tệp ZIP không hợp lệ với các lỗi:',
     'import_zip_failed_notification' => 'Không thể nhập tệp ZIP.',
     'import_perms_books' => 'Bạn không có quyền cần thiết để tạo sách.',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => 'Mã bí mật được cung cấp cho token API đang được sử dụng không hợp lệ',
     'api_user_no_api_permission' => 'Chủ của token API đang sử dụng không có quyền gọi API',
     'api_user_token_expired' => 'Token sử dụng cho việc ủy quyền đã hết hạn',
+    'api_cookie_auth_only_get' => 'Only GET requests are allowed when using the API with cookie-based authentication',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => 'Lỗi khi gửi email thử:',
diff --git a/lang/vi/notifications.php b/lang/vi/notifications.php
index a18695b2347..45fb4434ffa 100644
--- a/lang/vi/notifications.php
+++ b/lang/vi/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => 'Trang đã cập nhật: :pageName',
     'updated_page_intro' => 'Một trang mới đã được cập nhật trong :appName:',
     'updated_page_debounce' => 'Để tránh việc nhận quá nhiều thông báo, trong một thời gian, bạn sẽ không nhận được thông báo về những chỉnh sửa tiếp theo cho trang này từ cùng một biên tập viên.',
+    'comment_mention_subject' => 'You have been mentioned in a comment on page: :pageName',
+    'comment_mention_intro' => 'You were mentioned in a comment on :appName:',
 
     'detail_page_name' => 'Tên Trang:',
     'detail_page_path' => 'Đường dẫn trang:',
diff --git a/lang/vi/preferences.php b/lang/vi/preferences.php
index 76bc0be16a2..8e019ca9d26 100644
--- a/lang/vi/preferences.php
+++ b/lang/vi/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => 'Các tùy chọn phím tắt đã được cập nhật!',
     'shortcuts_overview_desc' => 'Manage keyboard shortcuts you can use to navigate the system user interface.',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => 'Notification Preferences',
     'notifications_desc' => 'Control the email notifications you receive when certain activity is performed within the system.',
     'notifications_opt_own_page_changes' => 'Notify upon changes to pages I own',
     'notifications_opt_own_page_comments' => 'Notify upon comments on pages I own',
+    'notifications_opt_comment_mentions' => 'Notify when I\'m mentioned in a comment',
     'notifications_opt_comment_replies' => 'Notify upon replies to my comments',
     'notifications_save' => 'Save Preferences',
     'notifications_update_success' => 'Notification preferences have been updated!',
diff --git a/lang/vi/settings.php b/lang/vi/settings.php
index 1ff252702c0..63fbc249ec1 100644
--- a/lang/vi/settings.php
+++ b/lang/vi/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => 'Không có giới hạn nào được thiết lập',
 
     // Sorting Settings
-    'sorting' => 'Sắp xếp',
-    'sorting_book_default' => 'Sắp xếp sách mặc định',
+    'sorting' => 'Lists & Sorting',
+    'sorting_book_default' => 'Default Book Sort Rule',
     'sorting_book_default_desc' => 'Chọn quy tắc sắp xếp mặc định để áp dụng cho sách mới. Điều này sẽ không ảnh hưởng đến các sách hiện có và có thể được ghi đè cho từng sách.',
     'sorting_rules' => 'Quy tắc sắp xếp',
     'sorting_rules_desc' => 'Đây là các thao tác sắp xếp được xác định trước có thể được áp dụng cho nội dung trong hệ thống.',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => 'Ngày cập nhật',
     'sort_rule_op_chapters_first' => 'Chương trước',
     'sort_rule_op_chapters_last' => 'Chương sau',
+    'sorting_page_limits' => 'Per-Page Display Limits',
+    'sorting_page_limits_desc' => 'Set how many items to show per-page in various lists within the system. Typically a lower amount will be more performant, while a higher amount avoids the need to click through multiple pages. Using a multiple of 6 is recommended.',
 
     // Maintenance settings
     'maint' => 'Bảo trì',
@@ -195,14 +197,18 @@
     'role_import_content' => 'Nhập nội dung',
     'role_editor_change' => 'Thay đổi trình soạn thảo trang',
     'role_notifications' => 'Nhận & quản lý thông báo',
+    'role_permission_note_users_and_roles' => 'These permissions will technically also provide visibility & searching of users & roles in the system.',
     'role_asset' => 'Quyền tài sản (asset)',
     'roles_system_warning' => 'Cần lưu ý rằng việc truy cập vào bất kỳ ba quyền trên có thể cho phép người dùng thay đổi đặc quyền của chính họ hoặc đặc quyền của những người khác trong hệ thống. Chỉ gán các vai trò có các quyền này cho những người dùng đáng tin cậy.',
     'role_asset_desc' => 'Các quyền này điều khiển truy cập mặc định tới tài sản (asset) nằm trong hệ thống. Quyền tại Sách, Chương và Trang sẽ ghi đè các quyền này.',
     'role_asset_admins' => 'Quản trị viên được tự động cấp quyền truy cập đến toàn bộ nội dung, tuy nhiên các tùy chọn đó có thể hiện hoặc ẩn tùy chọn giao diện.',
     'role_asset_image_view_note' => 'Điều này liên quan đến khả năng hiển thị trong trình quản lý hình ảnh. Quyền truy cập thực tế vào các tệp hình ảnh đã tải lên sẽ phụ thuộc vào tùy chọn lưu trữ hình ảnh của hệ thống.',
+    'role_asset_users_note' => 'These permissions will technically also provide visibility & searching of users in the system.',
     'role_all' => 'Tất cả',
     'role_own' => 'Sở hữu',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => 'Kiểm soát các tài sản (asset) người dùng tải lên',
+    'role_controlled_by_page_delete' => 'Controlled by page delete permissions',
     'role_save' => 'Lưu Quyền',
     'role_users' => 'Người dùng được gán quyền này',
     'role_users_none' => 'Không có người dùng nào hiện được gán quyền này',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => 'Thiết lập xác thực đa yếu tố như một lớp bảo mật bổ sung cho tài khoản người dùng của bạn.',
     'users_mfa_x_methods' => ':count phương thức đã cấu hình|:count phương thức đã cấu hình',
     'users_mfa_configure' => 'Cấu hình phương thức',
+    'users_mfa_reset' => 'Reset Multi-Factor Authentication Methods',
+    'users_mfa_reset_desc' => 'This will reset and clear all configured multi-factor authentication methods for this user. If multi-factor authentication is required by any of their roles, they\'ll be prompted to configure new methods on their next login.',
+    'users_mfa_reset_confirm' => 'Are you sure you want to reset multi-factor authentication for this user?',
 
     // API Tokens
     'user_api_token_create' => 'Tạo Token API',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => 'ภาษาไทย',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/vi/validation.php b/lang/vi/validation.php
index bc6fc0e39fd..8c6d2d27309 100644
--- a/lang/vi/validation.php
+++ b/lang/vi/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute chỉ được chứa chữ cái hoặc chữ số.',
     'array'                => ':attribute phải là một mảng.',
     'backup_codes'         => 'Mã cung cấp không hợp lệ hoặc đã được sử dụng.',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute phải là một ngày trước :date.',
     'between'              => [
         'numeric' => ':attribute phải nằm trong khoảng :min đến :max.',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => 'Trường :attribute phải có giá trị đúng hoặc sai.',
     'confirmed'            => 'Xác nhận :attribute không khớp.',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute không phải là ngày hợp lệ.',
     'date_format'          => ':attribute không khớp với định dạng :format.',
     'different'            => ':attribute và :other phải khác nhau.',
@@ -106,6 +108,7 @@
     'uploaded'             => 'Tệp tin đã không được tải lên. Máy chủ không chấp nhận các tệp tin với dung lượng lớn như tệp tin trên.',
 
     'zip_file' => ':attribute cần tham chiếu đến một tệp trong ZIP.',
+    'zip_file_size' => 'The file :attribute must not exceed :size MB.',
     'zip_file_mime' => ':attribute cần tham chiếu đến một tệp có kiểu: :validTypes, tìm thấy :foundType.',
     'zip_model_expected' => 'Đối tượng dữ liệu được mong đợi nhưng tìm thấy ":type".',
     'zip_unique' => ':attribute phải là duy nhất cho kiểu đối tượng trong ZIP.',
diff --git a/lang/zh_CN/activities.php b/lang/zh_CN/activities.php
index 08f831f6102..d30e61f0f2a 100644
--- a/lang/zh_CN/activities.php
+++ b/lang/zh_CN/activities.php
@@ -28,22 +28,22 @@
     'chapter_move_notification' => '章节移动成功',
 
     // Books
-    'book_create'                 => '图书已创建',
-    'book_create_notification'    => '成功创建图书',
-    'book_create_from_chapter'              => '将章节转换为图书',
-    'book_create_from_chapter_notification' => '章节已成功转换为图书',
-    'book_update'                 => '图书已更新',
-    'book_update_notification'    => '图书更新成功',
-    'book_delete'                 => '图书已删除',
-    'book_delete_notification'    => '图书删除成功',
-    'book_sort'                   => '图书已排序',
-    'book_sort_notification'      => '图书重新排序成功',
+    'book_create'                 => '书籍已创建',
+    'book_create_notification'    => '成功创建书籍',
+    'book_create_from_chapter'              => '将章节转换为书籍',
+    'book_create_from_chapter_notification' => '章节已成功转换为书籍',
+    'book_update'                 => '书籍已更新',
+    'book_update_notification'    => '书籍更新成功',
+    'book_delete'                 => '书籍已删除',
+    'book_delete_notification'    => '书籍删除成功',
+    'book_sort'                   => '书籍已排序',
+    'book_sort_notification'      => '书籍重新排序成功',
 
     // Bookshelves
     'bookshelf_create'            => '书架已创建',
     'bookshelf_create_notification'    => '书架创建成功',
-    'bookshelf_create_from_book'    => '将图书转换为书架',
-    'bookshelf_create_from_book_notification'    => '图书已成功转换为书架',
+    'bookshelf_create_from_book'    => '将书籍转换为书架',
+    'bookshelf_create_from_book_notification'    => '书籍已成功转换为书架',
     'bookshelf_update'                 => '书架已更新',
     'bookshelf_update_notification'    => '书架更新成功',
     'bookshelf_delete'                 => '书架已删除',
@@ -99,6 +99,8 @@
     'user_update_notification' => '用户更新成功',
     'user_delete' => '用户已删除',
     'user_delete_notification' => '成功移除用户',
+    'user_mfa_reset' => '为用户重置MFA',
+    'user_mfa_reset_notification' => '多因素认证方法已重置',
 
     // API Tokens
     'api_token_create' => '已创建 API 令牌',
diff --git a/lang/zh_CN/auth.php b/lang/zh_CN/auth.php
index 8c4ba63f9e2..f0d265c7a92 100644
--- a/lang/zh_CN/auth.php
+++ b/lang/zh_CN/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => '用户名或密码错误。',
     'throttle' => '您的登录次数过多，请在:seconds秒后重试。',
+    'mfa_throttle' => '多因子认证尝试次数过多，请在 :seconds 秒后重试。',
 
     // Login & Register
     'sign_up' => '注册',
@@ -20,6 +21,9 @@
     'username' => '用户名',
     'email' => 'Email地址',
     'password' => '密码',
+    'password_new' => 'New Password',
+    'password_new_confirm' => 'Confirm New Password',
+    'password_current' => 'Confirm Current Password',
     'password_confirm' => '确认密码',
     'password_hint' => '必须至少有 8 个字符',
     'forgot_password' => '忘记密码?',
diff --git a/lang/zh_CN/common.php b/lang/zh_CN/common.php
index dde4bdf7db0..d016c3d8a46 100644
--- a/lang/zh_CN/common.php
+++ b/lang/zh_CN/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => '未激活',
     'never' => '从未',
     'none' => '无',
+    'move_left' => 'Move Left',
+    'move_right' => 'Move Right',
 
     // Header
     'homepage' => '主页',
diff --git a/lang/zh_CN/editor.php b/lang/zh_CN/editor.php
index 6dbca56e313..4bac4cf0d6b 100644
--- a/lang/zh_CN/editor.php
+++ b/lang/zh_CN/editor.php
@@ -48,7 +48,7 @@
     'superscript' => '上标',
     'subscript' => '下标',
     'text_color' => '文本颜色',
-    'highlight_color' => 'Highlight color',
+    'highlight_color' => '高亮颜色',
     'custom_color' => '自定义颜色',
     'remove_color' => '移除颜色',
     'background_color' => '背景色',
diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php
index 89c23c281c5..bede7fb1c0d 100644
--- a/lang/zh_CN/entities.php
+++ b/lang/zh_CN/entities.php
@@ -46,7 +46,7 @@
     'import' => '导入',
     'import_validate' => '验证导入',
     'import_desc' => '使用便携式 zip 导出从相同或不同的实例导入书籍、章节和页面。选择一个 ZIP 文件以继续。文件上传并验证后，您就可以在下一个视图中配置和确认导入。',
-    'import_zip_select' => '选择要上床的 ZIP 文件',
+    'import_zip_select' => '选择要上传的 ZIP 文件',
     'import_zip_validation_errors' => '验证提供的 ZIP 文件时检测到错误:',
     'import_pending' => '等待导入',
     'import_pending_none' => '尚未开始导入。',
@@ -63,10 +63,10 @@
     'import_delete_desc' => '这将删除上传的ZIP文件，不能撤消。',
     'import_errors' => '导入错误',
     'import_errors_desc' => '在尝试导入过程中出现了以下错误:',
-    'breadcrumb_siblings_for_page' => 'Navigate siblings for page',
-    'breadcrumb_siblings_for_chapter' => 'Navigate siblings for chapter',
-    'breadcrumb_siblings_for_book' => 'Navigate siblings for book',
-    'breadcrumb_siblings_for_bookshelf' => 'Navigate siblings for shelf',
+    'breadcrumb_siblings_for_page' => '导航页面',
+    'breadcrumb_siblings_for_chapter' => '导航章节',
+    'breadcrumb_siblings_for_book' => '导航书籍',
+    'breadcrumb_siblings_for_bookshelf' => '导航书架',
 
     // Permissions and restrictions
     'permissions' => '权限',
@@ -121,79 +121,80 @@
     'shelves_save' => '保存书架',
     'shelves_books' => '书籍已在此书架里',
     'shelves_add_books' => '将书籍加入此书架',
-    'shelves_drag_books' => '拖动下面的图书将其添加到此书架',
-    'shelves_empty_contents' => '这个书架没有分配图书',
-    'shelves_edit_and_assign' => '编辑书架以分配图书',
+    'shelves_drag_books' => '拖动下面的书籍将其添加到此书架',
+    'shelves_empty_contents' => '这个书架没有分配书籍',
+    'shelves_edit_and_assign' => '编辑书架以分配书籍',
     'shelves_edit_named' => '编辑书架 :name',
     'shelves_edit' => '编辑书架',
     'shelves_delete' => '删除书架',
     'shelves_delete_named' => '删除书架 :name',
-    'shelves_delete_explain' => "此操作将删除书架 ”:name”。书架中的图书不会被删除。",
+    'shelves_delete_explain' => "此操作将删除书架 ”:name”。书架中的书籍不会被删除。",
     'shelves_delete_confirmation' => '您确定要删除此书架吗？',
     'shelves_permissions' => '书架权限',
     'shelves_permissions_updated' => '书架权限已更新',
     'shelves_permissions_active' => '书架权限已启用',
-    'shelves_permissions_cascade_warning' => '书架上的权限不会自动应用到书架里的图书上，这是因为图书可以在多个书架上存在。使用下面的选项可以将权限复制到书架里的图书上。',
-    'shelves_permissions_create' => '书架创建权限仅用于使用下面的操作将权限复制到子图书。这个权限不是用来控制创建书籍的。',
-    'shelves_copy_permissions_to_books' => '将权限复制到图书',
+    'shelves_permissions_cascade_warning' => '书架上的权限不会自动应用到书架里的书籍上，这是因为书籍可以在多个书架上存在。使用下面的选项可以将权限复制到书架里的书籍上。',
+    'shelves_permissions_create' => '书架创建权限仅用于使用下面的操作将权限复制到子书籍。这个权限不是用来控制创建书籍的。',
+    'shelves_copy_permissions_to_books' => '将权限复制到书籍',
     'shelves_copy_permissions' => '复制权限',
-    'shelves_copy_permissions_explain' => '此操作会将此书架的当前权限设置应用于其中包含的所有图书上。 启用前请确保已保存对此书架权限的任何更改。',
-    'shelves_copy_permission_success' => '书架权限已复制到 :count 本图书上',
+    'shelves_copy_permissions_explain' => '此操作会将此书架的当前权限设置应用于其中包含的所有书籍上。 启用前请确保已保存对此书架权限的任何更改。',
+    'shelves_copy_permission_success' => '书架权限已复制到 :count 本书籍上',
 
     // Books
-    'book' => '图书',
-    'books' => '图书',
+    'book' => '书籍',
+    'books' => '书籍',
     'x_books' => ':count 本书',
     'books_empty' => '不存在已创建的书',
-    'books_popular' => '热门图书',
+    'books_popular' => '热门书籍',
     'books_recent' => '最近的书',
     'books_new' => '新书',
     'books_new_action' => '新书',
-    'books_popular_empty' => '最受欢迎的图书将出现在这里。',
-    'books_new_empty' => '最近创建的图书将出现在这里。',
-    'books_create' => '创建图书',
-    'books_delete' => '删除图书',
-    'books_delete_named' => '删除图书「:bookName」',
-    'books_delete_explain' => '此操作将删除图书 “:bookName”。图书中的所有的章节和页面都会被删除。',
-    'books_delete_confirmation' => '您确定要删除此图书吗？',
-    'books_edit' => '编辑图书',
-    'books_edit_named' => '编辑图书「:bookName」',
+    'books_popular_empty' => '最受欢迎的书籍将出现在这里。',
+    'books_new_empty' => '最近创建的书籍将出现在这里。',
+    'books_create' => '创建书籍',
+    'books_delete' => '删除书籍',
+    'books_delete_named' => '删除书籍「:bookName」',
+    'books_delete_explain' => '此操作将删除书籍 “:bookName”。书籍中的所有的章节和页面都会被删除。',
+    'books_delete_confirmation' => '您确定要删除此书籍吗？',
+    'books_edit' => '编辑书籍',
+    'books_edit_named' => '编辑书籍「:bookName」',
     'books_form_book_name' => '书名',
-    'books_save' => '保存图书',
-    'books_permissions' => '图书权限',
-    'books_permissions_updated' => '图书权限已更新',
+    'books_save' => '保存书籍',
+    'books_permissions' => '书籍权限',
+    'books_permissions_updated' => '书籍权限已更新',
     'books_empty_contents' => '本书目前没有页面或章节。',
     'books_empty_create_page' => '创建页面',
-    'books_empty_sort_current_book' => '排序当前图书',
+    'books_empty_sort_current_book' => '排序当前书籍',
     'books_empty_add_chapter' => '添加章节',
-    'books_permissions_active' => '图书权限已启用',
+    'books_permissions_active' => '书籍权限已启用',
     'books_search_this' => '搜索这本书',
-    'books_navigation' => '图书导航',
-    'books_sort' => '排序图书内容',
+    'books_navigation' => '书籍导航',
+    'books_sort' => '排序书籍内容',
     'books_sort_desc' => '在书籍内部移动章节与页面以重组内容；支持添加其他书籍，实现跨书籍便捷移动章节与页面；还可设置自动排序规则，在内容发生变更时自动对本书内容进行排序。',
     'books_sort_auto_sort' => '自动排序选项',
     'books_sort_auto_sort_active' => '自动排序已激活：::sortName',
-    'books_sort_named' => '排序图书「:bookName」',
+    'books_sort_auto_sort_creation_hint' => '具备相关权限的用户可在 “列表与排序” 设置区域中创建自动排序选项规则。',
+    'books_sort_named' => '排序书籍「:bookName」',
     'books_sort_name' => '按名称排序',
     'books_sort_created' => '创建时间排序',
     'books_sort_updated' => '按更新时间排序',
     'books_sort_chapters_first' => '章节正序',
     'books_sort_chapters_last' => '章节倒序',
-    'books_sort_show_other' => '显示其他图书',
+    'books_sort_show_other' => '显示其他书籍',
     'books_sort_save' => '保存新顺序',
-    'books_sort_show_other_desc' => '在此添加其他图书进入排序界面，这样就可以轻松跨图书重新排序。',
+    'books_sort_show_other_desc' => '在此添加其他书籍进入排序界面，这样就可以轻松跨书籍重新排序。',
     'books_sort_move_up' => '上移',
     'books_sort_move_down' => '下移',
-    'books_sort_move_prev_book' => '移动到上一图书',
-    'books_sort_move_next_book' => '移动到下一图书',
+    'books_sort_move_prev_book' => '移动到上一书籍',
+    'books_sort_move_next_book' => '移动到下一书籍',
     'books_sort_move_prev_chapter' => '移动到上一章节',
     'books_sort_move_next_chapter' => '移动到下一章节',
-    'books_sort_move_book_start' => '移动到图书开头',
-    'books_sort_move_book_end' => '移动到图书结尾',
+    'books_sort_move_book_start' => '移动到书籍开头',
+    'books_sort_move_book_end' => '移动到书籍结尾',
     'books_sort_move_before_chapter' => '移动到章节前',
     'books_sort_move_after_chapter' => '移至章节后',
-    'books_copy' => '复制图书',
-    'books_copy_success' => '图书已成功复制',
+    'books_copy' => '复制书籍',
+    'books_copy_success' => '书籍已成功复制',
 
     // Chapters
     'chapter' => '章节',
@@ -218,7 +219,7 @@
     'chapters_permissions_active' => '章节权限已启用',
     'chapters_permissions_success' => '章节权限已更新',
     'chapters_search_this' => '从本章节搜索',
-    'chapter_sort_book' => '排序图书',
+    'chapter_sort_book' => '排序书籍',
 
     // Pages
     'page' => '页面',
@@ -330,9 +331,12 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '切换侧边栏',
+    'page_contents' => '页面内容',
+    'page_contents_none' => '未在页面内容中找到任何标题。',
+    'page_contents_info' => '目录是根据页面中使用的所有标题格式生成的。',
     'page_tags' => '页面标签',
     'chapter_tags' => '章节标签',
-    'book_tags' => '图书标签',
+    'book_tags' => '书籍标签',
     'shelf_tags' => '书架标签',
     'tag' => '标签',
     'tags' =>  '标签',
@@ -345,13 +349,13 @@
     'tags_usages' => '标签总使用量',
     'tags_assigned_pages' => '有这个标签的页面',
     'tags_assigned_chapters' => '有这个标签的章节',
-    'tags_assigned_books' => '有这个标签的图书',
+    'tags_assigned_books' => '有这个标签的书籍',
     'tags_assigned_shelves' => '有这个标签的书架',
     'tags_x_unique_values' => ':count 个不重复项目',
     'tags_all_values' => '所有值',
     'tags_view_tags' => '查看标签',
     'tags_view_existing_tags' => '查看已有的标签',
-    'tags_list_empty_hint' => '您可以在页面编辑器的侧边栏添加标签，或者在编辑图书、章节、书架时添加。',
+    'tags_list_empty_hint' => '您可以在页面编辑器的侧边栏添加标签，或者在编辑书籍、章节、书架时添加。',
     'attachments' => '附件',
     'attachments_explain' => '上传一些文件或附加一些链接显示在您的网页上。这些在页面的侧边栏中可见。',
     'attachments_explain_instant_save' => '这里的更改将立即保存。',
@@ -390,7 +394,7 @@
     'profile_created_content' => '已创建内容',
     'profile_not_created_pages' => ':userName尚未创建任何页面',
     'profile_not_created_chapters' => ':userName尚未创建任何章节',
-    'profile_not_created_books' => ':userName尚未创建任何图书',
+    'profile_not_created_books' => ':userName尚未创建任何书籍',
     'profile_not_created_shelves' => ':userName 尚未创建任何书架',
 
     // Comments
@@ -399,7 +403,7 @@
     'comment_add' => '添加评论',
     'comment_none' => '没有要显示的评论',
     'comment_placeholder' => '在这里评论',
-    'comment_thread_count' => ':count Comment Thread|:count Comment Threads',
+    'comment_thread_count' => ':count 条',
     'comment_archived_count' => ':count 条评论已存档',
     'comment_archived_threads' => '已存档的贴子',
     'comment_save' => '保存评论',
@@ -435,13 +439,13 @@
 
     // Conversions
     'convert_to_shelf' => '转换为书架',
-    'convert_to_shelf_contents_desc' => '你可以将这本书转换为具有相同内容的新书架。本书中的章节将被转换为图书。如果这本书包含有任何不在章节分类中的页面，那么将会有一本单独的图书包含这些页面，这本书也将成为新书架的一部分。',
-    'convert_to_shelf_permissions_desc' => '在这本书上设置的任何权限都将复制到所有未强制执行权限的新书架和新子图书上。请注意，书架上的权限不会像图书那样继承到内容物上。',
-    'convert_book' => '转换图书',
-    'convert_book_confirm' => '您确定要转换此图书吗？',
+    'convert_to_shelf_contents_desc' => '你可以将这本书转换为具有相同内容的新书架。本书中的章节将被转换为书籍。如果这本书包含有任何不在章节分类中的页面，那么将会有一本单独的书籍包含这些页面，这本书也将成为新书架的一部分。',
+    'convert_to_shelf_permissions_desc' => '在这本书上设置的任何权限都将复制到所有未强制执行权限的新书架和新子书籍上。请注意，书架上的权限不会像书籍那样继承到内容物上。',
+    'convert_book' => '转换书籍',
+    'convert_book_confirm' => '您确定要转换此书籍吗？',
     'convert_undo_warning' => '这可不能轻易撤消。',
-    'convert_to_book' => '转换为图书',
-    'convert_to_book_desc' => '您可以将此章节转换为具有相同内容的新图书。此章节中设置的任何权限都将复制到新图书上，但从父图书继承的任何权限都不会被复制，这可能会导致访问控制发生变化。',
+    'convert_to_book' => '转换为书籍',
+    'convert_to_book_desc' => '您可以将此章节转换为具有相同内容的新书籍。此章节中设置的任何权限都将复制到新书籍上，但从父书籍继承的任何权限都不会被复制，这可能会导致访问控制发生变化。',
     'convert_chapter' => '转换章节',
     'convert_chapter_confirm' => '您确定要转换此章节吗？',
 
@@ -469,8 +473,8 @@
     'watch_detail_new' => '已关注新页面',
     'watch_detail_updates' => '已关注新页面和更新',
     'watch_detail_comments' => '已关注新页面、更新和评论',
-    'watch_detail_parent_book' => '已关注—继承自父图书',
-    'watch_detail_parent_book_ignore' => '已忽略—继承自父图书',
+    'watch_detail_parent_book' => '已关注—继承自父书籍',
+    'watch_detail_parent_book_ignore' => '已忽略—继承自父书籍',
     'watch_detail_parent_chapter' => '已关注—继承自父章节',
     'watch_detail_parent_chapter_ignore' => '已忽略—继承自父章节',
 ];
diff --git a/lang/zh_CN/errors.php b/lang/zh_CN/errors.php
index 37ef86af551..98b26407233 100644
--- a/lang/zh_CN/errors.php
+++ b/lang/zh_CN/errors.php
@@ -68,11 +68,11 @@
     // Entities
     'entity_not_found' => '未找到项目',
     'bookshelf_not_found' => '未找到书架',
-    'book_not_found' => '未找到图书',
+    'book_not_found' => '未找到书籍',
     'page_not_found' => '未找到页面',
     'chapter_not_found' => '未找到章节',
     'selected_book_not_found' => '选中的书未找到',
-    'selected_book_chapter_not_found' => '未找到所选的图书或章节',
+    'selected_book_chapter_not_found' => '未找到所选的书籍或章节',
     'guests_cannot_save_drafts' => '访客不能保存草稿',
 
     // Users
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => '无法读取 ZIP 文件。',
     'import_zip_cant_decode_data' => '无法找到并解码 ZIP data.json 内容。',
     'import_zip_no_data' => 'ZIP 文件数据没有预期的书籍、章节或页面内容。',
+    'import_zip_data_too_large' => '超出最大上传大小。',
     'import_validation_failed' => '导入 ZIP 验证失败，出现错误：',
     'import_zip_failed_notification' => 'ZIP 文件导入失败。',
     'import_perms_books' => '您缺少创建书籍所需的权限。',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => '给已给出的API所提供的密钥不正确',
     'api_user_no_api_permission' => '使用过的 API 令牌的所有者没有进行API 调用的权限',
     'api_user_token_expired' => '所使用的身份令牌已过期',
+    'api_cookie_auth_only_get' => '使用基于 Cookie 的身份验证 API 时，仅允许 GET 请求。',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => '发送测试电子邮件时出现错误：',
diff --git a/lang/zh_CN/notifications.php b/lang/zh_CN/notifications.php
index 52c9822bc2a..55fa6824a5a 100644
--- a/lang/zh_CN/notifications.php
+++ b/lang/zh_CN/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => '页面更新：:pageName',
     'updated_page_intro' => ':appName: 中的一个页面已被更新',
     'updated_page_debounce' => '为了防止出现大量通知，一段时间内您不会收到同一编辑者再次编辑本页面的通知。',
+    'comment_mention_subject' => '在页面中被提及：:pageName',
+    'comment_mention_intro' => '在 :appName 中被提及：',
 
     'detail_page_name' => '页面名称：',
     'detail_page_path' => '页面路径：',
diff --git a/lang/zh_CN/preferences.php b/lang/zh_CN/preferences.php
index f1ef3957d1e..ba981b3be14 100644
--- a/lang/zh_CN/preferences.php
+++ b/lang/zh_CN/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => '快捷键设置已更新！',
     'shortcuts_overview_desc' => '管理可用于导航系统用户界面的快捷键。',
 
+    'interface' => 'Interface Preferences',
+    'interface_desc' => 'Here you can find options to customize the appearance of the application user interface.',
+    'interface_display_mode' => 'Display Mode',
+    'interface_display_mode_desc' => 'Choose whether the application should show in dark or light mode. This can also be toggled from the home view, or via the profile dropdown in the header bar.',
+    'layouts' => 'UI Layout Preferences',
+    'layouts_desc' => 'Customize the layout of sections shown in the user interface for a range of views.',
+    'layout_edit' => 'Edit Layout',
+    'layout_edit_desc' => 'Drag and drop sections, or use the action menu found on each, to reconfigure which sections show within this layout in the interface, and where they are displayed.',
+    'layout_edit_column_hint' => 'When viewed on smaller screen sizes, right column sections will be stacked on top of left column sections.',
+    'layout_edit_save' => 'Save Layout',
+    'layout_edit_layouts' => 'Layouts',
+    'layout_edit_back_to_preferences' => 'Back to Preferences',
+    'layout_edit_left' => 'Left',
+    'layout_edit_right' => 'Right',
+    'layout_edit_center' => 'Center',
+    'layout_edit_unused' => 'Unused',
+    'layout_edit_empty' => 'No sections to display',
+    'layout_edit_reset_to_defaults' => 'Reset to Default',
+    'layout_update_success' => 'Layout preferences have been updated!',
+    'layout_reset_success' => 'Layout preferences have been reset!',
+
     'notifications' => '通知偏好',
     'notifications_desc' => '控制在系统内发生某些活动时您会收到的电子邮件通知。',
     'notifications_opt_own_page_changes' => '在我拥有的页面被修改时通知我',
     'notifications_opt_own_page_comments' => '在我拥有的页面上有新评论时通知我',
+    'notifications_opt_comment_mentions' => '当我在评论中被提及时通知我',
     'notifications_opt_comment_replies' => '在有人回复我的频率时通知我',
     'notifications_save' => '保存偏好设置',
     'notifications_update_success' => '通知偏好设置已更新！',
diff --git a/lang/zh_CN/settings.php b/lang/zh_CN/settings.php
index 2114c36480c..5e431ca4282 100644
--- a/lang/zh_CN/settings.php
+++ b/lang/zh_CN/settings.php
@@ -55,7 +55,7 @@
     'link_color' => '默认链接颜色',
     'content_colors_desc' => '为页面组织层次结构中的所有元素设置颜色。为了便于阅读，建议选择与默认颜色亮度相似的颜色。',
     'bookshelf_color' => '书架颜色',
-    'book_color' => '图书颜色',
+    'book_color' => '书籍颜色',
     'chapter_color' => '章节颜色',
     'page_color' => '页面颜色',
     'page_draft_color' => '页面草稿颜色',
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => '尚未设置限制',
 
     // Sorting Settings
-    'sorting' => '排序',
-    'sorting_book_default' => '默认书卷排序',
+    'sorting' => '列表和排序',
+    'sorting_book_default' => '默认排序规则',
     'sorting_book_default_desc' => '选择要应用于新书的默认排序规则。这不会影响现有书，并且可以每本书覆盖。',
     'sorting_rules' => '排序规则',
     'sorting_rules_desc' => '这些是预定义的排序操作，可应用于系统中的内容。',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => '更新时间',
     'sort_rule_op_chapters_first' => '章节正序',
     'sort_rule_op_chapters_last' => '章节倒序',
+    'sorting_page_limits' => '每页显示限制',
+    'sorting_page_limits_desc' => '设置系统内各列表的单页显示数量。通常较少的数据量性能更佳，较多的数量则能减少用户的翻页操作。建议设置为 6 的倍数。',
 
     // Maintenance settings
     'maint' => '维护',
@@ -186,8 +188,8 @@
     'role_system' => '系统权限',
     'role_manage_users' => '管理用户',
     'role_manage_roles' => '管理角色与角色权限',
-    'role_manage_entity_permissions' => '管理所有图书、章节和页面的权限',
-    'role_manage_own_entity_permissions' => '管理自己的图书、章节和页面的权限',
+    'role_manage_entity_permissions' => '管理所有书籍、章节和页面的权限',
+    'role_manage_own_entity_permissions' => '管理自己的书籍、章节和页面的权限',
     'role_manage_page_templates' => '管理页面模板',
     'role_access_api' => '访问系统 API',
     'role_manage_settings' => '管理 App 设置',
@@ -195,14 +197,18 @@
     'role_import_content' => '导入内容',
     'role_editor_change' => '更改页面编辑器',
     'role_notifications' => '管理和接收通知',
+    'role_permission_note_users_and_roles' => '从技术上讲，这些权限还将提供对系统中用户和角色的可见性和搜索功能。',
     'role_asset' => '资源许可',
     'roles_system_warning' => '请注意，拥有以上三个权限中的任何一个都会允许用户更改自己的权限或系统中其他人的权限。 请只将拥有这些权限的角色分配给你信任的用户。',
     'role_asset_desc' => '对系统内资源的默认访问许可将由这些权限控制。单独设置在书籍、章节和页面上的权限将覆盖这里的权限设定。',
     'role_asset_admins' => '管理员可自动获得对所有内容的访问权限，但这些选项可能会显示或隐藏UI选项。',
     'role_asset_image_view_note' => '这与图像管理器中的可见性有关。已经上传的图片的实际访问取决于系统图像存储选项。',
+    'role_asset_users_note' => '从技术上讲，这些权限还将提供对系统中用户和角色的可见性和搜索功能。',
     'role_all' => '全部的',
     'role_own' => '拥有的',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => '由其所在的资源来控制',
+    'role_controlled_by_page_delete' => '受页面删除权限限制',
     'role_save' => '保存角色',
     'role_users' => '此角色的用户',
     'role_users_none' => '目前没有用户被分配到这个角色',
@@ -259,6 +265,9 @@
     'users_mfa_desc' => '设置多重身份认证能增加您账户的安全性。',
     'users_mfa_x_methods' => ':count 个措施已配置|:count 个措施已配置',
     'users_mfa_configure' => '配置安全措施',
+    'users_mfa_reset' => '重置多重身份验证方法',
+    'users_mfa_reset_desc' => '此操作将重置并清除该用户所有已配置的多重身份验证方法。如果多重身份验证是任何角色所要求的，用户在下次登录时将被提示配置新的方法。',
+    'users_mfa_reset_confirm' => '您确定要重置此用户的多重身份验证吗？',
 
     // API Tokens
     'user_api_token_create' => '创建 API 令牌',
@@ -358,7 +367,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => '泰语',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/zh_CN/validation.php b/lang/zh_CN/validation.php
index 1a576e6bca4..fdbd5a0bdef 100644
--- a/lang/zh_CN/validation.php
+++ b/lang/zh_CN/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute 只能包含字母和数字。',
     'array'                => ':attribute 必须是一个数组。',
     'backup_codes'         => '您输入的认证码无效或已被使用。',
+    'base64_uri_mime'      => 'The :attribute must be a valid base64 URI containing data of :mime mime type.',
     'before'               => ':attribute 必须是在 :date 前的日期。',
     'between'              => [
         'numeric' => ':attribute 必须在 :min 到 :max 之间。',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute 字段必须为真或假。',
     'confirmed'            => ':attribute 确认不符。',
+    'current_password'     => 'This does not match your current password.',
     'date'                 => ':attribute 不是一个有效的日期。',
     'date_format'          => ':attribute 不匹配格式 :format。',
     'different'            => ':attribute 和 :other 必须不同。',
@@ -106,6 +108,7 @@
     'uploaded'             => '无法上传文件。 服务器可能不接受此大小的文件。',
 
     'zip_file' => ':attribute 需要引用 ZIP 内的文件。',
+    'zip_file_size' => ':attribute 不能超过 :size MB 。',
     'zip_file_mime' => ':attribute 需要引用类型为 :validTypes 的文件，找到 :foundType 。',
     'zip_model_expected' => '预期的数据对象，但找到了 ":type" 。',
     'zip_unique' => '对于 ZIP 中的对象类型来说，:attribute 必须是唯一的。',
diff --git a/lang/zh_TW/activities.php b/lang/zh_TW/activities.php
index 65ba0a56597..ac1524ec433 100644
--- a/lang/zh_TW/activities.php
+++ b/lang/zh_TW/activities.php
@@ -99,6 +99,8 @@
     'user_update_notification' => '使用者已成功更新。',
     'user_delete' => '已刪除使用者',
     'user_delete_notification' => '使用者移除成功',
+    'user_mfa_reset' => '重設使用者的多要素驗證',
+    'user_mfa_reset_notification' => '重設多要素驗證方法',
 
     // API Tokens
     'api_token_create' => '建立 API 權杖',
diff --git a/lang/zh_TW/auth.php b/lang/zh_TW/auth.php
index 1168b48b270..8f5bb91c548 100644
--- a/lang/zh_TW/auth.php
+++ b/lang/zh_TW/auth.php
@@ -8,6 +8,7 @@
 
     'failed' => '使用者名稱或密碼錯誤。',
     'throttle' => '您的登入次數過多，請在 :seconds 秒後重試。',
+    'mfa_throttle' => '多要素驗證嘗試次數過多。請於 :seconds 秒後再試。',
 
     // Login & Register
     'sign_up' => '註冊',
@@ -20,6 +21,9 @@
     'username' => '使用者名稱',
     'email' => '電子郵件',
     'password' => '密碼',
+    'password_new' => '新密碼',
+    'password_new_confirm' => '確認新密碼',
+    'password_current' => '確認目前密碼',
     'password_confirm' => '確認密碼',
     'password_hint' => '密碼必須至少8個字元',
     'forgot_password' => '忘記密碼？',
diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php
index 46e749fd60b..7acb7803c6e 100644
--- a/lang/zh_TW/common.php
+++ b/lang/zh_TW/common.php
@@ -84,6 +84,8 @@
     'status_inactive' => '未啟用',
     'never' => '永不',
     'none' => '無',
+    'move_left' => '左移',
+    'move_right' => '右移',
 
     // Header
     'homepage' => '首頁',
diff --git a/lang/zh_TW/entities.php b/lang/zh_TW/entities.php
index 46bbe62f973..4c5cfed1de2 100644
--- a/lang/zh_TW/entities.php
+++ b/lang/zh_TW/entities.php
@@ -173,6 +173,7 @@
     'books_sort_desc' => '在書籍中移動章節和頁面，重新安排其內容。可加入其他書籍，方便在書籍之間移動章節與頁面。可選擇設定自動排序規則，以便在變更時自動排序此書籍的內容。',
     'books_sort_auto_sort' => '自動排序選項',
     'books_sort_auto_sort_active' => '自動排序啟動：:sortName',
+    'books_sort_auto_sort_creation_hint' => '具備相關權限的使用者可在「清單與排序」設定區域中建立自動排序選項規則。',
     'books_sort_named' => '排序書本 :bookName',
     'books_sort_name' => '按名稱排序',
     'books_sort_created' => '按建立時間排序',
@@ -330,6 +331,9 @@
 
     // Editor Sidebar
     'toggle_sidebar' => '切換側邊欄',
+    'page_contents' => '頁面內容',
+    'page_contents_none' => '在頁面內容中未找到任何標題。',
+    'page_contents_info' => '內容選單是根據頁面中使用的任何標題格式所產生的。',
     'page_tags' => '頁面標籤',
     'chapter_tags' => '章節標籤',
     'book_tags' => '書本標籤',
diff --git a/lang/zh_TW/errors.php b/lang/zh_TW/errors.php
index d4239ed6c64..989ab0ad04f 100644
--- a/lang/zh_TW/errors.php
+++ b/lang/zh_TW/errors.php
@@ -109,6 +109,7 @@
     'import_zip_cant_read' => '無法讀取 ZIP 檔案。',
     'import_zip_cant_decode_data' => '無法尋找並解碼 ZIP data.json 內容。',
     'import_zip_no_data' => 'ZIP 檔案資料沒有預期的書本、章節或頁面內容。',
+    'import_zip_data_too_large' => 'ZIP 檔案 data.json 的內容超過了設定的應用程式最大上傳大小。',
     'import_validation_failed' => '匯入 ZIP 驗證失敗，發生錯誤：',
     'import_zip_failed_notification' => '匯入 ZIP 檔案失敗。',
     'import_perms_books' => '您缺乏建立書本所需的權限。',
@@ -124,6 +125,7 @@
     'api_incorrect_token_secret' => '給定使用的 API 權杖的密碼錯誤',
     'api_user_no_api_permission' => '使用的 API 權杖擁有者無權呼叫 API',
     'api_user_token_expired' => '使用的授權權杖已過期',
+    'api_cookie_auth_only_get' => '使用以 cookie 為基礎的驗證來呼叫 API 時，僅允許 GET 請求',
 
     // Settings & Maintenance
     'maintenance_test_email_failure' => '寄送測試電子郵件時發生錯誤:',
diff --git a/lang/zh_TW/notifications.php b/lang/zh_TW/notifications.php
index 7fcfa640090..feacf13b4fd 100644
--- a/lang/zh_TW/notifications.php
+++ b/lang/zh_TW/notifications.php
@@ -11,6 +11,8 @@
     'updated_page_subject' => '頁面更新：:pageName',
     'updated_page_intro' => ':appName: 中的一個頁面已被更新',
     'updated_page_debounce' => '為了防止出現大量通知，一段時間內您不會收到同一編輯者再次編輯本頁面的通知。',
+    'comment_mention_subject' => '您在以下頁面的留言中被提及：:pageName',
+    'comment_mention_intro' => '您再在 :appName: 的留言中被提及',
 
     'detail_page_name' => '頁面名稱:',
     'detail_page_path' => '頁面路徑：',
diff --git a/lang/zh_TW/preferences.php b/lang/zh_TW/preferences.php
index 4900ca15264..2dd6a8a48d0 100644
--- a/lang/zh_TW/preferences.php
+++ b/lang/zh_TW/preferences.php
@@ -19,10 +19,32 @@
     'shortcuts_update_success' => '快捷鍵偏好設定已更新！',
     'shortcuts_overview_desc' => '你可使用鍵盤快速鍵來快速瀏覽系統界面',
 
+    'interface' => '介面偏好設定',
+    'interface_desc' => '您可以在此處找到用來自訂應用程式使用者介面外觀的選項。',
+    'interface_display_mode' => '顯示模式',
+    'interface_display_mode_desc' => '選擇應用程式應以深色模式或淺色模式顯示。此設定亦可從首頁畫面，或透過頂部工具列中的個人設定下拉選單進行切換。',
+    'layouts' => '使用者介面版面配置偏好設定',
+    'layouts_desc' => '自訂各種檢視模式下，使用者介面中顯示的區塊版面配置。',
+    'layout_edit' => '編輯版面配置',
+    'layout_edit_desc' => '您可以拖放各區塊，或使用每個區塊上的動作選單，重新設定介面中此版面配置內要顯示哪些區塊，以及它們的顯示位置。',
+    'layout_edit_column_hint' => '在較小的螢幕上瀏覽時，右側欄的區塊會疊放在左側欄的區塊之上。',
+    'layout_edit_save' => '儲存版面配置',
+    'layout_edit_layouts' => '版面配置',
+    'layout_edit_back_to_preferences' => '回到偏好設定',
+    'layout_edit_left' => '左側',
+    'layout_edit_right' => '右側',
+    'layout_edit_center' => '置中',
+    'layout_edit_unused' => '未使用',
+    'layout_edit_empty' => '沒有要顯示的區塊',
+    'layout_edit_reset_to_defaults' => '重設為預設值',
+    'layout_update_success' => '版面配置偏好設定已更新！',
+    'layout_reset_success' => '版面配置偏好設定已重設！',
+
     'notifications' => '通知設定',
     'notifications_desc' => '控制在系統有特定活動時，是否要接收電子郵件通知',
     'notifications_opt_own_page_changes' => '當我的頁面有異動時發送通知',
     'notifications_opt_own_page_comments' => '當我的頁面有評論時發送通知',
+    'notifications_opt_comment_mentions' => '當我在留言中被提及時通知我',
     'notifications_opt_comment_replies' => '當我的評論有新的回覆時發送通知',
     'notifications_save' => '儲存偏好設定',
     'notifications_update_success' => '通知設定已更新',
diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php
index 752d3f2a74e..350d2ccbec5 100644
--- a/lang/zh_TW/settings.php
+++ b/lang/zh_TW/settings.php
@@ -75,8 +75,8 @@
     'reg_confirm_restrict_domain_placeholder' => '尚未設定限制',
 
     // Sorting Settings
-    'sorting' => '排序',
-    'sorting_book_default' => '預設書籍排序',
+    'sorting' => '清單與排序',
+    'sorting_book_default' => '預設書籍排序規則',
     'sorting_book_default_desc' => '選取要套用至新書籍的預設排序規則。這不會影響現有書籍，並可按書籍覆寫。',
     'sorting_rules' => '排序規則',
     'sorting_rules_desc' => '這些是預先定義的排序作業，可套用於系統中的內容。',
@@ -103,6 +103,8 @@
     'sort_rule_op_updated_date' => '更新日期',
     'sort_rule_op_chapters_first' => '第一章',
     'sort_rule_op_chapters_last' => '最後一章',
+    'sorting_page_limits' => '每頁顯示限制',
+    'sorting_page_limits_desc' => '設定系統內各清單每頁顯示的項目數量。通常項目數量較少時效能較佳，而數量較多則可避免使用者需點擊多頁瀏覽。建議採用 6 的倍數。',
 
     // Maintenance settings
     'maint' => '維護',
@@ -196,14 +198,18 @@
     'role_import_content' => '匯入內容',
     'role_editor_change' => '重設頁面編輯器',
     'role_notifications' => '管理和接收通知',
+    'role_permission_note_users_and_roles' => '這些權限在技術上亦將提供系統內使用者與角色的能見度及搜尋功能。',
     'role_asset' => '資源權限',
     'roles_system_warning' => '請注意，有上述三項權限中的任一項的使用者都可以更改自己或系統中其他人的權限。有這些權限的角色只應分配給受信任的使用者。',
     'role_asset_desc' => '對系統內資源的預設權限將由這裡的權限控制。若有單獨設定在書本、章節和頁面上的權限，將會覆寫這裡的權限設定。',
     'role_asset_admins' => '管理員會自動取得對所有內容的存取權，但這些選項可能會顯示或隱藏使用者介面的選項。',
     'role_asset_image_view_note' => '這與圖像管理器中的可見性有關。已經上傳的圖片的實際訪問取決於系統圖像存儲選項。',
+    'role_asset_users_note' => '這些權限在技術上亦將提供系統內使用者的能見度及搜尋功能。',
     'role_all' => '全部',
     'role_own' => '擁有',
+    'role_permission_aria' => ':action :resource: :value',
     'role_controlled_by_asset' => '依據隸屬的資源來決定',
+    'role_controlled_by_page_delete' => '受頁面刪除權限控制',
     'role_save' => '儲存角色',
     'role_users' => '屬於此角色的使用者',
     'role_users_none' => '目前沒有使用者被分配到此角色',
@@ -260,6 +266,9 @@
     'users_mfa_desc' => '設定多重身份驗證為您的帳戶多增加了一道防線',
     'users_mfa_x_methods' => ':count 個措施已配置|:count 個措施已配置',
     'users_mfa_configure' => '方式設置',
+    'users_mfa_reset' => '重設多要素驗證方式',
+    'users_mfa_reset_desc' => '此操作將重設並清除該使用者所有已設定的多要素驗證方法。若其任何角色要求使用多要素驗證，系統將在下次登入時提示其設定新的驗證方法。',
+    'users_mfa_reset_confirm' => '您確定要重設此使用者的多要素驗證嗎？',
 
     // API Tokens
     'user_api_token_create' => '建立 API 權杖',
@@ -359,7 +368,9 @@
         'ru' => 'Русский',
         'sk' => 'Slovensky',
         'sl' => 'Slovenščina',
+        'sr' => 'Српски',
         'sv' => 'Svenska',
+        'th' => '泰語',
         'tr' => 'Türkçe',
         'uk' => 'Українська',
         'uz' => 'O‘zbekcha',
diff --git a/lang/zh_TW/validation.php b/lang/zh_TW/validation.php
index 30031470749..787a5677539 100644
--- a/lang/zh_TW/validation.php
+++ b/lang/zh_TW/validation.php
@@ -16,6 +16,7 @@
     'alpha_num'            => ':attribute 只能包含字母和數字。',
     'array'                => ':attribute 必須是陣列。',
     'backup_codes'         => '提供的代碼無效或已被使用。',
+    'base64_uri_mime'      => ':attribute 必須是有效的 Base64 URI，其中包含 :mime MIME 類型的資料。',
     'before'               => ':attribute 必須是在 :date 前的日期。',
     'between'              => [
         'numeric' => ':attribute 必須在 :min 到 :max 之間。',
@@ -25,6 +26,7 @@
     ],
     'boolean'              => ':attribute 欄位必須為 true 或 false。',
     'confirmed'            => ':attribute 確認不符。',
+    'current_password'     => '這不符合您目前的密碼。',
     'date'                 => ':attribute 並非有效的日期。',
     'date_format'          => ':attribute 與 :format 格式不相符。',
     'different'            => ':attribute 和 :other 必須不同。',
@@ -106,6 +108,7 @@
     'uploaded'             => '無法上傳文檔案， 伺服器可能不接受此大小的檔案。',
 
     'zip_file' => ':attribute 需要參照 ZIP 中的檔案。',
+    'zip_file_size' => '檔案 :attribute 不能超過 :size MB。',
     'zip_file_mime' => ':attribute 需要參照類型為 :validTypes 的檔案，找到 :foundType。',
     'zip_model_expected' => '預期為資料物件，但找到「:type」。',
     'zip_unique' => '對於 ZIP 中的物件類型，:attribute 必須是唯一的。',
diff --git a/package-lock.json b/package-lock.json
index fb6a1d4fa01..f4faed043b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,61 +5,44 @@
   "packages": {
     "": {
       "dependencies": {
-        "@codemirror/commands": "^6.8.1",
+        "@codemirror/commands": "^6.10.3",
         "@codemirror/lang-css": "^6.3.1",
-        "@codemirror/lang-html": "^6.4.9",
-        "@codemirror/lang-javascript": "^6.2.4",
+        "@codemirror/lang-html": "^6.4.11",
+        "@codemirror/lang-javascript": "^6.2.5",
         "@codemirror/lang-json": "^6.0.2",
-        "@codemirror/lang-markdown": "^6.3.4",
+        "@codemirror/lang-markdown": "^6.5.0",
         "@codemirror/lang-php": "^6.0.2",
         "@codemirror/lang-xml": "^6.1.0",
-        "@codemirror/language": "^6.11.3",
-        "@codemirror/legacy-modes": "^6.5.1",
-        "@codemirror/state": "^6.5.2",
+        "@codemirror/language": "^6.12.3",
+        "@codemirror/legacy-modes": "^6.5.2",
+        "@codemirror/state": "^6.6.0",
         "@codemirror/theme-one-dark": "^6.1.3",
-        "@codemirror/view": "^6.38.1",
-        "@lezer/highlight": "^1.2.1",
+        "@codemirror/view": "^6.41.0",
+        "@lezer/highlight": "^1.2.3",
         "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
         "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-        "@types/jest": "^30.0.0",
         "codemirror": "^6.0.2",
         "idb-keyval": "^6.2.2",
-        "markdown-it": "^14.1.0",
+        "markdown-it": "^15.0.0",
         "markdown-it-task-lists": "^2.1.1",
-        "snabbdom": "^3.6.2",
-        "sortablejs": "^1.15.6"
+        "snabbdom": "^3.6.3",
+        "sortablejs": "^1.15.7"
       },
       "devDependencies": {
-        "@eslint/js": "^9.34.0",
+        "@eslint/js": "^10.0.1",
         "@lezer/generator": "^1.8.0",
-        "@types/markdown-it": "^14.1.2",
-        "@types/sortablejs": "^1.15.8",
-        "chokidar-cli": "^3.0",
-        "esbuild": "^0.25.9",
-        "eslint": "^9.34.0",
-        "eslint-plugin-import": "^2.32.0",
-        "jest": "^30.1.1",
-        "jest-environment-jsdom": "^30.1.1",
-        "livereload": "^0.10.3",
+        "@swc/core": "^1.16.18",
+        "@swc/jest": "^0.2.39",
+        "@types/jest": "^30.0.0",
+        "@types/sortablejs": "^1.15.9",
+        "esbuild": "^0.28.2",
+        "eslint": "^10.2.0",
+        "globals": "^17.4.0",
+        "jest": "^30.5.2",
+        "jest-environment-jsdom": "^30.3.0",
         "npm-run-all": "^4.1.5",
-        "sass": "^1.91.0",
-        "ts-jest": "^29.4.1",
-        "ts-node": "^10.9.2",
-        "typescript": "5.9.*"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "sass": "^1.99.0",
+        "typescript": "6.0.*"
       }
     },
     "node_modules/@asamuzakjp/css-color": {
@@ -84,12 +67,13 @@
       "license": "ISC"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.29.7",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -98,9 +82,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
-      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -108,22 +92,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
-      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.0",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.27.3",
-        "@babel/helpers": "^7.27.6",
-        "@babel/parser": "^7.28.0",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.0",
-        "@babel/types": "^7.28.0",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -139,14 +123,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
+      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.0",
-        "@babel/types": "^7.28.0",
+        "@babel/parser": "^7.29.8",
+        "@babel/types": "^7.29.8",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -156,14 +140,14 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
-        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -173,9 +157,9 @@
       }
     },
     "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -183,29 +167,29 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
-      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.27.3"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -215,9 +199,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
+      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -225,9 +209,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -235,18 +219,19 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -254,27 +239,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
-      "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
+      "version": "7.29.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.10.tgz",
+      "integrity": "sha512-EMCx3AGZ3WfAl6ht7AyQoPm2Lh+BGYEMdc4Q6Hf7uSCDOZFuLq44qNwL+iaim8VlyYhRAo4X43+weadK8ZB4Yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.6"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "version": "7.29.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz",
+      "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.0"
+        "@babel/types": "^7.29.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -339,13 +324,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz",
+      "integrity": "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -381,13 +366,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz",
+      "integrity": "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -507,13 +492,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.29.7.tgz",
+      "integrity": "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -523,33 +508,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
-      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+      "version": "7.29.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz",
+      "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.0",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.0",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.0",
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.8",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.9",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.8",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -557,14 +542,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -577,10 +562,34 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@cacheable/memory": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.2.0.tgz",
+      "integrity": "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/utils": "^2.5.0",
+        "@keyv/bigmap": "^1.3.1",
+        "hookified": "^1.15.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/utils": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.5.0.tgz",
+      "integrity": "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.5.1",
+        "keyv": "^5.6.0"
+      }
+    },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz",
-      "integrity": "sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==",
+      "version": "6.20.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.3.tgz",
+      "integrity": "sha512-tlosUqb+3BbxCxZdu4tKeRghPFC+QM7q4X5YhKV2eCmPG+1r2F3f4AaSz5sCrFqUtX4Jh20VFTKecl16MgiV9g==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -590,13 +599,13 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.1.tgz",
-      "integrity": "sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==",
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.11.1.tgz",
+      "integrity": "sha512-O/4hG3SC1YwcmQ0d2UVNDs+AsaNWd1iHVxbTeEBuqH+6bExAiPK3iS/BvpY6rZGURALv4ZD3sIgcCmRvw3ehBg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.4.0",
+        "@codemirror/state": "^6.7.0",
         "@codemirror/view": "^6.27.0",
         "@lezer/common": "^1.1.0"
       }
@@ -615,9 +624,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.9",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
-      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
+      "version": "6.4.12",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.12.tgz",
+      "integrity": "sha512-pw2ReWKUqSkbvh76RAT4NYxiogRu+PWkR2ukAwO9uOgrm8uipkzjtKKtNpyeAQwHOqxEeSvAXZ6vr3AfyB9y/w==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -628,13 +637,13 @@
         "@codemirror/view": "^6.17.0",
         "@lezer/common": "^1.0.0",
         "@lezer/css": "^1.1.0",
-        "@lezer/html": "^1.3.0"
+        "@lezer/html": "^1.3.12"
       }
     },
     "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
-      "integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.5.tgz",
+      "integrity": "sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -657,9 +666,9 @@
       }
     },
     "node_modules/@codemirror/lang-markdown": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.4.tgz",
-      "integrity": "sha512-fBm0BO03azXnTAsxhONDYHi/qWSI+uSEIpzKM7h/bkIc9fHnFp9y7KTMXKON0teNT97pFhc1a9DQTtWBYEZ7ug==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.2.tgz",
+      "integrity": "sha512-AwBOdkWYuA//WcM0xO5PfHPUcmz/O2i5o0Nsg1U69SII/loCJlFI1Romd9xp2HYb1kYJRGZotyqRghuHH5n8Kw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.7.1",
@@ -699,59 +708,66 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.3.tgz",
-      "integrity": "sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==",
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.13.1.tgz",
+      "integrity": "sha512-zfvU2r3TyylQLMj/te+5CnQ0rSqZi8B1oTCBbQkagcLW4Xc6imab6qN+pEJhsuNOLaJqiRyBXp9UhWA1DhVvDw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
+        "@codemirror/streamparser": "^6.0.0",
         "@codemirror/view": "^6.23.0",
-        "@lezer/common": "^1.1.0",
+        "@lezer/common": "^1.5.0",
         "@lezer/highlight": "^1.0.0",
         "@lezer/lr": "^1.0.0",
         "style-mod": "^4.0.0"
       }
     },
     "node_modules/@codemirror/legacy-modes": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.1.tgz",
-      "integrity": "sha512-DJYQQ00N1/KdESpZV7jg9hafof/iBNp9h7TYo1SLMk86TWl9uDsVdho2dzd81K+v4retmK6mdC7WpuOQDytQqw==",
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.5.tgz",
+      "integrity": "sha512-9ltT214oMb3Y1w5eAZMSigzrjzZnMI2Wa3Feq73rU/i4C56MkwrpfswfQYOr28C5pXr6dWwspNTMyeHXlzWMxg==",
       "license": "MIT",
       "dependencies": {
-        "@codemirror/language": "^6.0.0"
+        "@codemirror/streamparser": "^6.0.0"
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.5.tgz",
-      "integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.7.tgz",
+      "integrity": "sha512-28/+iWLYxKxsvGYhSYL7zaCZqLz5+FFFDq9tVsvGv9kv8RY4fFAchJ5WX9M3YrrRlTIsECjsXPqeNgnSmNP2dg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.35.0",
+        "@codemirror/view": "^6.42.0",
         "crelt": "^1.0.5"
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.11",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
-      "integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.7.2.tgz",
+      "integrity": "sha512-gUYkYhT2+n/+VGZ+8EzE5WFkYZUZYm1VOKDudIsNqh42uRVQJ0a6Yss9sdKT3MeOYfuL1N6AZA57oza0Oyr0LA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.37.0",
         "crelt": "^1.0.5"
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+      "version": "6.7.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.6.tgz",
+      "integrity": "sha512-kAz+AncRtKuIknedxT1bq4XwXv4UowhbkHU1myPrtVb/jZtImWuV5BXzv5vK6i3kYACsdiZiQKFQQ5Mq7elW8w==",
       "license": "MIT",
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
       }
     },
+    "node_modules/@codemirror/streamparser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/streamparser/-/streamparser-6.0.0.tgz",
+      "integrity": "sha512-JTFPF6xrfjt0mnfGPgzcLiMwYmvIyNaoizp8BYzv8FE8KrT6GBGDZ190rtt+O7Wke3gG/MFHyiY9YGNeimof4w==",
+      "license": "MIT"
+    },
     "node_modules/@codemirror/theme-one-dark": {
       "version": "6.1.3",
       "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
@@ -765,41 +781,17 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.38.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
-      "integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
+      "version": "6.43.14",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.14.tgz",
+      "integrity": "sha512-hC45YnmJNR1rz42OF57BLoQNFMV12/13drnvibDsR2quNDmldcb4WvYVV81hFQg56i9lcqQMEDqilhX2QDcGQQ==",
       "license": "MIT",
       "dependencies": {
-        "@codemirror/state": "^6.5.0",
+        "@codemirror/state": "^6.7.0",
         "crelt": "^1.0.6",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
     },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
     "node_modules/@csstools/color-helpers": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
@@ -916,21 +908,21 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz",
-      "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/wasi-threads": "1.1.0",
+        "@emnapi/wasi-threads": "1.2.1",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
-      "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
+      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -939,9 +931,9 @@
       }
     },
     "node_modules/@emnapi/wasi-threads": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
-      "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
+      "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -950,9 +942,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
-      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz",
+      "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==",
       "cpu": [
         "ppc64"
       ],
@@ -967,9 +959,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
-      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz",
+      "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==",
       "cpu": [
         "arm"
       ],
@@ -984,9 +976,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
-      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz",
+      "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==",
       "cpu": [
         "arm64"
       ],
@@ -1001,9 +993,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
-      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz",
+      "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==",
       "cpu": [
         "x64"
       ],
@@ -1018,9 +1010,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
-      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz",
+      "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==",
       "cpu": [
         "arm64"
       ],
@@ -1035,9 +1027,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
-      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz",
+      "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==",
       "cpu": [
         "x64"
       ],
@@ -1052,9 +1044,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==",
       "cpu": [
         "arm64"
       ],
@@ -1069,9 +1061,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
-      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz",
+      "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==",
       "cpu": [
         "x64"
       ],
@@ -1086,9 +1078,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
-      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz",
+      "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==",
       "cpu": [
         "arm"
       ],
@@ -1103,9 +1095,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
-      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz",
+      "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==",
       "cpu": [
         "arm64"
       ],
@@ -1120,9 +1112,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
-      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz",
+      "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==",
       "cpu": [
         "ia32"
       ],
@@ -1137,9 +1129,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
-      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz",
+      "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==",
       "cpu": [
         "loong64"
       ],
@@ -1154,9 +1146,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
-      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz",
+      "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==",
       "cpu": [
         "mips64el"
       ],
@@ -1171,9 +1163,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
-      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz",
+      "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1188,9 +1180,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
-      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz",
+      "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==",
       "cpu": [
         "riscv64"
       ],
@@ -1205,9 +1197,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
-      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz",
+      "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==",
       "cpu": [
         "s390x"
       ],
@@ -1222,9 +1214,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
-      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz",
+      "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==",
       "cpu": [
         "x64"
       ],
@@ -1239,9 +1231,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==",
       "cpu": [
         "arm64"
       ],
@@ -1256,9 +1248,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz",
+      "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==",
       "cpu": [
         "x64"
       ],
@@ -1273,9 +1265,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz",
+      "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==",
       "cpu": [
         "arm64"
       ],
@@ -1290,9 +1282,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz",
+      "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==",
       "cpu": [
         "x64"
       ],
@@ -1307,9 +1299,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
-      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz",
+      "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==",
       "cpu": [
         "arm64"
       ],
@@ -1324,9 +1316,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
-      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz",
+      "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==",
       "cpu": [
         "x64"
       ],
@@ -1341,9 +1333,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
-      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz",
+      "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==",
       "cpu": [
         "arm64"
       ],
@@ -1358,9 +1350,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
-      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz",
+      "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==",
       "cpu": [
         "ia32"
       ],
@@ -1375,9 +1367,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
-      "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz",
+      "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==",
       "cpu": [
         "x64"
       ],
@@ -1392,9 +1384,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
+      "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1424,9 +1416,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1434,140 +1426,127 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+      "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
+        "@eslint/object-schema": "^3.0.5",
         "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "minimatch": "^10.2.4"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.7.0.tgz",
+      "integrity": "sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.2.1"
+      },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^10.0.1",
-        "globals": "^14.0.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
-      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz",
+      "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "eslint": "^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+      "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz",
+      "integrity": "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.2",
+        "@eslint/core": "^1.2.1",
         "levn": "^0.4.1"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=18.18.0"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -1616,10 +1595,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.4.0.tgz",
+      "integrity": "sha512-KzTVk2tCWAHtYrvvvaP8bJKJq2pVinhLcGEQdtLIYPbmNGNyYe8QwNaTUYQp2J7/vIsUKt5QCqAfUkYyG9DkOw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1654,6 +1646,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
@@ -1689,16 +1697,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -1713,20 +1711,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -1769,20 +1753,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1790,17 +1764,17 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.1.1.tgz",
-      "integrity": "sha512-f7TGqR1k4GtN5pyFrKmq+ZVndesiwLU33yDpJIGMS9aW+j6hKjue7ljeAdznBsH9kAnxUWe2Y+Y3fLV/FJt3gA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-30.5.2.tgz",
+      "integrity": "sha512-e8sQC4pCMHPBrPX7Hk8TJr+DM5dkUnImSTNag8SEWFAFAF6xIz4AJvCKapnrdHnZxep4bxw4PhG+ZbimYBMyKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
-        "jest-message-util": "30.1.0",
-        "jest-util": "30.0.5",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1808,39 +1782,39 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.1.1.tgz",
-      "integrity": "sha512-3ncU9peZ3D2VdgRkdZtUceTrDgX5yiDRwAFjtxNfU22IiZrpVWlv/FogzDLYSJQptQGfFo3PcHK86a2oG6WUGg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-30.5.2.tgz",
+      "integrity": "sha512-/jqvFWoJF7LV1a6AUpYMbMm+2yIYsHJfR474H0SCzr9k8tnO/jl9wRg6zSG6lxgf6EozNlCG4amFzWsbZSvvZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.1.1",
-        "@jest/pattern": "30.0.1",
-        "@jest/reporters": "30.1.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/transform": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.5.2",
+        "@jest/pattern": "30.5.0",
+        "@jest/reporters": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/transform": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "ansi-escapes": "^4.3.2",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "exit-x": "^0.2.2",
+        "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.11",
-        "jest-changed-files": "30.0.5",
-        "jest-config": "30.1.1",
-        "jest-haste-map": "30.1.0",
-        "jest-message-util": "30.1.0",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.1.0",
-        "jest-resolve-dependencies": "30.1.1",
-        "jest-runner": "30.1.1",
-        "jest-runtime": "30.1.1",
-        "jest-snapshot": "30.1.1",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.1.0",
-        "jest-watcher": "30.1.1",
-        "micromatch": "^4.0.8",
-        "pretty-format": "30.0.5",
+        "jest-changed-files": "30.5.1",
+        "jest-config": "30.5.2",
+        "jest-haste-map": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-resolve-dependencies": "30.5.2",
+        "jest-runner": "30.5.2",
+        "jest-runtime": "30.5.2",
+        "jest-snapshot": "30.5.2",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
+        "jest-watcher": "30.5.2",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -1855,50 +1829,64 @@
         }
       }
     },
+    "node_modules/@jest/create-cache-key-function": {
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-30.5.1.tgz",
+      "integrity": "sha512-5qkif//qhlbt54255O/M2JtUZNlnefOzE12bi7FlApOIYO4pqrZcAwhNCfP4jOGFubez8uoLgY9czWFjYY57ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.5.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
     "node_modules/@jest/diff-sequences": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz",
-      "integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.5.0.tgz",
+      "integrity": "sha512-OsqBjHXCn8cadasoAZBP6nWYvMsRhpMzGXTpxJ5aO04NlbdhIz+FVe3q49l0AwVhsz/cEmIpBes6gAFl1/dWQg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/environment": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.1.1.tgz",
-      "integrity": "sha512-yWHbU+3j7ehQE+NRpnxRvHvpUhoohIjMePBbIr8lfe0cWVb0WeTf80DNux1GPJa18CDHiIU5DtksGUfxcDE+Rw==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.5.2.tgz",
+      "integrity": "sha512-nwFPOUMbmsjNNRCpnJpB9HbSZu4C07wDDds++5j+j1MezzPLxMPDdbdUVjr2o4RULDOValnDd70taPFI1EtxAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/fake-timers": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/fake-timers": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.0.5"
+        "jest-mock": "30.5.2"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/environment-jsdom-abstract": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.1.1.tgz",
-      "integrity": "sha512-d7pP9SeIOI6qnrNIS/ds1hlS9jpqh8EywHK0dALSLODZKo2QEGnDNvnPvhRKI0FHWDnE2EMl8CDTP0jM9lhlOA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.5.2.tgz",
+      "integrity": "sha512-8/P+8hKv7L4mhFoB6gpYLj/fuzXk8PWrde7TDHh8tJz5pE1ktlMbg0y6hDY/V8MfAnispFlPl/vPifowLy3JGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/fake-timers": "30.1.1",
-        "@jest/types": "30.0.5",
-        "@types/jsdom": "^21.1.7",
+        "@jest/environment": "30.5.2",
+        "@jest/fake-timers": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5"
+        "jest-mock": "30.5.2",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
+        "@types/jsdom": "*",
         "canvas": "^3.0.0",
         "jsdom": "*"
       },
@@ -1909,114 +1897,133 @@
       }
     },
     "node_modules/@jest/expect": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.1.1.tgz",
-      "integrity": "sha512-3vHIHsF+qd3D8FU2c7U5l3rg1fhDwAYcGyHyZAi94YIlTwcJ+boNhRyJf373cl4wxbOX+0Q7dF40RTrTFTSuig==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.5.2.tgz",
+      "integrity": "sha512-2E+1Pg6jJxbRjLNLpciC71iri/3qsKJL222/aXJEFwC0VdUSvfS+JZQQLEVjUYYc8t8pQu2MGE3cF2+bNTYRsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "expect": "30.1.1",
-        "jest-snapshot": "30.1.1"
+        "expect": "30.5.2",
+        "jest-snapshot": "30.5.2"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.1.1.tgz",
-      "integrity": "sha512-5YUHr27fpJ64dnvtu+tt11ewATynrHkGYD+uSFgRr8V2eFJis/vEXgToyLwccIwqBihVfz9jwio+Zr1ab1Zihw==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.5.2.tgz",
+      "integrity": "sha512-d/HOLSrJUlBIl6n3LzOa7cjW3xdePm5H5gQw2lixZ/0h157l9sw3mLblzFqnPcTbhDzhRQdBOX3A3KcG73nm5Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0"
+        "@jest/get-type": "30.5.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.1.1.tgz",
-      "integrity": "sha512-fK/25dNgBNYPw3eLi2CRs57g1H04qBAFNMsUY3IRzkfx/m4THe0E1zF+yGQBOMKKc2XQVdc9EYbJ4hEm7/2UtA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.5.2.tgz",
+      "integrity": "sha512-GKk0h0tKT5SpDPxDhPg3r9mm5s8/YCBzVNMOGdRiQXwUiMsjU10mVPlMaQstH6/cu50vOb8N9oQUMETHuwwxKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
-        "@sinonjs/fake-timers": "^13.0.0",
+        "@jest/types": "30.5.1",
+        "@sinonjs/fake-timers": "^15.4.0",
         "@types/node": "*",
-        "jest-message-util": "30.1.0",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5"
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.2",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/get-type": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
-      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.5.0.tgz",
+      "integrity": "sha512-9/2VUPitAjmBzbvDvqrxmvB7BzWsBW0WmkkojX1ODuxX1NLGxx9gfaZpHB0z8DtJ9uhGNmZG/VXBhf8uO0OV8Q==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.1.1.tgz",
-      "integrity": "sha512-NNUUkHT2TU/xztZl6r1UXvJL+zvCwmZsQDmK69fVHHcB9fBtlu3FInnzOve/ZoyKnWY8JXWJNT+Lkmu1+ubXUA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.5.2.tgz",
+      "integrity": "sha512-62zfS+dL+M5aTNHXCNLyqD+j4oqxTIzDYrZbpqMP8Yn+gvlAGyzC6BSPNb1ZmFOakV1RtFYX/O3FCQXSWmQdgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/expect": "30.1.1",
-        "@jest/types": "30.0.5",
-        "jest-mock": "30.0.5"
+        "@jest/environment": "30.5.2",
+        "@jest/expect": "30.5.2",
+        "@jest/types": "30.5.1",
+        "jest-mock": "30.5.2"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/pattern": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
-      "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.5.0.tgz",
+      "integrity": "sha512-HdNQYSdRTEBNrginaqzQtTjG0HRMfrra/z6Ok7uL3S87vSlarIVohEsJsSj5edu3MiHoHjAkvPROz5ZjoKai+w==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "jest-regex-util": "30.0.1"
+        "jest-regex-util": "30.5.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/@jest/react-is-18": {
+      "name": "react-is",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jest/react-is-19": {
+      "name": "react-is",
+      "version": "19.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.3.1.tgz",
+      "integrity": "sha512-RRieF6IyxQBkcK6pP8xOHprLTPW6QjRkbGdImtqNme+/hYVwCZkLQLdlZGOhUqXwkS9IEynaGvPJtv6XB/cz0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@jest/reporters": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.1.1.tgz",
-      "integrity": "sha512-Hb2Bq80kahOC6Sv2waEaH1rEU6VdFcM6WHaRBWQF9tf30+nJHxhl/Upbgo9+25f0mOgbphxvbwSMjSgy9gW/FA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.5.2.tgz",
+      "integrity": "sha512-ev6E9iG73twQcfAfoTnviuYkr3yOrYbzAtMFCimv2fxHXPIp9PBt2u1wNMt0aYWgl8FPwIcS8oqRJg6alnht4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "30.1.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/transform": "30.1.1",
-        "@jest/types": "30.0.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jest/console": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/transform": "30.5.2",
+        "@jest/types": "30.5.1",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "collect-v8-coverage": "^1.0.2",
         "exit-x": "^0.2.2",
-        "glob": "^10.3.10",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "30.1.0",
-        "jest-util": "30.0.5",
-        "jest-worker": "30.1.0",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-worker": "30.5.1",
         "slash": "^3.0.0",
         "string-length": "^4.0.2",
         "v8-to-istanbul": "^9.0.1"
@@ -2034,9 +2041,10 @@
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.5.0.tgz",
+      "integrity": "sha512-/hunigyNpc4RCjC0VaW3f5RCUZVM2+WQ65qP7z083Gmvac7or2LI50XVNOtE4YPgBpV0yxYiAgorAPGniCoJmg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.34.0"
@@ -2046,13 +2054,13 @@
       }
     },
     "node_modules/@jest/snapshot-utils": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.1.1.tgz",
-      "integrity": "sha512-TkVBc9wuN22TT8hESRFmjjg/xIMu7z0J3UDYtIRydzCqlLPTB7jK1DDBKdnTUZ4zL3z3rnPpzV6rL1Uzh87sXg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.5.1.tgz",
+      "integrity": "sha512-V3wnxNtiVmw5PPVg433Cn3VdXnsOeu/ofLw3KC04Bn2y1wIlU5kozXQn48rhrgj/02LrCVtntTEF1yBha0XSUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "natural-compare": "^1.4.0"
@@ -2062,14 +2070,15 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
-      "integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.5.2.tgz",
+      "integrity": "sha512-c5CehvkbfHX6yyNg7bMn2ylqlp9AHXuZ/3hPH/Lh5bxD/vefd/lV9HBjMqXef9yQNqkdwyZvkLSVSwB38hy8Qw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "callsites": "^3.1.0",
+        "convert-source-map": "^2.0.0",
         "graceful-fs": "^4.2.11"
       },
       "engines": {
@@ -2077,14 +2086,14 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.1.1.tgz",
-      "integrity": "sha512-bMdj7fNu8iZuBPSnbVir5ezvWmVo4jrw7xDE+A33Yb3ENCoiJK9XgOLgal+rJ9XSKjsL7aPUMIo87zhN7I5o2w==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.5.2.tgz",
+      "integrity": "sha512-eO6YU5rsLfs60ne694e0IAmRgeBnoA8mu0nlxXDbl/1j5km0o2vO9/VbbUIKIH+WRKKEI+ELgwraRGn2Lhep8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/istanbul-lib-coverage": "^2.0.6",
         "collect-v8-coverage": "^1.0.2"
       },
@@ -2093,15 +2102,15 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.1.1.tgz",
-      "integrity": "sha512-yruRdLXSA3HYD/MTNykgJ6VYEacNcXDFRMqKVAwlYegmxICUiT/B++CNuhJnYJzKYks61iYnjVsMwbUqmmAYJg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.5.2.tgz",
+      "integrity": "sha512-bmij8jZyYAC47ExT2GeP7PcrlwSNS+Bp3KeRuBH88gpcxqDv6fljN8PemS4J/lLZ79xb6mpaennQTTq0zUAVVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.1.1",
+        "@jest/test-result": "30.5.2",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.1.0",
+        "jest-haste-map": "30.5.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2109,24 +2118,23 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-      "integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.5.2.tgz",
+      "integrity": "sha512-LBGwmaE886C41jDZ65eqR1YbXM7642MK3ZhTowZd5+xDlrDLuf4ePuDdDmVSvcr8NTVJ3MqxLkMbUCzuigUaoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/types": "30.0.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "babel-plugin-istanbul": "^7.0.0",
+        "@jest/types": "30.5.1",
+        "@jridgewell/trace-mapping": "^0.3.31",
+        "babel-plugin-istanbul": "^8.0.0",
         "chalk": "^4.1.2",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.1.0",
-        "jest-regex-util": "30.0.1",
-        "jest-util": "30.0.5",
-        "micromatch": "^4.0.8",
+        "jest-haste-map": "30.5.1",
+        "jest-regex-util": "30.5.0",
+        "jest-util": "30.5.1",
         "pirates": "^4.0.7",
         "slash": "^3.0.0",
         "write-file-atomic": "^5.0.1"
@@ -2136,13 +2144,14 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-      "integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.5.1.tgz",
+      "integrity": "sha512-LvVYn83nnXPl+Rg98nvcFgjx6nRMTArhSn6RAX/w3ELn54S8A42TYZvsCMdGUqTM8S0wyXbtlQdU6Hi6dykj9g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/pattern": "30.0.1",
-        "@jest/schemas": "30.0.5",
+        "@jest/pattern": "30.5.0",
+        "@jest/schemas": "30.5.0",
         "@types/istanbul-lib-coverage": "^2.0.6",
         "@types/istanbul-reports": "^3.0.4",
         "@types/node": "*",
@@ -2154,9 +2163,9 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2164,6 +2173,17 @@
         "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -2175,16 +2195,16 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.29",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2192,16 +2212,40 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@keyv/bigmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+      "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.4.0",
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@lezer/common": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
-      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.3.tgz",
+      "integrity": "sha512-H0iErY4e43LpXbYDyBci5W4v/RwTgGV3YzYOlJPiGZ8RY8w51kVE+xLn1tg3Z6UmSfyETvtsUK3r7YsgDQEI7Q==",
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.0.tgz",
-      "integrity": "sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw==",
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.9.tgz",
+      "integrity": "sha512-ZmzgvTOBdJWGIsY/ItAfN7UW8DV802oZG+jeG6E508SwEzz5YhuAajptpWPICvIyqYAD2+VjMdOS40GgGkyEOQ==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2210,9 +2254,9 @@
       }
     },
     "node_modules/@lezer/generator": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.8.0.tgz",
-      "integrity": "sha512-/SF4EDWowPqV1jOgoGSGTIFsE7Ezdr7ZYxyihl5eMKVO5tlnpIhFcDavgm1hHY5GEonoOAEnJ0CU0x+tvuAuUg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.8.1.tgz",
+      "integrity": "sha512-7q7szXqT7EPTs6SODBl58Qoz/4OrhNvm5pW4lbu1ZDnG5e0nn7drLzeN9Nxkm8j/1iMs5QZ9j3i4SV+W4Z6SQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2224,18 +2268,18 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.5.tgz",
+      "integrity": "sha512-O1GMVKgtf5YspFaRzpmqkVgMtIk2HG9uMAbH6wdAIdNh3TVzCsch/+cRi+6l2//UGDKe6NB9BW3cvuR5ezMQ0w==",
       "license": "MIT",
       "dependencies": {
-        "@lezer/common": "^1.0.0"
+        "@lezer/common": "^1.3.0"
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
-      "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
+      "version": "1.3.13",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.13.tgz",
+      "integrity": "sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2244,9 +2288,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.1.tgz",
-      "integrity": "sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==",
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.6.tgz",
+      "integrity": "sha512-sEvOqpl4vJQca0NugSQK02vQPbc5KrvoojnYGoqqFgFO0MtcYhwGiHKVEB+LuXYJnfyXo4QPA8ztbrEa4Fw5NA==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2266,28 +2310,28 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.11.tgz",
+      "integrity": "sha512-UwgZcl1R66H2hDzBrA7kWyYmX6s8p5TQ+e/t7CuvgCtBEPxbEPaHYHu+pJBvTvDotEJpuQkJjbXuHiw5Cixxgw==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.4.3.tgz",
-      "integrity": "sha512-kfw+2uMrQ/wy/+ONfrH83OkdFNM0ye5Xq96cLlaCy7h5UT9FO54DU4oRoIc0CSBh5NWmWuiIJA7NGLMJbQ+Oxg==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.8.0.tgz",
+      "integrity": "sha512-X6w3A2NpyhdtGqTWRJB8gR4QDXBaFMbTOs780ZdZ15KKCfBXOQTKcB3Vr+W6tqJHVlealt53tLmHRvOqPTQgYA==",
       "license": "MIT",
       "dependencies": {
-        "@lezer/common": "^1.0.0",
+        "@lezer/common": "^1.5.0",
         "@lezer/highlight": "^1.0.0"
       }
     },
     "node_modules/@lezer/php": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.4.tgz",
-      "integrity": "sha512-D2dJ0t8Z28/G1guztRczMFvPDUqzeMLSQbdWQmaiHV7urc8NlEOnjYk9UrZ531OcLiRxD4Ihcbv7AsDpNKDRaQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@lezer/php/-/php-1.0.6.tgz",
+      "integrity": "sha512-QJ2xNXPmsm/Z3IpThq8fnJrEIVpxhsIoj6GZBW0JYEd/l9zxpJZW216X4fzqQY4vgpdGIumypvI4uQjd4tnYtw==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -2307,37 +2351,45 @@
       }
     },
     "node_modules/@marijn/find-cluster-break": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
-      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.4.tgz",
+      "integrity": "sha512-Wy0V7+SGUjnF9/TkiM1hKVDPj7jKXduPNboMVtHTA8dySMURWqfg/JZ9E2Sq8JgSJmkl7k7Qe9FLeMSrSraWmQ==",
       "license": "MIT"
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.5.tgz",
+      "integrity": "sha512-HshSvXzmBxNzqejd3k/KemgQ3hdREUYFRRrgxOZ+gPljDIsO2SDZrVZMd4Z/HsxudQbE62OVyVFE8z9BCurfjA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.10.0"
+        "@tybys/wasm-util": "^0.10.3"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
+        "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz",
+      "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "detect-libc": "^2.0.3",
         "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2347,25 +2399,24 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.6.0",
+        "@parcel/watcher-darwin-arm64": "2.6.0",
+        "@parcel/watcher-darwin-x64": "2.6.0",
+        "@parcel/watcher-freebsd-x64": "2.6.0",
+        "@parcel/watcher-linux-arm-glibc": "2.6.0",
+        "@parcel/watcher-linux-arm-musl": "2.6.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.6.0",
+        "@parcel/watcher-linux-arm64-musl": "2.6.0",
+        "@parcel/watcher-linux-x64-glibc": "2.6.0",
+        "@parcel/watcher-linux-x64-musl": "2.6.0",
+        "@parcel/watcher-win32-arm64": "2.6.0",
+        "@parcel/watcher-win32-x64": "2.6.0"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz",
+      "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==",
       "cpu": [
         "arm64"
       ],
@@ -2384,9 +2435,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz",
+      "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==",
       "cpu": [
         "arm64"
       ],
@@ -2405,9 +2456,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz",
+      "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==",
       "cpu": [
         "x64"
       ],
@@ -2426,9 +2477,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz",
+      "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==",
       "cpu": [
         "x64"
       ],
@@ -2447,13 +2498,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz",
+      "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2468,13 +2522,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz",
+      "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2489,13 +2546,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz",
+      "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2510,13 +2570,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz",
+      "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2531,13 +2594,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz",
+      "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2552,13 +2618,16 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz",
+      "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2573,9 +2642,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz",
+      "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==",
       "cpu": [
         "arm64"
       ],
@@ -2593,31 +2662,10 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz",
+      "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==",
       "cpu": [
         "x64"
       ],
@@ -2647,29 +2695,23 @@
       }
     },
     "node_modules/@pkgr/core": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz",
+      "integrity": "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+        "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/pkgr"
       }
     },
-    "node_modules/@rtsao/scc": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
-      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@sinclair/typebox": {
-      "version": "0.34.41",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
-      "integrity": "sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==",
+      "version": "0.34.52",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.52.tgz",
+      "integrity": "sha512-XiMQh7qqVlxZzcVD+kkGMNGMzcTrDMLWI7S4x7z1MkCkbDPrekpZXEUK0eZqZFMuHQg2a2DZOcDIh9o5v3Gonw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
@@ -2683,9 +2725,9 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "13.0.5",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
-      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
+      "version": "15.4.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.4.0.tgz",
+      "integrity": "sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -2709,38 +2751,308 @@
         "@lezer/lr": "^1.0.0"
       }
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+    "node_modules/@swc/core": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.16.18.tgz",
+      "integrity": "sha512-0cYQLkpcwUngg55TDwpwrrVOU+B6zh1NFbp+oS7dVFhmYkzaARelwugo/bzPJh1FrcnppmF+KTqioCGwyqbcEw==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "license": "MIT"
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.28"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.16.18",
+        "@swc/core-darwin-x64": "1.16.18",
+        "@swc/core-linux-arm-gnueabihf": "1.16.18",
+        "@swc/core-linux-arm64-gnu": "1.16.18",
+        "@swc/core-linux-arm64-musl": "1.16.18",
+        "@swc/core-linux-ppc64-gnu": "1.16.18",
+        "@swc/core-linux-s390x-gnu": "1.16.18",
+        "@swc/core-linux-x64-gnu": "1.16.18",
+        "@swc/core-linux-x64-musl": "1.16.18",
+        "@swc/core-win32-arm64-msvc": "1.16.18",
+        "@swc/core-win32-ia32-msvc": "1.16.18",
+        "@swc/core-win32-x64-msvc": "1.16.18"
+      },
+      "peerDependencies": {
+        "@swc/helpers": ">=0.5.17"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.16.18.tgz",
+      "integrity": "sha512-ozgiCHyFDCwfXzTnaLR+i8WxEyt06GTudn9rPh08vj+u3Z8vMvt5Pi8T+BikyNXm7y++h6UMdqsnJuWrV+tk2A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.16.18.tgz",
+      "integrity": "sha512-tuwxXi+sjxxTAi7GP3NeQXQxOf4SXSiFxKAMYLBdoy7JqGYby6uSDXojcFoLOhSp7oiNGstnaFXxfbP0Hpro9w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.16.18.tgz",
+      "integrity": "sha512-SMdhmY1P9Kveh0MRj6vqQF98bsjnDa0lBBvkd/lcpxmjj5QHJOQAU0N3g6h7GPWpBMs3h2g3lHu/QTDn+uMsXg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.16.18.tgz",
+      "integrity": "sha512-ep/mQyhblQYZ6tkfq0IJspcVSFl5jdywks3kejanrbB31uuujRD/QWOoGNp2L3lLRdAdQvgl/M3pA7g3hSuQug==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.16.18.tgz",
+      "integrity": "sha512-pkzGVxrAQu5+febW1a/Aiph3YJk0UiJKXoWbxnDVEIOZWkk5aETHTuyVsOQ3kOgn2dzNMvJVeqcoEQdH+ntqWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-ppc64-gnu": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.16.18.tgz",
+      "integrity": "sha512-v9kiu4as1pJyQ8ESFTtMNydZ99m86QXLfAtm+XiKPKS93pXL80BCaXokAs9ebioGkIXgmwfbzUCdUC62H3JWkw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-s390x-gnu": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.16.18.tgz",
+      "integrity": "sha512-vU7TKRJ26i86YQr4QY/5bdcH72KzkBbSSUfPlErW6d6KOR47BcVGlYZFTcMMYlmd3CVSXFHW18tBSila66YfoA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.16.18.tgz",
+      "integrity": "sha512-Ml6kbe0BoVJkSgmYPAEUudGcu84jaQeqDN8xeMumbwNpT0vlmm7241Ddp9XKCjQABvjomnXF0OiNOAfjBhNDNw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.16.18.tgz",
+      "integrity": "sha512-TGU24+QmmS8y/hg0BLKgOU3W5TCcQC9bgGl8AB0R61gTNQdWdcmCehRLAJwlZfxtAml66xMJ6PWrX8NKrABOsA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.16.18.tgz",
+      "integrity": "sha512-S53hm7Amc3YV8t2BUT6R7J+zSnwiGarG+GnxMca4W0uMkxBZ3Gl6jBwEgb6YqrYjf2DzOuRfauztqptCO76a/w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.16.18.tgz",
+      "integrity": "sha512-+6/10+OJmU12zWkrPVG0QeQEr8VsWeF8gyXrOfHZMIfMOfz8/ULXVZPhV9GhGMKSWake1xEJj2IYCiFRS/xMpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.16.18",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.16.18.tgz",
+      "integrity": "sha512-7LsVrIICAZWSajXT6DwO7PYSTnW9maamOCyQylaOh13Viptrgi/7hl9fP75SiHe+kscaJahGXcorgt4MOOh/1w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@swc/jest": {
+      "version": "0.2.39",
+      "resolved": "https://registry.npmjs.org/@swc/jest/-/jest-0.2.39.tgz",
+      "integrity": "sha512-eyokjOwYd0Q8RnMHri+8/FS1HIrIUKK/sRrFp8c1dThUOfNeCWbLmBP1P5VsKdvmkd25JaH+OKYwEYiAYg9YAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/create-cache-key-function": "^30.0.0",
+        "@swc/counter": "^0.1.3",
+        "jsonc-parser": "^3.2.0"
+      },
+      "engines": {
+        "npm": ">= 7.0.0"
+      },
+      "peerDependencies": {
+        "@swc/core": "*"
+      }
+    },
+    "node_modules/@swc/types": {
+      "version": "0.1.28",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.28.tgz",
+      "integrity": "sha512-V6Mnml8v09QALx6K0elJ7o9K/MkVDtW3t6L+7Ou/JcWtb3xwId2AH4FeOceySd2JaO87IMw4+6vSZxLm34LPbw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
-      "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.4.tgz",
+      "integrity": "sha512-W3c4gRigFS0T/Ma4qIYF3GDAc5AQdHb1yL5znJT1Zv1YaD9Kitx656wBjvr19qbiosmZT8lWDM5BEMynUqX65A==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2793,10 +3105,17 @@
         "@babel/types": "^7.28.2"
       }
     },
+    "node_modules/@types/esrecurse": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
+      "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -2804,12 +3123,14 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
@@ -2819,6 +3140,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
@@ -2828,6 +3150,7 @@
       "version": "30.0.0",
       "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
       "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "expect": "^30.0.0",
@@ -2853,51 +3176,20 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/linkify-it": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
-      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/markdown-it": {
-      "version": "14.1.2",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
-      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/linkify-it": "^5",
-        "@types/mdurl": "^2"
-      }
-    },
-    "node_modules/@types/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/node": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+      "version": "26.6.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
+      "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.8.0"
+        "undici-types": "~8.9.0"
       }
     },
     "node_modules/@types/sortablejs": {
-      "version": "1.15.8",
-      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.8.tgz",
-      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.9.tgz",
+      "integrity": "sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -2905,6 +3197,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
       "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/tough-cookie": {
@@ -2915,9 +3208,10 @@
       "license": "MIT"
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.33",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
-      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+      "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -2927,19 +3221,20 @@
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.4.0.tgz",
+      "integrity": "sha512-1mEZtMKPM09vDmQt5y7YvmN2+DFTP7Tg0EWXdic8/C6VRnpb33e4ghisCIE3WZjsE2N8mf+QV1Zqh7ZFYLWInQ==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/@unrs/resolver-binding-android-arm-eabi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
-      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz",
+      "integrity": "sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==",
       "cpu": [
         "arm"
       ],
@@ -2951,9 +3246,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-android-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
-      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz",
+      "integrity": "sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==",
       "cpu": [
         "arm64"
       ],
@@ -2965,9 +3260,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
-      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz",
+      "integrity": "sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==",
       "cpu": [
         "arm64"
       ],
@@ -2979,9 +3274,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
-      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz",
+      "integrity": "sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==",
       "cpu": [
         "x64"
       ],
@@ -2993,9 +3288,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
-      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz",
+      "integrity": "sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==",
       "cpu": [
         "x64"
       ],
@@ -3007,9 +3302,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
-      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz",
+      "integrity": "sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==",
       "cpu": [
         "arm"
       ],
@@ -3021,9 +3316,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
-      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz",
+      "integrity": "sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==",
       "cpu": [
         "arm"
       ],
@@ -3035,13 +3330,16 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
-      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz",
+      "integrity": "sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3049,83 +3347,135 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
-      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz",
+      "integrity": "sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
-      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+    "node_modules/@unrs/resolver-binding-linux-loong64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz",
+      "integrity": "sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==",
       "cpu": [
-        "ppc64"
+        "loong64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
-      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+    "node_modules/@unrs/resolver-binding-linux-loong64-musl": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz",
+      "integrity": "sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==",
       "cpu": [
-        "riscv64"
+        "loong64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
-      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz",
+      "integrity": "sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==",
       "cpu": [
-        "riscv64"
+        "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
-      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz",
+      "integrity": "sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==",
       "cpu": [
-        "s390x"
+        "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
-      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz",
+      "integrity": "sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==",
       "cpu": [
-        "x64"
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz",
+      "integrity": "sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz",
+      "integrity": "sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==",
+      "cpu": [
+        "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3133,23 +3483,40 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
-      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz",
+      "integrity": "sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
+    "node_modules/@unrs/resolver-binding-openharmony-arm64": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz",
+      "integrity": "sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
-      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz",
+      "integrity": "sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==",
       "cpu": [
         "wasm32"
       ],
@@ -3157,16 +3524,18 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.11"
+        "@emnapi/core": "1.10.0",
+        "@emnapi/runtime": "1.10.0",
+        "@napi-rs/wasm-runtime": "^1.1.4"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
-      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz",
+      "integrity": "sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==",
       "cpu": [
         "arm64"
       ],
@@ -3178,9 +3547,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
-      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz",
+      "integrity": "sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==",
       "cpu": [
         "ia32"
       ],
@@ -3192,9 +3561,9 @@
       ]
     },
     "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
-      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz",
+      "integrity": "sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==",
       "cpu": [
         "x64"
       ],
@@ -3206,9 +3575,9 @@
       ]
     },
     "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz",
+      "integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -3228,19 +3597,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
@@ -3252,9 +3608,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+      "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3285,22 +3641,20 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
-      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -3326,111 +3680,38 @@
         "node": ">= 8"
       }
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "license": "Python-2.0"
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "is-array-buffer": "^3.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
-      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.24.0",
-        "es-object-atoms": "^1.1.1",
-        "get-intrinsic": "^1.3.0",
-        "is-string": "^1.1.1",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
-      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "es-shim-unscopables": "^1.1.0"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
-      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
-      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3488,16 +3769,16 @@
       }
     },
     "node_modules/babel-jest": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.1.1.tgz",
-      "integrity": "sha512-1bZfC/V03qBCzASvZpNFhx3Ouj6LgOd4KFJm4br/fYOS+tSSvVCE61QmcAVbMTwq/GoB7KN4pzGMoyr9cMxSvQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.5.2.tgz",
+      "integrity": "sha512-ES8WeJ2fNWPEDunyAtUfJ12nHyaWUloCHdkfK2oW5uSoQSUmjNKdWiGaXJITJwvFEWoD/evHEg/QoCXAvLaQqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/transform": "30.1.1",
+        "@jest/transform": "30.5.2",
         "@types/babel__core": "^7.20.5",
-        "babel-plugin-istanbul": "^7.0.0",
-        "babel-preset-jest": "30.0.1",
+        "babel-plugin-istanbul": "^8.0.0",
+        "babel-preset-jest": "30.5.0",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
         "slash": "^3.0.0"
@@ -3506,35 +3787,36 @@
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.11.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-0"
       }
     },
     "node_modules/babel-plugin-istanbul": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-      "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-8.0.0.tgz",
+      "integrity": "sha512-18wCskrN3DgbuBmp1gr7LBGT8xdz5xhQQqFvFhVxbkl8VBCrMKQ2YtqBWtUal1Zrc1HTuX0011+Brjw78TCFkg==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "workspaces": [
+        "test/babel-8"
+      ],
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-instrument": "^6.0.2",
-        "test-exclude": "^6.0.0"
+        "test-exclude": "^7.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz",
-      "integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.5.0.tgz",
+      "integrity": "sha512-gtGo1B+u14jrZQv6TdSWIWkTqclboo7Qn+dFAGUOIuXLFuJKAdg3U5MIWzZnW4vfUb4dX9skmAMiby86e/SF4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.27.3",
         "@types/babel__core": "^7.20.5"
       },
       "engines": {
@@ -3542,9 +3824,9 @@
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3565,73 +3847,66 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz",
-      "integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.5.0.tgz",
+      "integrity": "sha512-ZGPn5ClP4lBDpuOK8W1yQIOy359HmbnZv3suucAlIe+SEE9yDsxV4S2PjSbH2Vc97U+WmzYD7vw3kr8NsQ/i6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-plugin-jest-hoist": "30.0.1",
-        "babel-preset-current-node-syntax": "^1.1.0"
+        "babel-plugin-jest-hoist": "30.5.0",
+        "babel-preset-current-node-syntax": "^1.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.11.0"
+        "@babel/core": "^7.11.0 || ^8.0.0-beta.1 || ^8.0.0"
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "18 || 20 || >=22"
       }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.11.29",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.29.tgz",
+      "integrity": "sha512-YeesxhUmR4h5y5V8KF8iBCqJb8YFrBJ++XBTeGcWIaQOYXGN19JM0FoiOjAhwuDoln8owMgXcWBmgHtYSkky2w==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "node_modules/brace-expansion": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": "20 || >=22"
       }
     },
     "node_modules/browserslist": {
-      "version": "4.25.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+      "version": "4.29.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.3.tgz",
+      "integrity": "sha512-1R4kiYKXGViqEN0CnoDrXc1StD9niAwu+j2dukWzrD4bJgsD4lDmEp0CRbc6E/vYJIfTHwPmwyaKtVSudICdPA==",
       "dev": true,
       "funding": [
         {
@@ -3649,10 +3924,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001726",
-        "electron-to-chromium": "^1.5.173",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
+        "baseline-browser-mapping": "^2.11.26",
+        "caniuse-lite": "^1.0.30001813",
+        "electron-to-chromium": "^1.5.439",
+        "node-releases": "^2.0.57",
+        "update-browserslist-db": "^1.3.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3661,46 +3937,40 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+    "node_modules/bser": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.2.tgz",
+      "integrity": "sha512-V2o8YS2EhrKMO9AumnkK0ynynfFlsajpYupwq7S46H5mhcanwxDkNTw3K67wPIcKTH1ffkA4vhMOtAc7gRmPZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-json-stable-stringify": "2.x"
-      },
-      "engines": {
-        "node": ">= 6"
+        "node-int64": "^0.4.0"
       }
     },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+    "node_modules/cacheable": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.5.0.tgz",
+      "integrity": "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "node-int64": "^0.4.0"
+        "@cacheable/memory": "^2.2.0",
+        "@cacheable/utils": "^2.5.0",
+        "hookified": "^1.15.0",
+        "keyv": "^5.6.0",
+        "qified": "^0.10.1"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
+      "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "get-intrinsic": "^1.3.0",
         "set-function-length": "^1.2.2"
       },
       "engines": {
@@ -3762,9 +4032,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001727",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
-      "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
+      "version": "1.0.30001816",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001816.tgz",
+      "integrity": "sha512-+8Yx7BXCoqk6IF8yTicjfUR6D/ldJzdlsodlEOiOSPmhK844WIgk67/zIQaGAOxNkZyyvBlrRFnLvqKIoqbAFw==",
       "dev": true,
       "funding": [
         {
@@ -3786,6 +4056,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -3809,53 +4080,26 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "^5.0.0"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar-cli": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-3.0.0.tgz",
-      "integrity": "sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chokidar": "^3.5.2",
-        "lodash.debounce": "^4.0.8",
-        "lodash.throttle": "^4.1.1",
-        "yargs": "^13.3.0"
-      },
-      "bin": {
-        "chokidar": "index.js"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
       }
     },
     "node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3868,45 +4112,25 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.3.0.tgz",
+      "integrity": "sha512-lmNyBzi6iYiqyrExTctfmjd8tInx+dHu9PBomTfH5RXS53c27JMFJgzNv5TyAnm3PgGf+MLy0+Ws41/HlVxdKQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
     "node_modules/co": {
@@ -3936,9 +4160,9 @@
       }
     },
     "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz",
+      "integrity": "sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3946,6 +4170,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -3958,6 +4183,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/concat-map": {
@@ -3974,17 +4200,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/crelt": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.7.tgz",
+      "integrity": "sha512-aK6BbWfhf4U/wCcLHKPJl/xa6VkVstRaPywWtMKGwuOLc/wZTyQYuoxgvZnNsBvv7Kg3YTBQYYBCggcviQczuA==",
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
@@ -4085,9 +4304,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4102,16 +4321,6 @@
         }
       }
     },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/decimal.js": {
       "version": "10.6.0",
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
@@ -4120,9 +4329,9 @@
       "license": "MIT"
     },
     "node_modules/dedent": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
-      "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
+      "integrity": "sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -4188,17 +4397,13 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
     "node_modules/detect-newline": {
@@ -4211,29 +4416,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -4257,9 +4439,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.190",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz",
-      "integrity": "sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==",
+      "version": "1.5.459",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.459.tgz",
+      "integrity": "sha512-4SC9HHSFjO/liAhifpdOL5hG9b4BP7/5G3y3UPZVO8trlAXr1CaUEEJL0gWK3kOcYcZrOA5rkwG45Gra/lTIgg==",
       "dev": true,
       "license": "ISC"
     },
@@ -4277,28 +4459,28 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-8.1.0.tgz",
+      "integrity": "sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==",
       "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=0.12"
+        "node": ">=20.19.0"
       },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4306,9 +4488,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
-      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+      "version": "1.24.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz",
+      "integrity": "sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4374,6 +4556,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-abstract-get": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz",
+      "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.2",
+        "is-callable": "^1.2.7",
+        "object-inspect": "^1.13.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -4394,10 +4595,17 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
+      "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4423,29 +4631,19 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
-      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.4.tgz",
+      "integrity": "sha512-yPDz7wqpg1/mmHLmS3tcfTfbw5f1eryXvyghYBffGdERwe+mV7ZcWzTR8LR17Kvqt3qfPurjlonmnq3MKXIOXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-abstract-get": "^1.0.0",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
         "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
+        "is-date-object": "^1.1.0",
+        "is-symbol": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4455,9 +4653,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
-      "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+      "version": "0.28.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz",
+      "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4468,32 +4666,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.9",
-        "@esbuild/android-arm": "0.25.9",
-        "@esbuild/android-arm64": "0.25.9",
-        "@esbuild/android-x64": "0.25.9",
-        "@esbuild/darwin-arm64": "0.25.9",
-        "@esbuild/darwin-x64": "0.25.9",
-        "@esbuild/freebsd-arm64": "0.25.9",
-        "@esbuild/freebsd-x64": "0.25.9",
-        "@esbuild/linux-arm": "0.25.9",
-        "@esbuild/linux-arm64": "0.25.9",
-        "@esbuild/linux-ia32": "0.25.9",
-        "@esbuild/linux-loong64": "0.25.9",
-        "@esbuild/linux-mips64el": "0.25.9",
-        "@esbuild/linux-ppc64": "0.25.9",
-        "@esbuild/linux-riscv64": "0.25.9",
-        "@esbuild/linux-s390x": "0.25.9",
-        "@esbuild/linux-x64": "0.25.9",
-        "@esbuild/netbsd-arm64": "0.25.9",
-        "@esbuild/netbsd-x64": "0.25.9",
-        "@esbuild/openbsd-arm64": "0.25.9",
-        "@esbuild/openbsd-x64": "0.25.9",
-        "@esbuild/openharmony-arm64": "0.25.9",
-        "@esbuild/sunos-x64": "0.25.9",
-        "@esbuild/win32-arm64": "0.25.9",
-        "@esbuild/win32-ia32": "0.25.9",
-        "@esbuild/win32-x64": "0.25.9"
+        "@esbuild/aix-ppc64": "0.28.2",
+        "@esbuild/android-arm": "0.28.2",
+        "@esbuild/android-arm64": "0.28.2",
+        "@esbuild/android-x64": "0.28.2",
+        "@esbuild/darwin-arm64": "0.28.2",
+        "@esbuild/darwin-x64": "0.28.2",
+        "@esbuild/freebsd-arm64": "0.28.2",
+        "@esbuild/freebsd-x64": "0.28.2",
+        "@esbuild/linux-arm": "0.28.2",
+        "@esbuild/linux-arm64": "0.28.2",
+        "@esbuild/linux-ia32": "0.28.2",
+        "@esbuild/linux-loong64": "0.28.2",
+        "@esbuild/linux-mips64el": "0.28.2",
+        "@esbuild/linux-ppc64": "0.28.2",
+        "@esbuild/linux-riscv64": "0.28.2",
+        "@esbuild/linux-s390x": "0.28.2",
+        "@esbuild/linux-x64": "0.28.2",
+        "@esbuild/netbsd-arm64": "0.28.2",
+        "@esbuild/netbsd-x64": "0.28.2",
+        "@esbuild/openbsd-arm64": "0.28.2",
+        "@esbuild/openbsd-x64": "0.28.2",
+        "@esbuild/openharmony-arm64": "0.28.2",
+        "@esbuild/sunos-x64": "0.28.2",
+        "@esbuild/win32-arm64": "0.28.2",
+        "@esbuild/win32-ia32": "0.28.2",
+        "@esbuild/win32-x64": "0.28.2"
       }
     },
     "node_modules/escalade": {
@@ -4520,45 +4718,43 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
-      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
+      "version": "10.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.13.0.tgz",
+      "integrity": "sha512-UohDjD4zSzEwhf58M3O7vc/ycc8O1I7dNlhtD0WxE8Px8EHNJKtUwzBqrzeGhisRuv2ag4sAYswszCJRgKXYUg==",
       "dev": true,
       "license": "MIT",
+      "workspaces": [
+        "packages/*"
+      ],
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.1",
-        "@eslint/core": "^0.15.2",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.34.0",
-        "@eslint/plugin-kit": "^0.3.5",
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.7.0",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.3",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
+        "ajv": "^6.14.0",
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.4.0",
-        "eslint-visitor-keys": "^4.2.1",
-        "espree": "^10.4.0",
-        "esquery": "^1.5.0",
+        "eslint-scope": "^9.1.2",
+        "eslint-visitor-keys": "^5.0.1",
+        "espree": "^11.2.0",
+        "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
+        "file-entry-cache": "11.1.5 || >11.1.6 <12",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
+        "minimatch": "^10.2.5",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -4566,7 +4762,7 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://eslint.org/donate"
@@ -4580,156 +4776,51 @@
         }
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
-      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.32.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
-      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.9",
-        "array.prototype.findlastindex": "^1.2.6",
-        "array.prototype.flat": "^1.3.3",
-        "array.prototype.flatmap": "^1.3.3",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.12.1",
-        "hasown": "^2.0.2",
-        "is-core-module": "^2.16.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.8",
-        "object.groupby": "^1.0.3",
-        "object.values": "^1.2.1",
-        "semver": "^6.3.1",
-        "string.prototype.trimend": "^1.0.9",
-        "tsconfig-paths": "^3.15.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
     "node_modules/eslint-scope": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
-      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
+        "@types/esrecurse": "^4.3.1",
+        "@types/estree": "^1.0.8",
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/espree": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
-      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.15.0",
+        "acorn": "^8.16.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.1"
+        "eslint-visitor-keys": "^5.0.1"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -4750,9 +4841,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -4830,17 +4921,18 @@
       }
     },
     "node_modules/expect": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-30.1.1.tgz",
-      "integrity": "sha512-OKe7cdic4qbfWd/CcgwJvvCrNX2KWfuMZee9AfJHL1gTYmvqjBjZG1a2NwfhspBzxzlXwsN75WWpKTYfsJpBxg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.5.2.tgz",
+      "integrity": "sha512-0LNuMvs8/5mRYhnCR4k+lGV7fqPMs6Bnksda4S3zsCUmdxBpAn4zU4NNzXdq1pMKe/H4W5t/zVIDSJ/H3e0vDA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "30.1.1",
-        "@jest/get-type": "30.1.0",
-        "jest-matcher-utils": "30.1.1",
-        "jest-message-util": "30.1.0",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5"
+        "@jest/expect-utils": "30.5.2",
+        "@jest/get-type": "30.5.0",
+        "jest-matcher-utils": "30.5.2",
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.2",
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -4868,38 +4960,41 @@
       "license": "MIT"
     },
     "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.4.tgz",
+      "integrity": "sha512-tGQtaoYisPDriJBN0mT5yZSyNETnJGA1gTYxaVRAE5KUO3LI9kPUc9WIu8JXcxaIci+faIKlzXqXyPgrmubtBQ==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "bser": "2.1.1"
+        "bser": "2.1.2"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "flat-cache": "^4.0.0"
-      },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "node_modules/file-entry-cache": {
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
+      "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "flat-cache": "^6.1.23"
       }
     },
     "node_modules/find-up": {
@@ -4920,23 +5015,21 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "version": "6.1.23",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
+      "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
-      },
-      "engines": {
-        "node": ">=16"
+        "cacheable": "^2.5.0",
+        "flatted": "^3.4.2",
+        "hookified": "^1.15.0"
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz",
+      "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==",
       "dev": true,
       "license": "ISC"
     },
@@ -4986,28 +5079,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -5019,18 +5090,21 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz",
+      "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
+        "has-property-descriptors": "^1.0.2",
+        "hasown": "^2.0.4",
+        "is-callable": "^1.2.7",
+        "is-document.all": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5049,6 +5123,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -5150,69 +5234,40 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "version": "17.13.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.13.0.tgz",
+      "integrity": "sha512-RwMTC61u7hrG3ZJMkZQOK4JLJrKS8QtoTii63EmWvFXHqycY9FObBJQCbsLxSO8kjKhWE5kV1GC+Vb1g3RI0Zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5256,29 +5311,8 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "license": "ISC"
-    },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
+      "license": "ISC"
     },
     "node_modules/has-bigints": {
       "version": "1.1.0",
@@ -5297,6 +5331,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -5360,10 +5395,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hashery": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.1.tgz",
+      "integrity": "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5373,6 +5421,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hookified": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
+      "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -5452,9 +5507,9 @@
       }
     },
     "node_modules/idb-keyval": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.2.tgz",
-      "integrity": "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.3.0.tgz",
+      "integrity": "sha512-um+2dgAWmYsu615EXpWVwSmapJhON0G43t3Ka/EVaohzPQXSMqKEqeDK/oIW3Ow+BXaF2PvSc+oBTFp793A5Ow==",
       "license": "Apache-2.0"
     },
     "node_modules/ignore": {
@@ -5468,29 +5523,12 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
-      "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz",
+      "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/import-local": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
@@ -5521,31 +5559,12 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "dev": true,
-      "license": "MIT",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "hasown": "^2.0.2",
@@ -5616,19 +5635,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-boolean-object": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
@@ -5660,13 +5666,13 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.17.0.tgz",
+      "integrity": "sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "hasown": "^2.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5710,6 +5716,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-document.all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz",
+      "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -5737,13 +5759,13 @@
       }
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/is-generator-fn": {
@@ -5757,14 +5779,15 @@
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
         "has-tostringtag": "^1.0.2",
         "safe-regex-test": "^1.1.0"
       },
@@ -5814,15 +5837,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-number-object": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
@@ -6047,9 +6061,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -6120,16 +6134,16 @@
       }
     },
     "node_modules/jest": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-30.1.1.tgz",
-      "integrity": "sha512-yC3JvpP/ZcAZX5rYCtXO/g9k6VTCQz0VFE2v1FpxytWzUqfDtu0XL/pwnNvptzYItvGwomh1ehomRNMOyhCJKw==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-30.5.2.tgz",
+      "integrity": "sha512-3gnpdBIza8ijCl3iMV9ChE3hSt1+46865qqod863gQtJr1DixOkAU5DoGbi3u+XlRcw++BhZQMu/y4xBdHBvSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/core": "30.5.2",
+        "@jest/types": "30.5.1",
         "import-local": "^3.2.0",
-        "jest-cli": "30.1.1"
+        "jest-cli": "30.5.2"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -6147,14 +6161,14 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz",
-      "integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.5.1.tgz",
+      "integrity": "sha512-0+bvMM/ENhDI29Z8q1r4HxiDIi4G5tnBmSw4esfPQoj9q8Nik7KIyuxHkTVnnniJQf05SxpGaKDQ+4h28ynGPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "execa": "^5.1.1",
-        "jest-util": "30.0.5",
+        "jest-util": "30.5.1",
         "p-limit": "^3.1.0"
       },
       "engines": {
@@ -6162,29 +6176,29 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.1.1.tgz",
-      "integrity": "sha512-M3Vd4x5wD7eSJspuTvRF55AkOOBndRxgW3gqQBDlFvbH3X+ASdi8jc+EqXEeAFd/UHulVYIlC4XKJABOhLw6UA==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.5.2.tgz",
+      "integrity": "sha512-vffFgjs5JSJ9q4ds1vNW3klKYPJfYfIY61LT/zaZgvTeASJOWZUt8LBfHgIcV4rwxlPBLl/ePBGccHEclS4PlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/expect": "30.1.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/environment": "30.5.2",
+        "@jest/expect": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "co": "^4.6.0",
         "dedent": "^1.6.0",
         "is-generator-fn": "^2.1.0",
-        "jest-each": "30.1.0",
-        "jest-matcher-utils": "30.1.1",
-        "jest-message-util": "30.1.0",
-        "jest-runtime": "30.1.1",
-        "jest-snapshot": "30.1.1",
-        "jest-util": "30.0.5",
+        "jest-each": "30.5.2",
+        "jest-matcher-utils": "30.5.2",
+        "jest-message-util": "30.5.1",
+        "jest-runtime": "30.5.2",
+        "jest-snapshot": "30.5.2",
+        "jest-util": "30.5.1",
         "p-limit": "^3.1.0",
-        "pretty-format": "30.0.5",
+        "pretty-format": "30.5.1",
         "pure-rand": "^7.0.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
@@ -6194,21 +6208,21 @@
       }
     },
     "node_modules/jest-cli": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.1.1.tgz",
-      "integrity": "sha512-xm9llxuh5OoI5KZaYzlMhklryHBwg9LZy/gEaaMlXlxb+cZekGNzukU0iblbDo3XOBuN6N0CgK4ykgNRYSEb6g==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.5.2.tgz",
+      "integrity": "sha512-YYYxUUVjFgPvgEleKNKMaYGIFgR3l3832Cl0kRL/oCiDZ03v7wImUtquHl2OOBCCNgprjZgBN5bczS/JklPBDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "30.1.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/core": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
         "exit-x": "^0.2.2",
         "import-local": "^3.2.0",
-        "jest-config": "30.1.1",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.1.0",
+        "jest-config": "30.5.2",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "yargs": "^17.7.2"
       },
       "bin": {
@@ -6226,152 +6240,34 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jest-cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-cli/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/jest-config": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.1.1.tgz",
-      "integrity": "sha512-xuPGUGDw+9fPPnGmddnLnHS/mhKUiJOW7K65vErYmglEPKq65NKwSRchkQ7iv6gqjs2l+YNEsAtbsplxozdOWg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.5.2.tgz",
+      "integrity": "sha512-U6221OZekabePvGcGPf4raIBKMvYQWFHvhobDJRojOYaFMj2HaGytAdknjDhYc6JTz2fdHW9+6k0wWUDaNeOFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.27.4",
-        "@jest/get-type": "30.1.0",
-        "@jest/pattern": "30.0.1",
-        "@jest/test-sequencer": "30.1.1",
-        "@jest/types": "30.0.5",
-        "babel-jest": "30.1.1",
+        "@jest/get-type": "30.5.0",
+        "@jest/pattern": "30.5.0",
+        "@jest/test-sequencer": "30.5.2",
+        "@jest/types": "30.5.1",
+        "babel-jest": "30.5.2",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "deepmerge": "^4.3.1",
-        "glob": "^10.3.10",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
-        "jest-circus": "30.1.1",
-        "jest-docblock": "30.0.1",
-        "jest-environment-node": "30.1.1",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.1.0",
-        "jest-runner": "30.1.1",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.1.0",
-        "micromatch": "^4.0.8",
+        "jest-circus": "30.5.2",
+        "jest-docblock": "30.5.0",
+        "jest-environment-node": "30.5.2",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-runner": "30.5.2",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "parse-json": "^5.2.0",
-        "pretty-format": "30.0.5",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
@@ -6396,24 +6292,25 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.1.1.tgz",
-      "integrity": "sha512-LUU2Gx8EhYxpdzTR6BmjL1ifgOAQJQELTHOiPv9KITaKjZvJ9Jmgigx01tuZ49id37LorpGc9dPBPlXTboXScw==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.5.2.tgz",
+      "integrity": "sha512-rBtHnI6BWTiWj3lM7fOLVfChx7R9B0u9VV3PRHawKs79x6ZjW1QoSrKenaigNGWlvhtoi2BqvDbABDie+Os3xQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/diff-sequences": "30.0.1",
-        "@jest/get-type": "30.1.0",
+        "@jest/diff-sequences": "30.5.0",
+        "@jest/get-type": "30.5.0",
         "chalk": "^4.1.2",
-        "pretty-format": "30.0.5"
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz",
-      "integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.5.0.tgz",
+      "integrity": "sha512-NwDqcxtoZi33RhuW+zJS/RVA3rmheQ8BnwpYZuc/Eruaz6seQb7+aoCeDZu/3X7W2XmD8DbSo9Pn72DbKsBFYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6424,33 +6321,33 @@
       }
     },
     "node_modules/jest-each": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.1.0.tgz",
-      "integrity": "sha512-A+9FKzxPluqogNahpCv04UJvcZ9B3HamqpDNWNKDjtxVRYB8xbZLFuCr8JAJFpNp83CA0anGQFlpQna9Me+/tQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.5.2.tgz",
+      "integrity": "sha512-GRrW+7fmmgmkvyfEBqc1QFdWnF1Ex5yG6Y6AWL4TTxnkWlKIT98dsKh3P3UuWm6v4XsQwVE6DEzXIPMzWJ3ZbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "@jest/types": "30.0.5",
+        "@jest/get-type": "30.5.0",
+        "@jest/types": "30.5.1",
         "chalk": "^4.1.2",
-        "jest-util": "30.0.5",
-        "pretty-format": "30.0.5"
+        "jest-regex-util": "30.5.0",
+        "jest-util": "30.5.1",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.1.1.tgz",
-      "integrity": "sha512-fInyXsHSuPaERmRiub4V6jl6KERXowGqY8AISJrXZjOq7vdP46qecm+GnTngjcUPeHFqrxp1PfP0XuFfKTzA2A==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-30.5.2.tgz",
+      "integrity": "sha512-6NOZjEP+WNi4WXjbxb/1ROnfaMxn6Dhqu6uSC22o0H28z+uppejs/jZ9KCVoLepqqoCjcNZujtzQqC9jSV15jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/environment-jsdom-abstract": "30.1.1",
+        "@jest/environment": "30.5.2",
+        "@jest/environment-jsdom-abstract": "30.5.2",
         "@types/jsdom": "^21.1.7",
-        "@types/node": "*",
         "jsdom": "^26.1.0"
       },
       "engines": {
@@ -6466,91 +6363,92 @@
       }
     },
     "node_modules/jest-environment-node": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.1.1.tgz",
-      "integrity": "sha512-IaMoaA6saxnJimqCppUDqKck+LKM0Jg+OxyMUIvs1yGd2neiC22o8zXo90k04+tO+49OmgMR4jTgM5e4B0S62Q==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.5.2.tgz",
+      "integrity": "sha512-Ciz4KgTGIbojxSKpuFImgWJj5EyqfE8xMq9NxWmOXnQywHHS03H9Mv+vaCB29J5pr3JBrY27WbRV18rBdjh8Dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/fake-timers": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/environment": "30.5.2",
+        "@jest/fake-timers": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-mock": "30.0.5",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.1.0"
+        "jest-mock": "30.5.2",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-      "integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.5.1.tgz",
+      "integrity": "sha512-VIFgt67jW480YDxKfEv9IYQKrFpYt7bOCMn3VsnjK7AK9qo7p6acpnA1DHwsVOULE3dTaYew/6JaTD/d0VDHoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.5.1",
+        "@parcel/watcher": "^2.6.0",
         "@types/node": "*",
         "anymatch": "^3.1.3",
         "fb-watchman": "^2.0.2",
+        "fdir": "^6.5.0",
         "graceful-fs": "^4.2.11",
-        "jest-regex-util": "30.0.1",
-        "jest-util": "30.0.5",
-        "jest-worker": "30.1.0",
-        "micromatch": "^4.0.8",
-        "walker": "^1.0.8"
+        "jest-regex-util": "30.5.0",
+        "jest-util": "30.5.1",
+        "jest-worker": "30.5.1",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.3"
       }
     },
     "node_modules/jest-leak-detector": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.1.0.tgz",
-      "integrity": "sha512-AoFvJzwxK+4KohH60vRuHaqXfWmeBATFZpzpmzNmYTtmRMiyGPVhkXpBqxUQunw+dQB48bDf4NpUs6ivVbRv1g==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.5.1.tgz",
+      "integrity": "sha512-gt4GT2aWgEoCNTcBe4rqS74xTIUJxi+UD9SNSu9aOk5LmTEd6fS5KSTmAKAfitCCktQHNN+upUuL6EkBfFbMDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "pretty-format": "30.0.5"
+        "@jest/get-type": "30.5.0",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.1.1.tgz",
-      "integrity": "sha512-SuH2QVemK48BNTqReti6FtjsMPFsSOD/ZzRxU1TttR7RiRsRSe78d03bb4Cx6D4bQC/80Q8U4VnaaAH9FlbZ9w==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.5.2.tgz",
+      "integrity": "sha512-lFkB365PTIHOhPzwrb9T6gvlDnPpOZ7/c3ewOKKB7bzztqjVrtlyRL2MkyfJXpyY2u2SKw001JKrTx14fBUFcQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
+        "@jest/get-type": "30.5.0",
         "chalk": "^4.1.2",
-        "jest-diff": "30.1.1",
-        "pretty-format": "30.0.5"
+        "jest-diff": "30.5.2",
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.1.0.tgz",
-      "integrity": "sha512-HizKDGG98cYkWmaLUHChq4iN+oCENohQLb7Z5guBPumYs+/etonmNFlg1Ps6yN9LTPyZn+M+b/9BbnHx3WTMDg==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.5.1.tgz",
+      "integrity": "sha512-UdQlLdd9wL/Ys7xRErckqwD6wPlSZYueosSWuHc1r2ztGLwlgPvtSJq2+BPEgaEY13WLvfFbmhTj8pba0Sd1jg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.5.1",
         "@types/stack-utils": "^2.0.3",
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
-        "micromatch": "^4.0.8",
-        "pretty-format": "30.0.5",
+        "jest-util": "30.5.1",
+        "picomatch": "^4.0.3",
+        "pretty-format": "30.5.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.6"
       },
@@ -6559,141 +6457,126 @@
       }
     },
     "node_modules/jest-mock": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz",
-      "integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.5.2.tgz",
+      "integrity": "sha512-KTHb37Fhj8xY8qPFvTFaFJHcdsumQp+ExsUlgoX232Agmc706gagBs53+CYvulV7MVQo9AgXOUxsqzzVBoJlrA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/expect-utils": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
-        "jest-util": "30.0.5"
+        "jest-util": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jest-regex-util": {
-      "version": "30.0.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-      "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+      "version": "30.5.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.5.0.tgz",
+      "integrity": "sha512-Mg0WK7A6xRHLSA1udJ8y9f3lM0uUhFTBnLKzwPmqB9AylvpleJ6BLemR8K9dK27DY+cesDryoA7yLZCAHsPG1A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.1.0.tgz",
-      "integrity": "sha512-hASe7D/wRtZw8Cm607NrlF7fi3HWC5wmA5jCVc2QjQAB2pTwP9eVZILGEi6OeSLNUtE1zb04sXRowsdh5CUjwA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.5.1.tgz",
+      "integrity": "sha512-wprhLejRtwN6h8ZgaqC0eYjGJ1uMdGPT/+b3eFncbG4NWuuP9QL+vWwRinu9waw7hkOLcpMJGVJAMgBwsPssMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.1.0",
-        "jest-pnp-resolver": "^1.2.3",
-        "jest-util": "30.0.5",
-        "jest-validate": "30.1.0",
+        "jest-haste-map": "30.5.1",
+        "jest-util": "30.5.1",
+        "jest-validate": "30.5.1",
         "slash": "^3.0.0",
-        "unrs-resolver": "^1.7.11"
+        "unrs-resolver": "^1.12.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.1.1.tgz",
-      "integrity": "sha512-tRtaaoH8Ws1Gn1o/9pedt19dvVgr81WwdmvJSP9Ow3amOUOP2nN9j94u5jC9XlIfa2Q1FQKIWWQwL4ajqsjCGQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.5.2.tgz",
+      "integrity": "sha512-GMI0DP5enX9Z2qW2zFy1bOkrCfWAOPRJQ7qHt0pdfrxBPsgWxglMPrRSK2TX/wRWYxcPRSLFg3Z88qPOzHx7FQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "30.0.1",
-        "jest-snapshot": "30.1.1"
+        "jest-regex-util": "30.5.0",
+        "jest-snapshot": "30.5.2"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.1.1.tgz",
-      "integrity": "sha512-ATe6372SOfJvCRExtCAr06I4rGujwFdKg44b6i7/aOgFnULwjxzugJ0Y4AnG+jeSeQi8dU7R6oqLGmsxRUbErQ==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.5.2.tgz",
+      "integrity": "sha512-/B6px7hiiNhVSRwuv9AGn0nawYvwsHeQZ3ItTd5Gp2diFd0EOKaWVeWqcbw3L88vx1GfpCKjQkxWItZCTl11Rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "30.1.1",
-        "@jest/environment": "30.1.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/transform": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/console": "30.5.2",
+        "@jest/environment": "30.5.2",
+        "@jest/source-map": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/transform": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
         "exit-x": "^0.2.2",
         "graceful-fs": "^4.2.11",
-        "jest-docblock": "30.0.1",
-        "jest-environment-node": "30.1.1",
-        "jest-haste-map": "30.1.0",
-        "jest-leak-detector": "30.1.0",
-        "jest-message-util": "30.1.0",
-        "jest-resolve": "30.1.0",
-        "jest-runtime": "30.1.1",
-        "jest-util": "30.0.5",
-        "jest-watcher": "30.1.1",
-        "jest-worker": "30.1.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
+        "jest-docblock": "30.5.0",
+        "jest-environment-node": "30.5.2",
+        "jest-haste-map": "30.5.1",
+        "jest-leak-detector": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-resolve": "30.5.1",
+        "jest-runtime": "30.5.2",
+        "jest-util": "30.5.1",
+        "jest-watcher": "30.5.2",
+        "jest-worker": "30.5.1",
+        "p-limit": "^3.1.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.1.1.tgz",
-      "integrity": "sha512-7sOyR0Oekw4OesQqqBHuYJRB52QtXiq0NNgLRzVogiMSxKCMiliUd6RrXHCnG5f12Age/ggidCBiQftzcA9XKw==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.5.2.tgz",
+      "integrity": "sha512-0paUAHBlheai10A3XSy9Xh+YBG0IROy+/qzcDPzQ/nbbXrznQzeWy5qniICWK6d3W3scaRQCVAbXdcK0ibBq4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "30.1.1",
-        "@jest/fake-timers": "30.1.1",
-        "@jest/globals": "30.1.1",
-        "@jest/source-map": "30.0.1",
-        "@jest/test-result": "30.1.1",
-        "@jest/transform": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/environment": "30.5.2",
+        "@jest/fake-timers": "30.5.2",
+        "@jest/globals": "30.5.2",
+        "@jest/source-map": "30.5.2",
+        "@jest/test-result": "30.5.2",
+        "@jest/transform": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
-        "cjs-module-lexer": "^2.1.0",
+        "cjs-module-lexer": "^2.2.0",
         "collect-v8-coverage": "^1.0.2",
-        "glob": "^10.3.10",
+        "es-module-lexer": "^2.1.0",
+        "glob": "^13.0.6",
         "graceful-fs": "^4.2.11",
-        "jest-haste-map": "30.1.0",
-        "jest-message-util": "30.1.0",
-        "jest-mock": "30.0.5",
-        "jest-regex-util": "30.0.1",
-        "jest-resolve": "30.1.0",
-        "jest-snapshot": "30.1.1",
-        "jest-util": "30.0.5",
+        "jest-haste-map": "30.5.1",
+        "jest-message-util": "30.5.1",
+        "jest-mock": "30.5.2",
+        "jest-regex-util": "30.5.0",
+        "jest-resolve": "30.5.1",
+        "jest-snapshot": "30.5.2",
+        "jest-util": "30.5.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
@@ -6702,9 +6585,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.1.1.tgz",
-      "integrity": "sha512-7/iBEzoJqEt2TjkQY+mPLHP8cbPhLReZVkkxjTMzIzoTC4cZufg7HzKo/n9cIkXKj2LG0x3mmBHsZto+7TOmFg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.5.2.tgz",
+      "integrity": "sha512-jKIdes25AnAH73dOCi2qE6J6vHJ6L2vyBS11M89kT50DVJcLTf2AOjvcc+2vVaN8lUbY5v2R83aqXo3Ro9fqYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6713,20 +6596,20 @@
         "@babel/plugin-syntax-jsx": "^7.27.1",
         "@babel/plugin-syntax-typescript": "^7.27.1",
         "@babel/types": "^7.27.3",
-        "@jest/expect-utils": "30.1.1",
-        "@jest/get-type": "30.1.0",
-        "@jest/snapshot-utils": "30.1.1",
-        "@jest/transform": "30.1.1",
-        "@jest/types": "30.0.5",
-        "babel-preset-current-node-syntax": "^1.1.0",
+        "@jest/expect-utils": "30.5.2",
+        "@jest/get-type": "30.5.0",
+        "@jest/snapshot-utils": "30.5.1",
+        "@jest/transform": "30.5.2",
+        "@jest/types": "30.5.1",
+        "babel-preset-current-node-syntax": "^1.2.0",
         "chalk": "^4.1.2",
-        "expect": "30.1.1",
+        "expect": "30.5.2",
         "graceful-fs": "^4.2.11",
-        "jest-diff": "30.1.1",
-        "jest-matcher-utils": "30.1.1",
-        "jest-message-util": "30.1.0",
-        "jest-util": "30.0.5",
-        "pretty-format": "30.0.5",
+        "jest-diff": "30.5.2",
+        "jest-matcher-utils": "30.5.2",
+        "jest-message-util": "30.5.1",
+        "jest-util": "30.5.1",
+        "pretty-format": "30.5.1",
         "semver": "^7.7.2",
         "synckit": "^0.11.8"
       },
@@ -6735,9 +6618,9 @@
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -6748,47 +6631,36 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-      "integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.5.1.tgz",
+      "integrity": "sha512-yKuxmNy2rSbTXw+3SIPanJo+nV4/BS1p26v44IYBFMsswSQySfMMcPHErnOncda7i9HEz0q605rIhSTBVgrZTg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "30.0.5",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
         "graceful-fs": "^4.2.11",
-        "picomatch": "^4.0.2"
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/jest-validate": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.1.0.tgz",
-      "integrity": "sha512-7P3ZlCFW/vhfQ8pE7zW6Oi4EzvuB4sgR72Q1INfW9m0FGo0GADYlPwIkf4CyPq7wq85g+kPMtPOHNAdWHeBOaA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.5.1.tgz",
+      "integrity": "sha512-i/buJ56wTpxihE93hQYNMfdOThS87+HGvLZzZJmU4xggPcdTYQq051iwALLCHp3q+SkCGH+EFejQZz5EbBSkkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/get-type": "30.1.0",
-        "@jest/types": "30.0.5",
+        "@jest/get-type": "30.5.0",
+        "@jest/types": "30.5.1",
         "camelcase": "^6.3.0",
         "chalk": "^4.1.2",
         "leven": "^3.1.0",
-        "pretty-format": "30.0.5"
+        "pretty-format": "30.5.1"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -6808,19 +6680,19 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.1.1.tgz",
-      "integrity": "sha512-CrAQ73LlaS6KGQQw6NBi71g7qvP7scy+4+2c0jKX6+CWaYg85lZiig5nQQVTsS5a5sffNPL3uxXnaE9d7v9eQg==",
+      "version": "30.5.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.5.2.tgz",
+      "integrity": "sha512-rqRgg4R11GA9m1UsEZwQeixHsgZReCn6TOHAHtIH33yXrIvoX0OGPA20Yzzjkz7X40fZvcRSxEpQppYPcWzmcQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "30.1.1",
-        "@jest/types": "30.0.5",
+        "@jest/test-result": "30.5.2",
+        "@jest/types": "30.5.1",
         "@types/node": "*",
         "ansi-escapes": "^4.3.2",
         "chalk": "^4.1.2",
         "emittery": "^0.13.1",
-        "jest-util": "30.0.5",
+        "jest-util": "30.5.1",
         "string-length": "^4.0.2"
       },
       "engines": {
@@ -6828,15 +6700,15 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-      "integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.5.1.tgz",
+      "integrity": "sha512-Cbxh5v7AoLuFRmFJSM4/aHdQ68rjXvUWr716EE0Dh3I7T+T/3FgFKhOERGXHcU2Meftq9+9zxPM3TSNyI9D+HA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@ungap/structured-clone": "^1.3.0",
-        "jest-util": "30.0.5",
+        "jest-util": "30.5.1",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.1.1"
       },
@@ -6864,16 +6736,18 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "3.15.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
+      "integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
@@ -6932,13 +6806,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -6980,14 +6847,21 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "@keyv/serialize": "^1.1.1"
       }
     },
     "node_modules/leven": {
@@ -7022,68 +6896,22 @@
       "license": "MIT"
     },
     "node_modules/linkify-it": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
-      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
-      "license": "MIT",
-      "dependencies": {
-        "uc.micro": "^2.0.0"
-      }
-    },
-    "node_modules/livereload": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.10.3.tgz",
-      "integrity": "sha512-llSb8HrtSH7ByPFMc8WTTeW3oy++smwgSA8JVGzEn8KiDPESq6jt1M4ZKKkhKTrhn2wvUOadQq4ip10E5daZ3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chokidar": "^4.0.3",
-        "livereload-js": "^4.0.2",
-        "opts": "^2.0.2",
-        "ws": "^8.4.3"
-      },
-      "bin": {
-        "livereload": "bin/livereload.js"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/livereload-js": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-4.0.2.tgz",
-      "integrity": "sha512-Fy7VwgQNiOkynYyNBTo3v9hQUhcW5pFAheJN148+DTgpShjsy/22pLHKKwDK5v0kOsZsJBK+6q1PMgLvRmrwFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/livereload/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-6.1.0.tgz",
+      "integrity": "sha512-wJ/TwpSDTLepCrQoYWYIExIKg5Zchex2Nn5yk2mFnB+6PtdkHtyLx742md9csRjjOnGkKIS/RrbY7l8D6gT9Vw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/livereload/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+        "uc.micro": "^3.0.0"
       }
     },
     "node_modules/load-json-file": {
@@ -7142,43 +6970,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
     },
     "node_modules/make-dir": {
       "version": "4.0.0",
@@ -7197,9 +6997,9 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7209,35 +7009,28 @@
         "node": ">=10"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
     "node_modules/markdown-it": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
-      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-15.0.3.tgz",
+      "integrity": "sha512-+Az7Ojz3iRGu8KYMvJ6xVhvrxP3eE+vEtJX75Ow88XBpcQNV/0lGX5ZynIIBftREo4DC2jsveAMDaeltmm8QvQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1",
-        "entities": "^4.4.0",
-        "linkify-it": "^5.0.0",
-        "mdurl": "^2.0.0",
+        "argparse": "^3.0.3",
+        "entities": "^8.1.0",
+        "linkify-it": "^6.1.0",
+        "mdurl": "^2.1.0",
         "punycode.js": "^2.3.1",
-        "uc.micro": "^2.1.0"
+        "uc.micro": "^3.0.0"
       },
       "bin": {
         "markdown-it": "bin/markdown-it.mjs"
@@ -7249,6 +7042,22 @@
       "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==",
       "license": "ISC"
     },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-3.0.3.tgz",
+      "integrity": "sha512-Sn98ftV3KfsO8xfLPHG6oT8y+b0yvbrLgZjgPDXsharNY15tTAjqIsIju4S32nl6/iEUNNE4v+yL2Zhm8ooP3w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
+      "license": "PSF-2.0"
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -7260,9 +7069,9 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz",
+      "integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==",
       "license": "MIT"
     },
     "node_modules/memorystream": {
@@ -7281,19 +7090,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -7305,34 +7101,27 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
+      "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^5.0.8"
       },
       "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "license": "MIT",
+        "node": "18 || 20 || >=22"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -7345,9 +7134,9 @@
       "license": "MIT"
     },
     "node_modules/napi-postinstall": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
-      "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
+      "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -7367,13 +7156,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -7386,8 +7168,7 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
@@ -7397,11 +7178,14 @@
       "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "version": "2.0.59",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.59.tgz",
+      "integrity": "sha512-5qr2okC4ItAI0hG5SaV0HoYMpnM/Y6+Oqr7AmPYy/2uEoGvS+GbSKLeRxSS1uAdu59yz0ouzcuXievSgg///WA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
@@ -7475,6 +7259,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/npm-run-all/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/npm-run-all/node_modules/brace-expansion": {
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
+      "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
     "node_modules/npm-run-all/node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -7544,6 +7346,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/npm-run-all/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/npm-run-all/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -7627,9 +7442,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.21",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.21.tgz",
-      "integrity": "sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==",
+      "version": "2.2.28",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.28.tgz",
+      "integrity": "sha512-IlVB7OS7qrOsVYlpnFIkETjMwT9jwvmocJmmM+GZU/PAB3uGi9Ezd7vcWhWBUnSc0ya4ppmQITOyP1ez9gg8cg==",
       "dev": true,
       "license": "MIT"
     },
@@ -7677,69 +7492,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.groupby": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
-      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
-      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/onetime": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
@@ -7774,21 +7526,15 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/opts": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz",
-      "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.2.tgz",
+      "integrity": "sha512-19YVAg7T+WTrxggPukVq7DjTv6+PJ867TmhCvBsYwmbFCsZd344rq2Ld1p0wo8f8Qrrhgp82c6FJRqdXWtSEhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.6",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "object-keys": "^1.1.1",
         "safe-push-apply": "^1.0.0"
       },
@@ -7848,19 +7594,6 @@
       "dev": true,
       "license": "BlueOak-1.0.0"
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -7916,16 +7649,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -7944,28 +7667,31 @@
       "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.5.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz",
+      "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/path-type": {
       "version": "3.0.0",
@@ -7984,15 +7710,17 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -8121,14 +7849,16 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "30.0.5",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
-      "integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.5.1.tgz",
+      "integrity": "sha512-byhRAPguVKMQIj4kjJwJ5lAskVhfuiSdiYl/aLTWpgkGEmic2jYhJh1yE9ih8Ox44Xg9ccCT11/S6QrzSJuNrg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "30.0.5",
-        "ansi-styles": "^5.2.0",
-        "react-is": "^18.3.1"
+        "@jest/react-is-18": "npm:react-is@^18.3.1",
+        "@jest/react-is-19": "npm:react-is@^19.2.5",
+        "@jest/schemas": "30.5.0",
+        "ansi-styles": "^5.2.0"
       },
       "engines": {
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -8138,6 +7868,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -8182,10 +7913,24 @@
       ],
       "license": "MIT"
     },
-    "node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+    "node_modules/qified": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/qified/-/qified-0.10.1.tgz",
+      "integrity": "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/qified/node_modules/hookified": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-2.2.0.tgz",
+      "integrity": "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/read-pkg": {
@@ -8204,16 +7949,17 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz",
+      "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/reflect.getprototypeof": {
@@ -8270,21 +8016,15 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.13",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.13.tgz",
+      "integrity": "sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "es-errors": "^1.3.0",
+        "is-core-module": "^2.17.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -8311,7 +8051,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
+    "node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
@@ -8321,16 +8061,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/rrweb-cssom": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
@@ -8339,15 +8069,15 @@
       "license": "MIT"
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz",
+      "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
@@ -8401,86 +8131,49 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.91.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
-      "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
+      "version": "1.105.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.105.2.tgz",
+      "integrity": "sha512-KxW6ZKZiBKWK3ziQ4YZ3cpqo8/1TlHXE8t9nBNvGDZFoBFbk2MD7RacxYFs8zy8hzeFwpFYkVyAhboi47uYPEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": "^4.0.0",
-        "immutable": "^5.0.2",
+        "chokidar": "^5.0.0",
+        "immutable": "^5.1.5",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
         "sass": "sass.js"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.19.0"
       },
       "optionalDependencies": {
         "@parcel/watcher": "^2.4.1"
       }
     },
-    "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "xmlchars": "^2.2.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "node": ">=v12.22.7"
       }
     },
-    "node_modules/sass/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/saxes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=v12.22.7"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -8554,9 +8247,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.12.0.tgz",
+      "integrity": "sha512-PcByqNyT/38F2kDNi006HAMRJaULuBzq/FOsw3qdZvX/GA9W/jamDaRskgHjubHiftXK5sIFxLNkvrXUwcof6Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8567,15 +8260,15 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -8587,14 +8280,14 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8653,57 +8346,37 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/snabbdom": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.2.tgz",
-      "integrity": "sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/snabbdom/-/snabbdom-3.6.4.tgz",
+      "integrity": "sha512-VmxEfuw1/Y/eFj5VtMhYnukExpYiPkNzoo3+N3qwAOUDMl8wXgbli5ebR+j0knE3lZ/0eYskLxNcX64uy10N9w==",
       "license": "MIT",
       "engines": {
         "node": ">=12.17.0"
       }
     },
     "node_modules/sortablejs": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.6.tgz",
-      "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==",
+      "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.7.tgz",
+      "integrity": "sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==",
       "license": "MIT"
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -8734,9 +8407,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.21",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "version": "3.0.24",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.24.tgz",
+      "integrity": "sha512-cLS9TtWkIQFyLkJ3/5aFQAOHOSKTlOs/7WDut/XPSdjom1fJhUdkepeJAKXa9Y05+FabHd0sti+Et559vDtkpQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -8751,6 +8424,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
@@ -8763,6 +8437,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -8796,42 +8471,19 @@
         "node": ">=10"
       }
     },
-    "node_modules/string-length/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-length/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/string-width-cjs": {
@@ -8850,69 +8502,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/string.prototype.padend": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
@@ -8933,19 +8522,20 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz",
+      "integrity": "sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
         "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-object-atoms": "^1.0.0",
-        "has-property-descriptors": "^1.0.2"
+        "es-abstract": "^1.24.2",
+        "es-object-atoms": "^1.1.2",
+        "has-property-descriptors": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8955,16 +8545,16 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz",
+      "integrity": "sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "es-object-atoms": "^1.1.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8992,19 +8582,16 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "node": ">=8"
       }
     },
     "node_modules/strip-ansi-cjs": {
@@ -9021,16 +8608,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -9065,15 +8642,16 @@
       }
     },
     "node_modules/style-mod": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.4.tgz",
+      "integrity": "sha512-XXWIQt633/EpAFx8aZDOTjBzrCaGmhvEQlQo6MVPfa2OzO2cWo+4hV9h+6UkHYlXGfy+ODXKUdP7Pthmcu5ATw==",
       "license": "MIT"
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -9103,13 +8681,13 @@
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
-      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.13.tgz",
+      "integrity": "sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@pkgr/core": "^0.2.9"
+        "@pkgr/core": "^0.3.6"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
@@ -9119,264 +8697,143 @@
       }
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz",
+      "integrity": "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/test-exclude/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "glob": "^10.4.1",
+        "minimatch": "^10.2.2"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/tldts": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
-      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tldts-core": "^6.1.86"
-      },
-      "bin": {
-        "tldts": "bin/cli.js"
+        "node": ">=18"
       }
     },
-    "node_modules/tldts-core": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
-      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+    "node_modules/test-exclude/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+      "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
       "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "license": "MIT",
       "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
-      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "ISC",
       "dependencies": {
-        "tldts": "^6.1.32"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/ts-jest": {
-      "version": "29.4.1",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz",
-      "integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==",
+    "node_modules/test-exclude/node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "bs-logger": "^0.2.6",
-        "fast-json-stable-stringify": "^2.1.0",
-        "handlebars": "^4.7.8",
-        "json5": "^2.2.3",
-        "lodash.memoize": "^4.1.2",
-        "make-error": "^1.3.6",
-        "semver": "^7.7.2",
-        "type-fest": "^4.41.0",
-        "yargs-parser": "^21.1.1"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/transform": "^29.0.0 || ^30.0.0",
-        "@jest/types": "^29.0.0 || ^30.0.0",
-        "babel-jest": "^29.0.0 || ^30.0.0",
-        "jest": "^29.0.0 || ^30.0.0",
-        "jest-util": "^29.0.0 || ^30.0.0",
-        "typescript": ">=4.3 <6"
+        "node": ">=16 || 14 >=14.17"
       },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@jest/transform": {
-          "optional": true
-        },
-        "@jest/types": {
-          "optional": true
-        },
-        "babel-jest": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "jest-util": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+    "node_modules/test-exclude/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "ISC"
     },
-    "node_modules/ts-jest/node_modules/type-fest": {
-      "version": "4.41.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+    "node_modules/test-exclude/node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
       "engines": {
-        "node": ">=16"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/ts-node": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+    "node_modules/tldts": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
+      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
+        "tldts-core": "^6.1.86"
       },
       "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
+        "tldts": "bin/cli.js"
       }
     },
-    "node_modules/tsconfig-paths": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
-      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+    "node_modules/tldts-core": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+    "node_modules/tough-cookie": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "minimist": "^1.2.0"
+        "tldts": "^6.1.32"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+    "node_modules/tr46": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
       }
     },
     "node_modules/tslib": {
@@ -9459,19 +8916,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.5.tgz",
+      "integrity": "sha512-0FHJvLPqZ7KJzp17O13jfsAjsqazgrxBu2zEK95PmUz8lv2+GjRuxUInCr2Rk9Dms3ihN21zJ929ZO43yJ95QQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "for-each": "^0.3.3",
+        "call-bind": "^1.0.9",
+        "for-each": "^0.3.5",
         "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
         "is-typed-array": "^1.1.15",
-        "reflect.getprototypeof": "^1.0.9"
+        "reflect.getprototypeof": "^1.0.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9481,18 +8937,18 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz",
+      "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
+        "call-bind": "^1.0.9",
+        "for-each": "^0.3.5",
+        "gopd": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "possible-typed-array-names": "^1.1.0",
+        "reflect.getprototypeof": "^1.0.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9502,9 +8958,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -9516,25 +8972,11 @@
       }
     },
     "node_modules/uc.micro": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
-      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-3.0.0.tgz",
+      "integrity": "sha512-U3PppEkleoTnIfi8BozMx3yju3qc/L6SwqWo2Sw+54PX+PX0q9I+r1Um5HCmqD7n9VDX5/v3vQH/AjA6deDdtw==",
       "license": "MIT"
     },
-    "node_modules/uglify-js": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -9555,50 +8997,54 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz",
+      "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/unrs-resolver": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
-      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.12.2.tgz",
+      "integrity": "sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "napi-postinstall": "^0.3.0"
+        "napi-postinstall": "^0.3.4"
       },
       "funding": {
         "url": "https://opencollective.com/unrs-resolver"
       },
       "optionalDependencies": {
-        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
-        "@unrs/resolver-binding-android-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-x64": "1.11.1",
-        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
-        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+        "@unrs/resolver-binding-android-arm-eabi": "1.12.2",
+        "@unrs/resolver-binding-android-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-arm64": "1.12.2",
+        "@unrs/resolver-binding-darwin-x64": "1.12.2",
+        "@unrs/resolver-binding-freebsd-x64": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-loong64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.12.2",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.12.2",
+        "@unrs/resolver-binding-linux-x64-musl": "1.12.2",
+        "@unrs/resolver-binding-openharmony-arm64": "1.12.2",
+        "@unrs/resolver-binding-wasm32-wasi": "1.12.2",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.12.2",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.12.2"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.4.tgz",
+      "integrity": "sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==",
       "dev": true,
       "funding": [
         {
@@ -9636,13 +9082,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -9688,16 +9127,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -9712,6 +9141,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
       "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9828,22 +9258,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.24",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.24.tgz",
+      "integrity": "sha512-wk4Mf4pR5mRP7eYuuTBCIQ9d0ud2Fv2jRLQpfgnRjbOxAFHmjKFValgTpitVKzJJS8ajnYQV2Du1SZ8j6b/EUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.9",
         "call-bound": "^1.0.4",
         "for-each": "^0.3.5",
         "get-proto": "^1.0.1",
@@ -9867,26 +9290,22 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/wrap-ansi-cjs": {
@@ -9908,121 +9327,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/write-file-atomic": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
@@ -10051,9 +9355,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz",
+      "integrity": "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10090,11 +9394,14 @@
       "license": "MIT"
     },
     "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/yallist": {
       "version": "3.1.1",
@@ -10104,22 +9411,22 @@
       "license": "ISC"
     },
     "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "17.7.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
+      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/yargs-parser": {
@@ -10132,93 +9439,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index 9ec94acc29a..bb431771e16 100644
--- a/package.json
+++ b/package.json
@@ -4,61 +4,58 @@
     "build:css:dev": "sass ./resources/sass:./public/dist --embed-sources",
     "build:css:watch": "sass ./resources/sass:./public/dist --watch --embed-sources",
     "build:css:production": "sass ./resources/sass:./public/dist -s compressed",
-    "build:js:dev": "node dev/build/esbuild.js",
-    "build:js:watch": "chokidar --initial \"./resources/**/*.js\" \"./resources/**/*.mjs\" \"./resources/**/*.ts\" -c \"npm run build:js:dev\"",
-    "build:js:production": "node dev/build/esbuild.js production",
+    "build:js:dev": "node dev/build/esbuild.mjs",
+    "build:js:watch": "node dev/build/esbuild.mjs watch",
+    "build:js:production": "node dev/build/esbuild.mjs production",
     "build": "npm-run-all --parallel build:*:dev",
     "production": "npm-run-all --parallel build:*:production",
-    "dev": "npm-run-all --parallel watch livereload",
+    "dev": "npm-run-all --parallel build:*:watch",
     "watch": "npm-run-all --parallel build:*:watch",
-    "livereload": "livereload ./public/dist/",
     "permissions": "chown -R $USER:$USER bootstrap/cache storage public/uploads",
     "lint": "eslint \"resources/**/*.js\" \"resources/**/*.mjs\"",
     "fix": "eslint --fix \"resources/**/*.js\" \"resources/**/*.mjs\"",
     "ts:lint": "tsc --noEmit",
-    "test": "jest"
+    "test": "jest",
+    "test:ci": "jest --maxWorkers=1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.34.0",
+    "@eslint/js": "^10.0.1",
     "@lezer/generator": "^1.8.0",
-    "@types/markdown-it": "^14.1.2",
-    "@types/sortablejs": "^1.15.8",
-    "chokidar-cli": "^3.0",
-    "esbuild": "^0.25.9",
-    "eslint": "^9.34.0",
-    "eslint-plugin-import": "^2.32.0",
-    "jest": "^30.1.1",
-    "jest-environment-jsdom": "^30.1.1",
-    "livereload": "^0.10.3",
+    "@swc/core": "^1.16.18",
+    "@swc/jest": "^0.2.39",
+    "@types/jest": "^30.0.0",
+    "@types/sortablejs": "^1.15.9",
+    "esbuild": "^0.28.2",
+    "eslint": "^10.2.0",
+    "globals": "^17.4.0",
+    "jest": "^30.5.2",
+    "jest-environment-jsdom": "^30.3.0",
     "npm-run-all": "^4.1.5",
-    "sass": "^1.91.0",
-    "ts-jest": "^29.4.1",
-    "ts-node": "^10.9.2",
-    "typescript": "5.9.*"
+    "sass": "^1.99.0",
+    "typescript": "6.0.*"
   },
   "dependencies": {
-    "@codemirror/commands": "^6.8.1",
+    "@codemirror/commands": "^6.10.3",
     "@codemirror/lang-css": "^6.3.1",
-    "@codemirror/lang-html": "^6.4.9",
-    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-php": "^6.0.2",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/legacy-modes": "^6.5.1",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/legacy-modes": "^6.5.2",
+    "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.1",
-    "@lezer/highlight": "^1.2.1",
+    "@codemirror/view": "^6.41.0",
+    "@lezer/highlight": "^1.2.3",
     "@ssddanbrown/codemirror-lang-smarty": "^1.0.0",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-    "@types/jest": "^30.0.0",
     "codemirror": "^6.0.2",
     "idb-keyval": "^6.2.2",
-    "markdown-it": "^14.1.0",
+    "markdown-it": "^15.0.0",
     "markdown-it-task-lists": "^2.1.1",
-    "snabbdom": "^3.6.2",
-    "sortablejs": "^1.15.6"
+    "snabbdom": "^3.6.3",
+    "sortablejs": "^1.15.7"
   }
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 72189222fcf..8c4480c494a 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,11 +7,11 @@ parameters:
         - app
 
     # The level 8 is the highest level
-    level: 3
+    level: 5
 
     phpVersion:
-        min: 80200
-        max: 80400
+        min: 80300
+        max: 80600
 
     bootstrapFiles:
       - bootstrap/phpstan.php
diff --git a/phpunit.xml b/phpunit.xml
index 8a7ab9cb7a3..be07e26d488 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          displayDetailsOnTestsThatTriggerDeprecations="true"
          colors="true">
@@ -9,6 +9,12 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
+  <groups>
+    <exclude>
+      <group>slow</group>
+      <group>lang</group>
+    </exclude>
+  </groups>
   <php>
     <server name="APP_ENV" value="testing"/>
     <server name="APP_DEBUG" value="false"/>
@@ -17,7 +23,10 @@
     <server name="APP_AUTO_LANG_PUBLIC" value="true"/>
     <server name="APP_URL" value="http://bookstack.dev"/>
     <server name="APP_TIMEZONE" value="UTC"/>
+    <server name="APP_KEY" value="base64:rt54sY5s5G9+8VmvfI0NIJs2Fzd3qsx4auLjnLE5qw0="/>
     <server name="APP_DISPLAY_TIMEZONE" value="UTC"/>
+    <server name="ALLOWED_STYLE_SOURCES" value=""/>
+    <server name="ALLOWED_IMAGE_SOURCES" value=""/>
     <server name="ALLOWED_IFRAME_HOSTS" value=""/>
     <server name="ALLOWED_IFRAME_SOURCES" value="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"/>
     <server name="ALLOWED_SSR_HOSTS" value="*"/>
@@ -34,6 +43,7 @@
     <server name="AUTH_AUTO_INITIATE" value="false"/>
     <server name="DISABLE_EXTERNAL_SERVICES" value="true"/>
     <server name="ALLOW_UNTRUSTED_SERVER_FETCHING" value="false"/>
+    <server name="CONTENT_FILTERING" value="jhfa"/>
     <server name="ALLOW_CONTENT_SCRIPTS" value="false"/>
     <server name="AVATAR_URL" value=""/>
     <server name="LDAP_START_TLS" value="false"/>
diff --git a/public/web.config b/public/web.config
index 474eb68983b..b08c89c9a34 100644
--- a/public/web.config
+++ b/public/web.config
@@ -1,6 +1,6 @@
 <!--
     Rewrites requires Microsoft URL Rewrite Module for IIS
-    Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337
+    Download: https://www.iis.net/downloads/microsoft/url-rewrite
     Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
 -->
 <configuration>
diff --git a/readme.md b/readme.md
index f4b67992c6c..297d2655987 100644
--- a/readme.md
+++ b/readme.md
@@ -1,15 +1,14 @@
 # BookStack
 
-[![GitHub release](https://img.shields.io/github/release/BookStackApp/BookStack.svg)](https://github.com/BookStackApp/BookStack/releases/latest)
-[![license](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/BookStackApp/BookStack/blob/development/LICENSE)
+[![Codeberg release](https://img.shields.io/gitea/v/release/bookstack/bookstack.svg?gitea_url=https://codeberg.org)](https://codeberg.org/bookstack/bookstack/releases/latest)
+[![license](https://img.shields.io/badge/License-MIT-yellow.svg)](https://codeberg.org/bookstack/bookstack/src/branch/development/LICENSE)
 [![Crowdin](https://badges.crowdin.net/bookstack/localized.svg)](https://crowdin.com/project/bookstack)
-[![Build Status](https://github.com/BookStackApp/BookStack/workflows/test-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
-[![Lint Status](https://github.com/BookStackApp/BookStack/workflows/lint-php/badge.svg)](https://github.com/BookStackApp/BookStack/actions)
+[![Build Status](https://codeberg.org/bookstack/bookstack/badges/workflows/test-php.yml/badge.svg)](https://codeberg.org/bookstack/bookstack/actions?workflow=test-php.yml)
+[![Lint Status](https://codeberg.org/bookstack/bookstack/badges/workflows/lint-php.yml/badge.svg)](https://codeberg.org/bookstack/bookstack/actions?workflow=lint-php.yml)
 [![php-metrics](https://img.shields.io/static/v1?label=Metrics&message=php&color=4F5B93)](https://source.bookstackapp.com/php-stats/index.html)
 <br>
 [![Alternate Source](https://img.shields.io/static/v1?label=Alt+Source&message=Git&color=ef391a&logo=git)](https://source.bookstackapp.com/)
-[![Repo Stats](https://img.shields.io/static/v1?label=GitHub+project&message=stats&color=f27e3f)](https://gh-stats.bookstackapp.com/)
-[![Discord](https://img.shields.io/static/v1?label=Discord&message=chat&color=738adb&logo=discord)](https://www.bookstackapp.com/links/discord)
+[![Community Discussions](https://img.shields.io/static/v1?label=Community&message=Discussions&color=4d36c4&logo=zulip)](https://community.bookstackapp.com/)
 [![Mastodon](https://img.shields.io/static/v1?label=Mastodon&message=@bookstack&color=595aff&logo=mastodon)](https://www.bookstackapp.com/links/mastodon)
 <br>
 [![PeerTube](https://img.shields.io/static/v1?label=PeerTube&message=bookstack@foss.video&color=f2690d&logo=peertube)](https://foss.video/c/bookstack)
@@ -20,18 +19,17 @@ A platform for storing and organising information and documentation. Details for
 * [Installation Instructions](https://www.bookstackapp.com/docs/admin/installation)
 * [Documentation](https://www.bookstackapp.com/docs)
 * [Demo Instance](https://demo.bookstackapp.com)
-    * [Admin Login](https://demo.bookstackapp.com/login?email=admin@example.com&password=password)
 * [Screenshots](https://www.bookstackapp.com/#screenshots) 
 * [BookStack Blog](https://www.bookstackapp.com/blog)
-* [Issue List](https://github.com/BookStackApp/BookStack/issues)
-* [Discord Chat](https://www.bookstackapp.com/links/discord)
+* [Issue List](https://codeberg.org/bookstack/bookstack/issues)
+* [Community Discussions](https://community.bookstackapp.com/)
 * [Support Options](https://www.bookstackapp.com/support/)
 
 ## 📚 Project Definition
 
 BookStack is an opinionated documentation platform that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it, but they should not interfere with the core simple user experience.
 
-BookStack is not designed as an extensible platform to be used for purposes that differ to the statement above.
+BookStack is not designed as an extensible platform to be used for purposes that differ from the statement above.
 
 In regard to development philosophy, BookStack has a relaxed, open & positive approach. We aim to slowly yet continuously evolve the platform while providing a stable & easy upgrade path. 
 
@@ -48,14 +46,15 @@ Big thanks to these companies for supporting the project.
 #### Gold Sponsor
 
 <table><tbody><tr>
-<td align="center"><a href="https://www.federated.computer/bookstack" target="_blank">
-    <img width="480" src="https://www.bookstackapp.com/images/sponsors/federated-computer.png" alt="Federated.computer">
-</a></td>
-</tr><tr>
 <td align="center"><a href="https://www.diagrams.net/" target="_blank">
     <img width="480" src="https://www.bookstackapp.com/images/sponsors/diagramsnet.png" alt="Diagrams.net">
 </a></td>
 </tr>
+<tr>
+<td align="center"><a href="https://www.onyx.app/?utm_source=bookstack" target="_blank">
+    <img width="400" src="https://www.bookstackapp.com/images/sponsors/onyx.png" alt="onyx.app">
+</a></td>
+</tr>
 </tbody></table>
 
 #### Bronze Sponsors
@@ -71,29 +70,32 @@ Big thanks to these companies for supporting the project.
 <td align="center"><a href="https://www.stellarhosted.com/bookstack/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/stellarhosted.png" alt="Stellar Hosted">
 </a></td>
-<td align="center" style="text-align: center"><a href="https://nws.netways.de/apps/bookstack/" target="_blank">
+<td align="center" style="text-align: center"><a href="https://nws.netways.de" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/netways.png" alt="NETWAYS Web Services">
 </a></td>
 </tr>
 <tr>
-<td align="center" style="text-align: center"><a href="https://www.schroeck-consulting.de/" target="_blank">
-    <img width="200" src="https://www.bookstackapp.com/images/sponsors/schroeck-consulting.png" alt="Schroeck IT Consulting">
-</a></td>
 <td align="center"><a href="https://practinet.be/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/practinet.png" alt="Practinet">
 </a></td>
-</tr>
-<tr>
 <td align="center"><a href="https://route4me.com/" target="_blank">
     <img width="240" src="https://www.bookstackapp.com/images/sponsors/route4me.png" alt="Route4Me - Route Optimizer and Route Planner Software">
 </a></td>
+</tr>
+<tr>
 <td align="center"><a href="https://phamos.eu" target="_blank">
-    <img width="136" src="https://www.bookstackapp.com/images/sponsors/phamos.png" alt="phamos">
+    <img width="132" src="https://www.bookstackapp.com/images/sponsors/phamos.png" alt="phamos">
+</a></td>
+<td align="center"><a href="https://sitespeak.ai/bookstack" target="_blank">
+    <img width="240" src="https://www.bookstackapp.com/images/sponsors/sitespeak.png" alt="SiteSpeakAI">
 </a></td>
 </tr>
 <tr>
-<td align="center" colspan="2"><a href="https://sitespeak.ai/bookstack" target="_blank">
-    <img width="240" src="https://www.bookstackapp.com/images/sponsors/sitespeak.png" alt="SiteSpeakAI">
+<td align="center"><a href="https://www.admin-intelligence.de/bookstack/" target="_blank">
+    <img width="210" src="https://www.bookstackapp.com/images/sponsors/admin-intelligence.png" alt="Admin Intelligence">
+</a></td>
+<td align="center"><a href="https://bookhost.co/" target="_blank">
+    <img width="210" src="https://www.bookstackapp.com/images/sponsors/bookhost.png" alt="BookHost">
 </a></td>
 </tr>
 </tbody></table>
@@ -112,19 +114,20 @@ Translations for text within BookStack are managed through the [BookStack projec
 
 Please use [Crowdin](https://crowdin.com/project/bookstack) to contribute translations instead of opening a pull request. The translations within the working codebase can be out-of-date, and merging via code can cause conflicts & sync issues. If for some reason you can't use Crowdin feel free to open an issue to discuss alternative options. 
 
-If you'd like a new language to be added to Crowdin, for you to be able to provide translations for, please [open a new issue here](https://github.com/BookStackApp/BookStack/issues/new?template=language_request.yml).
+If you'd like a new language to be added to Crowdin, for you to be able to provide translations for, please [open a new issue here](https://codeberg.org/bookstack/bookstack/issues/new?template=.forgejo%2fISSUE_TEMPLATE%2flanguage_request.yml).
 
-Please note, translations in BookStack are provided to the "Crowdin Global Translation Memory" which helps BookStack and other projects with finding translations. If you are not happy with contributing to this then providing translations to BookStack, even manually via GitHub, is not advised.
+Please note, translations in BookStack are provided to the "Crowdin Global Translation Memory" which helps BookStack and other projects with finding translations. If you are not happy with contributing to this then providing translations to BookStack, even manually via code, is not advised.
 
 ## 🎁 Contributing, Issues & Pull Requests
 
-Feel free to [create issues](https://github.com/BookStackApp/BookStack/issues/new/choose) to request new features or to report bugs & problems. Just please follow the template given when creating the issue.
+Feel free to [create issues](https://codeberg.org/bookstack/bookstack/issues/new/choose) to request new features or to report bugs & problems. Just please follow the template given when creating the issue.
 
 Pull requests are welcome but, unless it's a small tweak, it may be best to open the pull request early or create an issue for your intended change to discuss how it will fit into the project and plan out the merge. Just because a feature request exists, or is tagged, does not mean that feature would be accepted into the core project.
 
 Pull requests should be created from the `development` branch since they will be merged back into `development` once done. Please do not build from or request a merge into the `release` branch as this is only for publishing releases. If you are looking to alter CSS or JavaScript content please edit the source files found in `resources/`. Any CSS or JS files within `public` are built from these source files and therefore should not be edited directly.
+See the [Development & Testing](#-development--testing) section above for further development guidance.
 
-The project's code of conduct [can be found here](https://github.com/BookStackApp/BookStack/blob/development/.github/CODE_OF_CONDUCT.md).
+The project's community rules, including those for raising issues and making code contributions, [can be found here](https://www.bookstackapp.com/about/community-rules/).
 
 ## 🔒 Security
 
@@ -132,7 +135,7 @@ Security information for administering a BookStack instance can be found on the
 
 If you'd like to be notified of new potential security concerns you can [sign-up to the BookStack security mailing list](https://updates.bookstackapp.com/signup/bookstack-security-updates).
 
-If you would like to report a security concern, details of doing so [can be found here](https://github.com/BookStackApp/BookStack/blob/development/.github/SECURITY.md).
+If you would like to report a security concern, details of doing so [can be found here](.forgejo/SECURITY.md).
 
 ## ♿ Accessibility
 
@@ -140,18 +143,18 @@ We want BookStack to remain accessible to as many people as possible. We aim for
 
 ## 🖥️ Website, Docs & Blog
 
-The website which contains the project docs & blog can be found in the [BookStackApp/website](https://codeberg.org/bookstack/website) repo.
+The website which contains the project docs & blog can be found in the [bookstack/website](https://codeberg.org/bookstack/website) repo.
 
 ## ⚖️ License
 
-The BookStack source is provided under the [MIT License](https://github.com/BookStackApp/BookStack/blob/development/LICENSE). 
+The BookStack source is provided under the [MIT License](https://codeberg.org/bookstack/bookstack/src/branch/development/LICENSE). 
 
 The libraries used by, and included with, BookStack are provided under their own licenses and copyright.
-The licenses for many of our core dependencies can be found in the attribution list below but this is not an exhaustive list of all projects used within BookStack. 
+The licenses for many of our core dependencies can be found in the attribution list below, but this is not an exhaustive list of all projects used within BookStack. 
 
 ## 👪 Attribution
 
-The great people that have worked to build and improve BookStack can [be seen here](https://github.com/BookStackApp/BookStack/graphs/contributors). The wonderful people that have provided translations, either through GitHub or via Crowdin [can be seen here](https://github.com/BookStackApp/BookStack/blob/development/.github/translators.txt).
+The great people that have worked to build and improve BookStack can [be seen here](https://codeberg.org/bookstack/bookstack/activity/contributors). The wonderful people that have provided translations, either through GitHub, Codeberg or via Crowdin [can be seen here](https://codeberg.org/bookstack/bookstack/src/branch/development/.github/translators.txt).
 
 Below are the great open-source projects used to help build BookStack. 
 Note: This is not an exhaustive list of all libraries and projects that would be used in an active BookStack instance.
@@ -177,7 +180,8 @@ Note: This is not an exhaustive list of all libraries and projects that would be
 * [phpseclib](https://github.com/phpseclib/phpseclib) - _[MIT](https://github.com/phpseclib/phpseclib/blob/master/LICENSE)_
 * [Clockwork](https://github.com/itsgoingd/clockwork) - _[MIT](https://github.com/itsgoingd/clockwork/blob/master/LICENSE)_
 * [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan) - _[MIT](https://github.com/phpstan/phpstan/blob/master/LICENSE) and [MIT](https://github.com/nunomaduro/larastan/blob/master/LICENSE.md)_
-* [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) - _[BSD 3-Clause](https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt)_
+* [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer) - _[BSD 3-Clause](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt)_
 * [JakeArchibald/IDB-Keyval](https://github.com/jakearchibald/idb-keyval) - _[Apache-2.0](https://github.com/jakearchibald/idb-keyval/blob/main/LICENCE)_
+* [HTML Purifier](https://github.com/ezyang/htmlpurifier) and [htmlpurifier-html5](https://github.com/xemlock/htmlpurifier-html5) - _[LGPL-2.1](https://github.com/ezyang/htmlpurifier/blob/master/LICENSE) and [MIT](https://github.com/xemlock/htmlpurifier-html5/blob/master/LICENSE)_
 
-For a detailed breakdown of the JavaScript & PHP projects imported & used via NPM & composer package managers, along with their licenses, please see the [dev/licensing/js-library-licenses.txt](dev/licensing/js-library-licenses.txt) and [dev/licensing/php-library-licenses.txt](dev/licensing/php-library-licenses.txt) files. 
\ No newline at end of file
+For a detailed breakdown of the JavaScript & PHP projects imported and used via NPM & composer package managers, along with their licenses, please see the [dev/licensing/js-library-licenses.txt](dev/licensing/js-library-licenses.txt) and [dev/licensing/php-library-licenses.txt](dev/licensing/php-library-licenses.txt) files. 
\ No newline at end of file
diff --git a/resources/icons/chevron-left.svg b/resources/icons/chevron-left.svg
new file mode 100644
index 00000000000..e64210047b5
--- /dev/null
+++ b/resources/icons/chevron-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 6 16 7.41 11.42 12 16 16.59 14.59 18l-6-6z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/contents.svg b/resources/icons/contents.svg
new file mode 100644
index 00000000000..3a315b431cc
--- /dev/null
+++ b/resources/icons/contents.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M280-600v-80h560v80H280Zm0 160v-80h560v80H280Zm0 160v-80h560v80H280ZM160-600q-17 0-28.5-11.5T120-640q0-17 11.5-28.5T160-680q17 0 28.5 11.5T200-640q0 17-11.5 28.5T160-600Zm0 160q-17 0-28.5-11.5T120-480q0-17 11.5-28.5T160-520q17 0 28.5 11.5T200-480q0 17-11.5 28.5T160-440Zm0 160q-17 0-28.5-11.5T120-320q0-17 11.5-28.5T160-360q17 0 28.5 11.5T200-320q0 17-11.5 28.5T160-280Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/editor/table-header.svg b/resources/icons/editor/table-header.svg
new file mode 100644
index 00000000000..e3cfcbb6344
--- /dev/null
+++ b/resources/icons/editor/table-header.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200q-33 0-56.5-23.5T120-200m293-240h134v-160H413Zm0 240h134v-160H413ZM200-440h133v-160H200Zm427 0h133v-160H627ZM200-200h133v-160H200Zm427 0h133v-160H627Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/interface.svg b/resources/icons/interface.svg
new file mode 100644
index 00000000000..af1c5fc4975
--- /dev/null
+++ b/resources/icons/interface.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M440-120H200q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h240v720Zm-80-80v-560H200v560h160Zm160-320v-320h240q33 0 56.5 23.5T840-760v240H520Zm80-80h160v-160H600v160Zm-80 480v-320h320v240q0 33-23.5 56.5T760-120H520Zm80-80h160v-160H600v160ZM360-480Zm240-120Zm0 240Z"/></svg>
\ No newline at end of file
diff --git a/resources/js/code/languages.js b/resources/js/code/languages.js
index da9631a138a..52fc55dbf0a 100644
--- a/resources/js/code/languages.js
+++ b/resources/js/code/languages.js
@@ -33,6 +33,7 @@ const modeMap = {
     'f#': () => legacyLoad('fSharp'),
     fsharp: () => legacyLoad('fSharp'),
     go: () => legacyLoad('go'),
+    groovy: () => legacyLoad('groovy'),
     haskell: () => legacyLoad('haskell'),
     hs: () => legacyLoad('haskell'),
     html: async () => html({selfClosingTags: true}),
diff --git a/resources/js/code/legacy-modes.mjs b/resources/js/code/legacy-modes.mjs
index 7b70bec10a1..a5878ccab20 100644
--- a/resources/js/code/legacy-modes.mjs
+++ b/resources/js/code/legacy-modes.mjs
@@ -5,6 +5,8 @@ export {clojure} from '@codemirror/legacy-modes/mode/clojure';
 export {diff} from '@codemirror/legacy-modes/mode/diff';
 export {fortran} from '@codemirror/legacy-modes/mode/fortran';
 export {go} from '@codemirror/legacy-modes/mode/go';
+export {groovy} from '@codemirror/legacy-modes/mode/groovy';
+export {haxe} from '@codemirror/legacy-modes/mode/haxe';
 export {haskell} from '@codemirror/legacy-modes/mode/haskell';
 export {julia} from '@codemirror/legacy-modes/mode/julia';
 export {lua} from '@codemirror/legacy-modes/mode/lua';
diff --git a/resources/js/components/api-nav.ts b/resources/js/components/api-nav.ts
new file mode 100644
index 00000000000..a84c1cb330b
--- /dev/null
+++ b/resources/js/components/api-nav.ts
@@ -0,0 +1,32 @@
+import {Component} from "./component";
+
+export class ApiNav extends Component {
+    private select!: HTMLSelectElement;
+    private sidebar!: HTMLElement;
+    private body!: HTMLElement;
+
+    setup() {
+        this.select = this.$refs.select as HTMLSelectElement;
+        this.sidebar = this.$refs.sidebar;
+        this.body = this.$el.ownerDocument.documentElement;
+        this.select.addEventListener('change', () => {
+            const section = this.select.value;
+            const sidebarTarget = document.getElementById(`sidebar-header-${section}`);
+            const contentTarget = document.getElementById(`section-${section}`);
+            if (sidebarTarget && contentTarget) {
+
+                const sidebarPos = sidebarTarget.getBoundingClientRect().top - this.sidebar.getBoundingClientRect().top + this.sidebar.scrollTop;
+                this.sidebar.scrollTo({
+                    top: sidebarPos - 120,
+                    behavior: 'smooth',
+                });
+
+                const bodyPos = contentTarget.getBoundingClientRect().top + this.body.scrollTop;
+                this.body.scrollTo({
+                    top: bodyPos - 20,
+                    behavior: 'smooth',
+                });
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/back-to-top.js b/resources/js/components/back-to-top.js
deleted file mode 100644
index 046e640d10a..00000000000
--- a/resources/js/components/back-to-top.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import {Component} from './component';
-
-export class BackToTop extends Component {
-
-    setup() {
-        this.button = this.$el;
-        this.targetElem = document.getElementById('header');
-        this.showing = false;
-        this.breakPoint = 1200;
-
-        if (document.body.classList.contains('flexbox')) {
-            this.button.style.display = 'none';
-            return;
-        }
-
-        this.button.addEventListener('click', this.scrollToTop.bind(this));
-        window.addEventListener('scroll', this.onPageScroll.bind(this));
-    }
-
-    onPageScroll() {
-        const scrollTopPos = document.documentElement.scrollTop || document.body.scrollTop || 0;
-        if (!this.showing && scrollTopPos > this.breakPoint) {
-            this.button.style.display = 'block';
-            this.showing = true;
-            setTimeout(() => {
-                this.button.style.opacity = 0.4;
-            }, 1);
-        } else if (this.showing && scrollTopPos < this.breakPoint) {
-            this.button.style.opacity = 0;
-            this.showing = false;
-            setTimeout(() => {
-                this.button.style.display = 'none';
-            }, 500);
-        }
-    }
-
-    scrollToTop() {
-        const targetTop = this.targetElem.getBoundingClientRect().top;
-        const scrollElem = document.documentElement.scrollTop ? document.documentElement : document.body;
-        const duration = 300;
-        const start = Date.now();
-        const scrollStart = this.targetElem.getBoundingClientRect().top;
-
-        function setPos() {
-            const percentComplete = (1 - ((Date.now() - start) / duration));
-            const target = Math.abs(percentComplete * scrollStart);
-            if (percentComplete > 0) {
-                scrollElem.scrollTop = target;
-                requestAnimationFrame(setPos.bind(this));
-            } else {
-                scrollElem.scrollTop = targetTop;
-            }
-        }
-
-        requestAnimationFrame(setPos.bind(this));
-    }
-
-}
diff --git a/resources/js/components/back-to-top.ts b/resources/js/components/back-to-top.ts
new file mode 100644
index 00000000000..e47a0478acc
--- /dev/null
+++ b/resources/js/components/back-to-top.ts
@@ -0,0 +1,132 @@
+import {Component} from './component';
+
+export class BackToTop extends Component {
+
+    private container!: HTMLElement;
+    private button!: HTMLElement;
+    private progress!: HTMLElement;
+    private progressPath!: SVGPathElement;
+    private targetElem!: HTMLElement;
+
+    private showing: boolean = false;
+    private breakPoint: number = 1200;
+    private isAnimating: boolean = false;
+
+    setup(): void {
+        this.container = this.$el;
+        this.button = this.$refs.button;
+        this.progress = this.$refs.progress;
+        this.progressPath = this.$refs.progressPath as unknown as SVGPathElement;
+
+        this.targetElem = document.getElementById('header') as HTMLElement;
+
+        if (document.body.classList.contains('flexbox')) {
+            this.container.style.display = 'none';
+            return;
+        }
+
+        this.button.addEventListener('click', this.scrollToTop.bind(this));
+        window.addEventListener('scroll', this.onPageScroll.bind(this));
+
+        this.setupProgressBar();
+    }
+
+    private setupProgressBar(): void {
+        this.button.addEventListener('transitionstart', event => {
+            if (event.target !== this.button) return;
+            this.isAnimating = true;
+            this.renderProgressPath();
+        });
+        const stopAnimating = (event: TransitionEvent) => {
+            if (event.target !== this.button) return;
+            this.isAnimating = false;
+        };
+        this.button.addEventListener('transitionend', stopAnimating);
+        this.button.addEventListener('transitioncancel', stopAnimating);
+        this.renderProgressPath();
+    }
+
+    private onPageScroll(): void {
+        const scrollTopPos = document.documentElement.scrollTop || document.body.scrollTop || 0;
+        if (!this.showing && scrollTopPos > this.breakPoint) {
+            this.container.style.display = 'block';
+            this.showing = true;
+            setTimeout(() => {
+                this.container.style.opacity = '0.4';
+            }, 1);
+        } else if (this.showing && scrollTopPos < this.breakPoint) {
+            this.container.style.opacity = '0';
+            this.showing = false;
+            setTimeout(() => {
+                this.container.style.display = 'none';
+            }, 500);
+        }
+
+        if (this.showing) {
+            const maxScrollTop = document.documentElement.scrollHeight - window.innerHeight;
+            const scrollTopPercent = (scrollTopPos / maxScrollTop) * 100;
+            this.updateProgress(scrollTopPercent);
+        }
+    }
+
+    private scrollToTop(): void {
+        const targetTop = this.targetElem.getBoundingClientRect().top;
+        const scrollElem = document.documentElement.scrollTop ? document.documentElement : document.body;
+        const duration = 300;
+        const start = Date.now();
+        const scrollStart = this.targetElem.getBoundingClientRect().top;
+
+        const setPos = () => {
+            const percentComplete = (1 - ((Date.now() - start) / duration));
+            const target = Math.abs(percentComplete * scrollStart);
+            if (percentComplete > 0) {
+                scrollElem.scrollTop = target;
+                requestAnimationFrame(setPos);
+            } else {
+                scrollElem.scrollTop = targetTop;
+            }
+        };
+
+        requestAnimationFrame(setPos);
+    }
+
+    private renderProgressPath(): void {
+        const bounds = this.button.getBoundingClientRect();
+        const progressInset = window.getComputedStyle(this.progress).insetInlineStart;
+        const offset = Math.abs(Number(progressInset.replace('px', '') || 0));
+        const path = this.roundedRectPath(bounds.width, bounds.height, bounds.height / 2, offset);
+        this.progressPath.setAttribute('d', path);
+        if (this.isAnimating) {
+            window.requestAnimationFrame(this.renderProgressPath.bind(this));
+        }
+    }
+
+    private updateProgress(percentComplete: number): void {
+        if (percentComplete < 5) {
+            percentComplete = 5;
+        }
+        this.progressPath.setAttribute('stroke-dasharray', `${Math.ceil(percentComplete)} 100`);
+    }
+
+    private roundedRectPath(w: number, h: number, r: number, offset: number = 1.5): string {
+        // Expand dimensions outward by the offset
+        const W = w + 2 * offset;
+        const H = h + 2 * offset;
+
+        // The corner radius also grows by the offset
+        const R = Math.min(r + offset, W / 2, H / 2);
+
+        return [
+            `M ${W / 2} 0`,                       // start at top center
+            `H ${W - R}`,                          // line to top-right (before arc)
+            `A ${R} ${R} 0 0 1 ${W} ${R}`,        // arc: top-right corner
+            `V ${H - R}`,                          // line down right edge
+            `A ${R} ${R} 0 0 1 ${W - R} ${H}`,    // arc: bottom-right corner
+            `H ${R}`,                              // line across bottom edge
+            `A ${R} ${R} 0 0 1 ${0} ${H - R}`,    // arc: bottom-left corner
+            `V ${R}`,                              // line up left edge
+            `A ${R} ${R} 0 0 1 ${R} ${0}`,        // arc: top-left corner
+            `Z`                                    // close path back to start
+        ].join(' ');
+    }
+}
diff --git a/resources/js/components/custom-checkbox.js b/resources/js/components/custom-checkbox.js
deleted file mode 100644
index a5f1d566424..00000000000
--- a/resources/js/components/custom-checkbox.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {Component} from './component';
-
-export class CustomCheckbox extends Component {
-
-    setup() {
-        this.container = this.$el;
-        this.checkbox = this.container.querySelector('input[type=checkbox]');
-        this.display = this.container.querySelector('[role="checkbox"]');
-
-        this.checkbox.addEventListener('change', this.stateChange.bind(this));
-        this.container.addEventListener('keydown', this.onKeyDown.bind(this));
-    }
-
-    onKeyDown(event) {
-        const isEnterOrSpace = event.key === ' ' || event.key === 'Enter';
-        if (isEnterOrSpace) {
-            event.preventDefault();
-            this.toggle();
-        }
-    }
-
-    toggle() {
-        this.checkbox.checked = !this.checkbox.checked;
-        this.checkbox.dispatchEvent(new Event('change'));
-        this.stateChange();
-    }
-
-    stateChange() {
-        const checked = this.checkbox.checked ? 'true' : 'false';
-        this.display.setAttribute('aria-checked', checked);
-    }
-
-}
diff --git a/resources/js/components/dropdown.js b/resources/js/components/dropdown.js
index d2b044ee1ca..4da08f23189 100644
--- a/resources/js/components/dropdown.js
+++ b/resources/js/components/dropdown.js
@@ -12,7 +12,7 @@ export class Dropdown extends Component {
         this.container = this.$el;
         this.menu = this.$refs.menu;
         this.toggle = this.$refs.toggle;
-        this.moveMenu = this.$opts.moveMenu;
+        this.fixedPositionMenu = this.$opts.fixedPositionMenu === 'true';
         this.bubbleEscapes = this.$opts.bubbleEscapes === 'true';
 
         this.direction = (document.dir === 'rtl') ? 'right' : 'left';
@@ -33,13 +33,13 @@ export class Dropdown extends Component {
         const menuOriginalRect = this.menu.getBoundingClientRect();
         let heightOffset = 0;
         const toggleHeight = this.toggle.getBoundingClientRect().height;
-        const containerBounds = findClosestScrollContainer(this.menu).getBoundingClientRect();
+        const containerEl = this.fixedPositionMenu ? this.body : findClosestScrollContainer(this.menu);
+        const containerBounds = containerEl.getBoundingClientRect();
         const dropUpwards = menuOriginalRect.bottom > containerBounds.bottom;
         const containerRect = this.container.getBoundingClientRect();
 
         // If enabled, Move to body to prevent being trapped within scrollable sections
-        if (this.moveMenu) {
-            this.body.appendChild(this.menu);
+        if (this.fixedPositionMenu) {
             this.menu.style.position = 'fixed';
             this.menu.style.width = `${menuOriginalRect.width}px`;
             this.menu.style.left = `${menuOriginalRect.left}px`;
@@ -99,12 +99,11 @@ export class Dropdown extends Component {
         this.menu.style.bottom = '';
         this.menu.style.maxHeight = '';
 
-        if (this.moveMenu) {
+        if (this.fixedPositionMenu) {
             this.menu.style.position = '';
             this.menu.style[this.direction] = '';
             this.menu.style.width = '';
             this.menu.style.left = '';
-            this.container.appendChild(this.menu);
         }
 
         this.showing = false;
@@ -125,10 +124,6 @@ export class Dropdown extends Component {
             this.hide();
         });
 
-        if (this.moveMenu) {
-            keyboardNavHandler.shareHandlingToEl(this.menu);
-        }
-
         // Hide menu on option click
         this.container.addEventListener('click', event => {
             const possibleChildren = Array.from(this.menu.querySelectorAll('a'));
diff --git a/resources/js/components/image-manager.js b/resources/js/components/image-manager.js
index 84ba333f9da..157dc4a298a 100644
--- a/resources/js/components/image-manager.js
+++ b/resources/js/components/image-manager.js
@@ -18,11 +18,11 @@ export class ImageManager extends Component {
         this.listContainer = this.$refs.listContainer;
         this.filterTabs = this.$manyRefs.filterTabs;
         this.selectButton = this.$refs.selectButton;
-        this.uploadButton = this.$refs.uploadButton;
+        this.uploadButton = this.$refs.uploadButton || null;
         this.uploadHint = this.$refs.uploadHint;
         this.formContainer = this.$refs.formContainer;
         this.formContainerPlaceholder = this.$refs.formContainerPlaceholder;
-        this.dropzoneContainer = this.$refs.dropzoneContainer;
+        this.dropzoneContainer = this.$refs.dropzoneContainer || null;
         this.loadMore = this.$refs.loadMore;
 
         // Instance data
@@ -139,13 +139,15 @@ export class ImageManager extends Component {
         this.getPopup().show();
 
         const hideUploads = type !== 'gallery';
-        this.dropzoneContainer.classList.toggle('hidden', hideUploads);
-        this.uploadButton.classList.toggle('hidden', hideUploads);
-        this.uploadHint.classList.toggle('hidden', hideUploads);
+        this.dropzoneContainer?.toggleAttribute('hidden', hideUploads);
+        this.uploadButton?.toggleAttribute('hidden', hideUploads);
+        this.uploadHint.toggleAttribute('hidden', hideUploads);
 
-        /** @var {Dropzone} * */
+        /** @var {Dropzone|null} * */
         const dropzone = window.$components.firstOnElement(this.container, 'dropzone');
-        dropzone.toggleActive(!hideUploads);
+        if (dropzone) {
+            dropzone.toggleActive(!hideUploads);
+        }
 
         if (!this.hasData) {
             this.loadGallery();
diff --git a/resources/js/components/index.ts b/resources/js/components/index.ts
index 63e1ad0dbf7..905f1f08ec1 100644
--- a/resources/js/components/index.ts
+++ b/resources/js/components/index.ts
@@ -1,6 +1,7 @@
 export {AddRemoveRows} from './add-remove-rows';
 export {AjaxDeleteRow} from './ajax-delete-row';
 export {AjaxForm} from './ajax-form';
+export {ApiNav} from './api-nav';
 export {Attachments} from './attachments';
 export {AttachmentsList} from './attachments-list';
 export {AutoSuggest} from './auto-suggest';
@@ -13,7 +14,6 @@ export {CodeHighlighter} from './code-highlighter';
 export {CodeTextarea} from './code-textarea';
 export {Collapsible} from './collapsible';
 export {ConfirmDialog} from './confirm-dialog';
-export {CustomCheckbox} from './custom-checkbox';
 export {DetailsHighlighter} from './details-highlighter';
 export {Dropdown} from './dropdown';
 export {DropdownSearch} from './dropdown-search';
@@ -29,6 +29,7 @@ export {GlobalSearch} from './global-search';
 export {HeaderMobileToggle} from './header-mobile-toggle';
 export {ImageManager} from './image-manager';
 export {ImagePicker} from './image-picker';
+export {LayoutEditor} from './layout-editor';
 export {ListSortControl} from './list-sort-control';
 export {LoadingButton} from './loading-button';
 export {MarkdownEditor} from './markdown-editor';
@@ -57,6 +58,7 @@ export {Tabs} from './tabs';
 export {TagManager} from './tag-manager';
 export {TemplateManager} from './template-manager';
 export {ToggleSwitch} from './toggle-switch';
+export {ToolboxContents} from './toolbox-contents';
 export {TriLayout} from './tri-layout';
 export {UserSelect} from './user-select';
 export {WebhookEvents} from './webhook-events';
diff --git a/resources/js/components/layout-editor.ts b/resources/js/components/layout-editor.ts
new file mode 100644
index 00000000000..babacc2765c
--- /dev/null
+++ b/resources/js/components/layout-editor.ts
@@ -0,0 +1,82 @@
+import Sortable from "sortablejs";
+import {Component} from "./component";
+import {buildListActions, sortActionClickListener} from "../services/multi-lists";
+
+
+export class LayoutEditor extends Component {
+    protected input!: HTMLInputElement;
+    protected columns!: HTMLElement[];
+    protected actionMenus!: HTMLElement[];
+
+    setup(): void {
+        this.input = this.$refs.input as HTMLInputElement;
+        this.columns = this.$manyRefs.column || [];
+        this.actionMenus = this.$manyRefs.actionMenu || [];
+
+        this.initSortable();
+
+        const unusedColumn = this.columns.find(column => column.dataset.column === 'unused') as HTMLElement;
+        const listActions = buildListActions(...this.columns);
+        listActions.add = this.addBlockToLeastPopulated.bind(this);
+        listActions.remove = function (item: HTMLElement) {
+            unusedColumn.appendChild(item);
+        };
+        const sortActionListener = sortActionClickListener(listActions, this.onChange.bind(this));
+        for (const actionMenu of this.actionMenus) {
+            actionMenu.addEventListener('click', sortActionListener);
+        }
+    }
+
+    protected initSortable(): void {
+        const sortAction = this.onChange.bind(this);
+
+        for (const column of this.columns) {
+            new Sortable(column, {
+                group: 'layout-editor-blocks',
+                ghostClass: 'primary-background-light',
+                handle: '.handle',
+                animation: 150,
+                onSort: sortAction,
+            });
+        }
+    }
+
+    protected onChange(): void {
+        const configured: Record<string, string[]> = {};
+        for (const column of this.columns) {
+            const location = column.dataset.column || '';
+            if (!location) continue;
+            configured[location] = [];
+
+            const blockNodes = column.children;
+            for (let i = 0; i < blockNodes.length; i++) {
+                const blockNode = blockNodes[i] as HTMLElement;
+                const blockId = blockNode.dataset.blockId || '';
+                if (!blockId) continue;
+                configured[location].push(blockId);
+            }
+        }
+
+        this.input.value = JSON.stringify(configured, null, 2);
+    }
+
+    protected addBlockToLeastPopulated(item: HTMLElement): void {
+        let populationCount = 100;
+        let leastPopulated: null|HTMLElement = null
+        for (const column of this.columns) {
+            const blockCount = column.children.length;
+            if (column.dataset.column === 'unused') {
+                continue;
+            }
+
+            if (blockCount < populationCount) {
+                leastPopulated = column;
+                populationCount = blockCount;
+            }
+        }
+
+        if (leastPopulated) {
+            leastPopulated.appendChild(item);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/page-comment.ts b/resources/js/components/page-comment.ts
index 8334ebb8a09..68cd46f041c 100644
--- a/resources/js/components/page-comment.ts
+++ b/resources/js/components/page-comment.ts
@@ -2,7 +2,7 @@ import {Component} from './component';
 import {getLoading, htmlToDom} from '../services/dom';
 import {PageCommentReference} from "./page-comment-reference";
 import {HttpError} from "../services/http";
-import {SimpleWysiwygEditorInterface} from "../wysiwyg";
+import {createCommentEditorInstance, SimpleWysiwygEditorInterface} from "../wysiwyg";
 import {el} from "../wysiwyg/utils/dom";
 
 export interface PageCommentReplyEventData {
@@ -104,7 +104,7 @@ export class PageComment extends Component {
         this.input.parentElement?.appendChild(container);
         this.input.hidden = true;
 
-        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, editorContent, {
+        this.wysiwygEditor = wysiwygModule.createCommentEditorInstance(container as HTMLElement, editorContent, {
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.$opts.textDirection,
             translations: (window as unknown as Record<string, Object>).editor_translations,
diff --git a/resources/js/components/page-comments.ts b/resources/js/components/page-comments.ts
index a1eeda1f9d9..707ca3f6936 100644
--- a/resources/js/components/page-comments.ts
+++ b/resources/js/components/page-comments.ts
@@ -5,7 +5,7 @@ import {PageCommentReference} from "./page-comment-reference";
 import {scrollAndHighlightElement} from "../services/util";
 import {PageCommentArchiveEventData, PageCommentReplyEventData} from "./page-comment";
 import {el} from "../wysiwyg/utils/dom";
-import {SimpleWysiwygEditorInterface} from "../wysiwyg";
+import {createCommentEditorInstance, SimpleWysiwygEditorInterface} from "../wysiwyg";
 
 export class PageComments extends Component {
 
@@ -200,7 +200,7 @@ export class PageComments extends Component {
         this.formInput.parentElement?.appendChild(container);
         this.formInput.hidden = true;
 
-        this.wysiwygEditor = wysiwygModule.createBasicEditorInstance(container as HTMLElement, '<p></p>', {
+        this.wysiwygEditor = wysiwygModule.createCommentEditorInstance(container as HTMLElement, '<p></p>', {
             darkMode: document.documentElement.classList.contains('dark-mode'),
             textDirection: this.wysiwygTextDirection,
             translations: (window as unknown as Record<string, Object>).editor_translations,
diff --git a/resources/js/components/page-editor.js b/resources/js/components/page-editor.js
index 54245350489..1cd33f2faf4 100644
--- a/resources/js/components/page-editor.js
+++ b/resources/js/components/page-editor.js
@@ -76,11 +76,13 @@ export class PageEditor extends Component {
 
         // Changelog controls
         const updateChangelogDebounced = debounce(this.updateChangelogDisplay.bind(this), 300, false);
-        this.changelogInput.addEventListener('input', () => {
+        const onChangelogInput = () => {
             const count = this.changelogInput.value.length;
             this.changelogCounter.innerText = `${count} / 180`;
             updateChangelogDebounced();
-        });
+        };
+        this.changelogInput.addEventListener('input', onChangelogInput.bind(this));
+        onChangelogInput();
 
         // Draft Controls
         onSelect(this.saveDraftButton, this.saveDraft.bind(this));
@@ -121,7 +123,10 @@ export class PageEditor extends Component {
     }
 
     async saveDraft() {
-        const data = {name: this.titleElem.value.trim()};
+        const data = {
+            name: this.titleElem.value.trim(),
+            changelog: this.changelogInput.value || '',
+        };
 
         const editorContent = await this.getEditorComponent().getContent();
         Object.assign(data, editorContent);
@@ -206,7 +211,7 @@ export class PageEditor extends Component {
 
         try {
             const discard = this.discardDraft(false);
-            const draftDelete = window.$http.delete(`/page-revisions/user-drafts/${this.pageId}`);
+            const draftDelete = window.$http.delete(`/page-user-drafts/${this.pageId}`);
             await Promise.all([discard, draftDelete]);
             window.$events.success(this.draftDeleteText);
             this.deleteDraftWrap.toggleAttribute('hidden', true);
diff --git a/resources/js/components/pointer.ts b/resources/js/components/pointer.ts
index 4b927045aae..37d8cc0763c 100644
--- a/resources/js/components/pointer.ts
+++ b/resources/js/components/pointer.ts
@@ -105,7 +105,9 @@ export class Pointer extends Component {
      */
     showPointerAtTarget(element: HTMLElement, xPosition: number, keyboardMode: boolean) {
         this.targetElement = element;
-        this.targetSelectionRange = window.getSelection()?.getRangeAt(0) || null;
+        const selectionMade = window.getSelection();
+        const selectionDirection = selectionMade?.direction || '';
+        this.targetSelectionRange = selectionMade?.getRangeAt(0) || null;
         this.updateDomForTarget(element);
 
         this.pointer.style.display = 'block';
@@ -131,7 +133,12 @@ export class Pointer extends Component {
             window.removeEventListener('scroll', scrollListener);
         };
 
-        element.parentElement?.insertBefore(this.pointer, element);
+        if (selectionDirection === 'forward') {
+            element.after(this.pointer);
+        } else {
+            element.before(this.pointer);
+        }
+
         if (!keyboardMode) {
             window.addEventListener('scroll', scrollListener, {passive: true});
         }
diff --git a/resources/js/components/shelf-sort.js b/resources/js/components/shelf-sort.js
index b56b01980a1..593bf03a6a9 100644
--- a/resources/js/components/shelf-sort.js
+++ b/resources/js/components/shelf-sort.js
@@ -1,6 +1,6 @@
 import Sortable from 'sortablejs';
 import {Component} from './component';
-import {buildListActions, sortActionClickListener} from '../services/dual-lists.ts';
+import {buildListActions, sortActionClickListener} from '../services/multi-lists.ts';
 
 export class ShelfSort extends Component {
 
diff --git a/resources/js/components/sort-rule-manager.ts b/resources/js/components/sort-rule-manager.ts
index ff08f4ab878..70d885815b0 100644
--- a/resources/js/components/sort-rule-manager.ts
+++ b/resources/js/components/sort-rule-manager.ts
@@ -1,6 +1,6 @@
 import {Component} from "./component.js";
 import Sortable from "sortablejs";
-import {buildListActions, sortActionClickListener} from "../services/dual-lists";
+import {buildListActions, sortActionClickListener} from "../services/multi-lists";
 
 
 export class SortRuleManager extends Component {
diff --git a/resources/js/components/toggle-switch.js b/resources/js/components/toggle-switch.ts
similarity index 65%
rename from resources/js/components/toggle-switch.js
rename to resources/js/components/toggle-switch.ts
index e8209eb2797..5343b189d44 100644
--- a/resources/js/components/toggle-switch.js
+++ b/resources/js/components/toggle-switch.ts
@@ -1,10 +1,17 @@
 import {Component} from './component';
 
+/**
+ * A toggle switch style input which specifically also has true/false submittable states.
+ * This is done via a hidden input for the actual value, with a checkbox input for control/UI.
+ */
 export class ToggleSwitch extends Component {
 
+    protected input!: HTMLInputElement;
+    protected checkbox!: HTMLInputElement;
+
     setup() {
-        this.input = this.$el.querySelector('input[type=hidden]');
-        this.checkbox = this.$el.querySelector('input[type=checkbox]');
+        this.input = this.$el.querySelector('input[type=hidden]') as HTMLInputElement;
+        this.checkbox = this.$el.querySelector('input[type=checkbox]') as HTMLInputElement;
 
         this.checkbox.addEventListener('change', this.stateChange.bind(this));
     }
@@ -17,5 +24,4 @@ export class ToggleSwitch extends Component {
         const changeEvent = new Event('change');
         this.input.dispatchEvent(changeEvent);
     }
-
 }
diff --git a/resources/js/components/toolbox-contents.ts b/resources/js/components/toolbox-contents.ts
new file mode 100644
index 00000000000..1cbaeda5dda
--- /dev/null
+++ b/resources/js/components/toolbox-contents.ts
@@ -0,0 +1,152 @@
+import {Component} from "./component";
+import {debounce} from "../services/util";
+import {EditorToolboxChangeEventData} from "./editor-toolbox";
+import {PageEditor} from "./page-editor";
+import {MarkdownEditor} from "./markdown-editor";
+import {WysiwygEditorTinymce} from "./wysiwyg-editor-tinymce";
+import {WysiwygEditor} from "./wysiwyg-editor";
+import {elem} from "../services/dom";
+import {patchDomFromDom} from "../services/vdom";
+
+interface ToolboxContentHeader {
+    // The text shown for the header
+    text: string;
+    // The level/depth of the header
+    level: number;
+    // The index of the header relative to all other headers in the content
+    index: number;
+    // The id set for the header (if at all)
+    id: string;
+}
+
+export class ToolboxContents extends Component {
+    protected container!: HTMLElement;
+    protected noneEl!: HTMLElement;
+    protected display!: HTMLElement;
+    protected isActive: boolean = false;
+
+    setup() {
+        this.container = this.$el as HTMLLinkElement;
+        this.noneEl = this.$refs.none;
+        this.display = this.$refs.display;
+
+        // Listen to when visible in the editor toolbox so we only update when visible
+        window.addEventListener('editor-toolbox-change', ((event: CustomEvent<EditorToolboxChangeEventData>) => {
+            const tabName: string = event.detail.tab;
+            const isOpen = event.detail.open;
+            if (tabName === 'contents' && isOpen) {
+                if (this.isActive !== true) {
+                    this.render();
+                }
+                this.isActive = true;
+            } else {
+                this.isActive = false;
+            }
+        }) as EventListener);
+
+        // Listen to content changes from the editor
+        const onContentChangeDebounced = debounce(this.onContentChange.bind(this), 500, false);
+        window.$events.listen('editor-html-change', onContentChangeDebounced);
+        window.$events.listen('editor-markdown-change', onContentChangeDebounced);
+
+        // Listen to header click
+        this.container.addEventListener('click', (event) => {
+            const header = (event.target as HTMLElement).closest('li[data-index]');
+            if (header instanceof HTMLElement) {
+                event.preventDefault();
+                this.onHeaderSelect(header);
+            }
+        });
+    }
+
+    protected onHeaderSelect(headerElement: HTMLElement): void {
+        const id = headerElement.getAttribute('data-id') || '';
+        const index = Number(headerElement.getAttribute('data-index') || '');
+        window.$events.emit('editor::focus-heading', {
+            index,
+            id,
+        });
+    }
+
+    protected onContentChange(): void {
+        if (!this.isActive) {
+            return;
+        }
+        this.render();
+    }
+
+    protected async render(): Promise<void> {
+        const editorHtml = await this.getEditorHtml();
+        const headers = this.parseHeadersFromHtml(editorHtml);
+        this.rebaseHeaders(headers);
+
+        const headerDom = this.headersToDom(headers);
+        let displayChild = this.display.firstElementChild;
+        if (!displayChild) {
+            displayChild = document.createElement("ul");
+            this.display.appendChild(displayChild);
+        }
+        patchDomFromDom(displayChild, headerDom);
+
+        this.noneEl.hidden = headers.length > 0;
+    }
+
+    protected async getEditorHtml(): Promise<string> {
+        const pageEditorComponent = window.$components.first('page-editor') as PageEditor;
+        const editor = pageEditorComponent.getEditorComponent() as (MarkdownEditor|WysiwygEditorTinymce|WysiwygEditor);
+        return (await editor.getContent()).html;
+    }
+
+    protected parseHeadersFromHtml(html: string): ToolboxContentHeader[] {
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(html, 'text/html');
+        const headerNodes = doc.querySelectorAll('h1, h2, h3, h4, h5, h6');
+        const headers: ToolboxContentHeader[] = [];
+
+        for (let i = 0; i < headerNodes.length; i++) {
+            const headerNode = headerNodes[i];
+            const level = Number(headerNode.tagName.replace('H', ''));
+            headers.push({
+                text: headerNode.textContent,
+                level,
+                id: headerNode.id || '',
+                index: i,
+            });
+        }
+
+        return headers;
+    }
+
+    protected rebaseHeaders(headers: ToolboxContentHeader[]): void {
+        if (headers.length === 0) {
+            return;
+        }
+
+        do {
+            var minLevel = Math.min(...headers.map(h => h.level));
+            if (minLevel > 1) {
+                for (const header of headers) {
+                    header.level--;
+                }
+            }
+        } while (minLevel > 1);
+    }
+
+    protected headersToDom(headers: ToolboxContentHeader[]): HTMLElement {
+        const headerItems = headers.map(header => {
+            return elem('li', {
+                'data-level': String(header.level),
+                'data-index': String(header.index),
+                'data-id': header.id,
+                id: `page-contents-${header.id}`,
+                class: `page-nav-item h${header.level}`,
+            }, [
+                elem('a', {class: 'text-limit-lines-1 block', href: `#${header.id}`}, [header.text]),
+                elem('div', {class: 'link-background sidebar-page-nav-bullet'}),
+            ]);
+        });
+        return elem('ul', {
+            class: 'sidebar-page-nav menu'
+        }, headerItems);
+    }
+}
diff --git a/resources/js/markdown/actions.ts b/resources/js/markdown/actions.ts
index 36d21ab1dc6..2fd02c8c8d3 100644
--- a/resources/js/markdown/actions.ts
+++ b/resources/js/markdown/actions.ts
@@ -184,14 +184,41 @@ export class Actions {
         }
     }
 
-    focus() {
+    /**
+     * Set user focus on the editor edit area.
+     */
+    focus(): void {
         this.editor.input.focus();
     }
 
+    /**
+     * Focus on the text for a specific header in the content.
+     */
+    focusOnHeader(index: number): void {
+        const headerPattern = /^\s{0,3}(#+|<h[1-6][\s>])/i;
+        const codeBoundary = /^\s{0,3}```/i;
+        let currentIndex = -1;
+        let inCodeBoundary = false;
+        this.editor.input.forEachLine((num: number, content: string, range: MarkdownEditorInputSelection) => {
+             const isHeader = headerPattern.test(content);
+             if (isHeader && !inCodeBoundary) {
+                 currentIndex++;
+                 if (currentIndex === index) {
+                     this.editor.input.setSelection({from: range.to, to: range.to}, true);
+                     return false;
+                 }
+             } else if (codeBoundary.test(content)) {
+                 inCodeBoundary = !inCodeBoundary;
+             }
+        });
+
+        this.focus();
+    }
+
     /**
      * Insert content into the editor.
      */
-    insertContent(content: string) {
+    insertContent(content: string): void {
         this.#replaceSelection(content, content.length);
     }
 
diff --git a/resources/js/markdown/common-events.ts b/resources/js/markdown/common-events.ts
index 4bfc4bb4619..e24f39dab8a 100644
--- a/resources/js/markdown/common-events.ts
+++ b/resources/js/markdown/common-events.ts
@@ -33,4 +33,8 @@ export function listenToCommonEvents(editor: MarkdownEditor): void {
     window.$events.listen('editor::focus', () => {
         editor.actions.focus();
     });
+
+    window.$events.listen<{id: string, index: number}>('editor::focus-heading', ({index}) => {
+        editor.actions.focusOnHeader(index);
+    });
 }
diff --git a/resources/js/markdown/inputs/codemirror.ts b/resources/js/markdown/inputs/codemirror.ts
index 827068238e0..8cc7f409cc5 100644
--- a/resources/js/markdown/inputs/codemirror.ts
+++ b/resources/js/markdown/inputs/codemirror.ts
@@ -102,6 +102,19 @@ export class CodemirrorInput implements MarkdownEditorInput {
         return {from: line.from, to: line.to};
     }
 
+    forEachLine(callback: (lineNum: number, content: string, range: MarkdownEditorInputSelection) => false | void): void {
+        const docText = this.cm.state.doc;
+        let lineCount = 0;
+        for (const line of docText.iterLines()) {
+            lineCount++;
+            const lineInfo = docText.line(lineCount);
+            const result = callback(lineCount, line, {from: lineInfo.from, to: lineInfo.to});
+            if (result === false) {
+                break;
+            }
+        }
+    }
+
     /**
      * Dispatch changes to the editor.
      */
diff --git a/resources/js/markdown/inputs/interface.ts b/resources/js/markdown/inputs/interface.ts
index 1f7474a5088..d39f7dc1418 100644
--- a/resources/js/markdown/inputs/interface.ts
+++ b/resources/js/markdown/inputs/interface.ts
@@ -74,6 +74,12 @@ export interface MarkdownEditorInput {
      */
     searchForLineContaining(text: string): MarkdownEditorInputSelection|null;
 
+    /**
+     * Run the provided callback against each line of content within the input.
+     * Callback can return false to stop further processing.
+     */
+    forEachLine(callback: (lineNum: number, content: string, range: MarkdownEditorInputSelection) => false|void): void;
+
     /**
      * Tear down the input.
      */
diff --git a/resources/js/markdown/inputs/textarea.ts b/resources/js/markdown/inputs/textarea.ts
index e0c3ac37cf2..c232a24bf46 100644
--- a/resources/js/markdown/inputs/textarea.ts
+++ b/resources/js/markdown/inputs/textarea.ts
@@ -214,6 +214,20 @@ export class TextareaInput implements MarkdownEditorInput {
         return null;
     }
 
+    forEachLine(callback: (lineNum: number, content: string, range: MarkdownEditorInputSelection) => false | void): void {
+        const lines = this.getText().split('\n');
+        let lineStart = 0;
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const lineEnd = lineStart + line.length;
+            const result = callback(i + 1, line, {from: lineStart, to: lineEnd});
+            if (result === false) {
+                break;
+            }
+            lineStart = lineEnd + 1;
+        }
+    }
+
     setSelection(selection: MarkdownEditorInputSelection, scrollIntoView: boolean): void {
         this.input.selectionStart = selection.from;
         this.input.selectionEnd = selection.to;
diff --git a/resources/js/markdown/markdown.ts b/resources/js/markdown/markdown.ts
index 07ea09e9113..8b9382039f8 100644
--- a/resources/js/markdown/markdown.ts
+++ b/resources/js/markdown/markdown.ts
@@ -1,9 +1,9 @@
-import MarkdownIt from 'markdown-it';
+import MarkdownIt, {type MarkdownIt as MarkdownItInstance} from 'markdown-it';
 // @ts-ignore
 import mdTasksLists from 'markdown-it-task-lists';
 
 export class Markdown {
-    protected renderer: MarkdownIt;
+    protected renderer: MarkdownItInstance;
 
     constructor() {
         this.renderer = new MarkdownIt({html: true});
@@ -13,7 +13,7 @@ export class Markdown {
     /**
      * Get the front-end render used to convert Markdown to HTML.
      */
-    getRenderer(): MarkdownIt {
+    getRenderer(): MarkdownItInstance {
         return this.renderer;
     }
 
diff --git a/resources/js/services/dom.ts b/resources/js/services/dom.ts
index 8696fe81639..16942d5033b 100644
--- a/resources/js/services/dom.ts
+++ b/resources/js/services/dom.ts
@@ -259,7 +259,7 @@ export function hashElement(element: HTMLElement): string {
 }
 
 /**
- * Find the closest scroll container parent for the given element
+ * Find the closest scroll container parent for the given element,
  * otherwise will default to the body element.
  */
 export function findClosestScrollContainer(start: HTMLElement): HTMLElement {
diff --git a/resources/js/services/events.ts b/resources/js/services/events.ts
index 6045d51f823..1b39e413fbb 100644
--- a/resources/js/services/events.ts
+++ b/resources/js/services/events.ts
@@ -67,8 +67,10 @@ export class EventManager {
      * Notify of standard server-provided validation errors.
      */
     showValidationErrors(responseErr: HttpError): void {
-        if (responseErr.status === 422 && responseErr.data) {
-            const message = Object.values(responseErr.data).flat().join('\n');
+        if (responseErr.status === 422 && responseErr.data instanceof Object) {
+            const data = responseErr.data;
+            const errorValues = Object.values(data.errors ?? data);
+            const message = errorValues.flat().join('\n');
             this.error(message);
         }
     }
diff --git a/resources/js/services/http.ts b/resources/js/services/http.ts
index f9eaafc3912..e8787ad8de9 100644
--- a/resources/js/services/http.ts
+++ b/resources/js/services/http.ts
@@ -192,9 +192,8 @@ export class HttpManager {
     }
 
     /**
-     * Parse the response text for an error response to a user
-     * presentable string. Handles a range of errors responses including
-     * validation responses & server response text.
+     * Parse the response text for an error response to a user-presentable string.
+     * Handles a range of error responses, including validation responses and server response text.
      */
     protected formatErrorResponseText(text: string): string {
         const data = text.startsWith('{') ? JSON.parse(text) : {message: text};
@@ -206,13 +205,13 @@ export class HttpManager {
             return data.message || data.error;
         }
 
-        const values = Object.values(data);
-        const isValidation = values.every(val => {
+        const errorValues = Object.values(data.errors || {});
+        const isValidation = errorValues.length > 0 && errorValues.every(val => {
             return Array.isArray(val) && val.every(x => typeof x === 'string');
         });
 
         if (isValidation) {
-            return values.flat().join(' ');
+            return errorValues.flat().join(' ');
         }
 
         return text;
diff --git a/resources/js/services/keyboard-navigation.ts b/resources/js/services/keyboard-navigation.ts
index 13fbdfecc9d..70f99330d38 100644
--- a/resources/js/services/keyboard-navigation.ts
+++ b/resources/js/services/keyboard-navigation.ts
@@ -87,7 +87,9 @@ export class KeyboardNavigationHandler {
         const focusable: HTMLElement[] = [];
         const selector = '[tabindex]:not([tabindex="-1"]),[href],button:not([tabindex="-1"],[disabled]),input:not([type=hidden])';
         for (const container of this.containers) {
-            const toAdd = [...container.querySelectorAll(selector)].filter(e => isHTMLElement(e));
+            const toAdd = [...container.querySelectorAll(selector)].filter(e => {
+                return isHTMLElement(e) && e.checkVisibility();
+            }) as HTMLElement[];
             focusable.push(...toAdd);
         }
 
diff --git a/resources/js/services/dual-lists.ts b/resources/js/services/multi-lists.ts
similarity index 61%
rename from resources/js/services/dual-lists.ts
rename to resources/js/services/multi-lists.ts
index 98f2af92daf..29c88d23837 100644
--- a/resources/js/services/dual-lists.ts
+++ b/resources/js/services/multi-lists.ts
@@ -1,13 +1,12 @@
 /**
  * Service for helping manage common dual-list scenarios.
- * (Shelf book manager, sort set manager).
+ * (Shelf book manager, sort set manager, layout-editor).
  */
 
 type ListActionsSet = Record<string, ((item: HTMLElement) => void)>;
 
 export function buildListActions(
-    availableList: HTMLElement,
-    configuredList: HTMLElement,
+    ...lists: HTMLElement[]
 ): ListActionsSet {
     return {
         move_up(item) {
@@ -22,11 +21,29 @@ export function buildListActions(
             const newIndex = Math.min(index + 2, list.children.length);
             list.insertBefore(item, list.children[newIndex] || null);
         },
+        move_right(item) {
+            const list = item.parentNode as HTMLElement;
+            const listIndex = lists.indexOf(list);
+            const targetListIndex = Math.min(listIndex + 1, lists.length - 1);
+            lists[targetListIndex].appendChild(item);
+        },
+        move_left(item) {
+            const list = item.parentNode as HTMLElement;
+            const listIndex = lists.indexOf(list);
+            const targetListIndex = Math.max(listIndex - 1, 0);
+            lists[targetListIndex].appendChild(item);
+        },
         remove(item) {
-            availableList.appendChild(item);
+            const otherList = lists.find(list => list !== item.parentNode);
+            if (otherList) {
+                otherList.appendChild(item);
+            }
         },
         add(item) {
-            configuredList.appendChild(item);
+            const otherList = lists.find(list => list !== item.parentNode);
+            if (otherList) {
+                otherList.appendChild(item);
+            }
         },
     };
 }
diff --git a/resources/js/services/vdom.ts b/resources/js/services/vdom.ts
index c32f328f5e7..a83686778fe 100644
--- a/resources/js/services/vdom.ts
+++ b/resources/js/services/vdom.ts
@@ -1,6 +1,7 @@
 import {
     init,
     attributesModule,
+    datasetModule,
     toVNode,
 } from 'snabbdom';
 import {VNode} from "snabbdom/build/vnode";
@@ -14,6 +15,7 @@ function getPatcher(): vDomPatcher {
 
     patcher = init([
         attributesModule,
+        datasetModule,
     ]);
 
     return patcher;
@@ -24,3 +26,7 @@ export function patchDomFromHtmlString(domTarget: Element, html: string): void {
     contentDom.innerHTML = html;
     getPatcher()(toVNode(domTarget), toVNode(contentDom));
 }
+
+export function patchDomFromDom(domTarget: Element, domSource: Element): void {
+    getPatcher()(toVNode(domTarget), toVNode(domSource));
+}
diff --git a/resources/js/wysiwyg-tinymce/common-events.js b/resources/js/wysiwyg-tinymce/common-events.js
index d0a5acdc24d..6f3d34f1f8e 100644
--- a/resources/js/wysiwyg-tinymce/common-events.js
+++ b/resources/js/wysiwyg-tinymce/common-events.js
@@ -1,3 +1,5 @@
+import {scrollToHeader} from "./scrolling";
+
 /**
  * @param {Editor} editor
  */
@@ -30,4 +32,9 @@ export function listen(editor) {
             editor.focus();
         }
     });
+
+    // Focus on a specific heading
+    window.$events.listen('editor::focus-heading', ({index}) => {
+        scrollToHeader(editor, index);
+    });
 }
diff --git a/resources/js/wysiwyg-tinymce/plugin-drawio.js b/resources/js/wysiwyg-tinymce/plugin-drawio.js
index 197c50b0e44..ad0e01800ef 100644
--- a/resources/js/wysiwyg-tinymce/plugin-drawio.js
+++ b/resources/js/wysiwyg-tinymce/plugin-drawio.js
@@ -57,7 +57,7 @@ async function updateContent(pngData) {
             });
         } catch (err) {
             handleUploadError(err);
-            throw new Error(`Failed to save image with error: ${err}`);
+            throw new Error(`Failed to save image with error: ${err}`, {cause: err});
         }
         return;
     }
@@ -78,7 +78,7 @@ async function updateContent(pngData) {
     } catch (err) {
         pageEditor.dom.remove(wrapId);
         handleUploadError(err);
-        throw new Error(`Failed to save image with error: ${err}`);
+        throw new Error(`Failed to save image with error: ${err}`, {cause: err});
     }
 }
 
diff --git a/resources/js/wysiwyg-tinymce/plugins-details.js b/resources/js/wysiwyg-tinymce/plugins-details.js
index c4a6d927d2b..58b0ac9d869 100644
--- a/resources/js/wysiwyg-tinymce/plugins-details.js
+++ b/resources/js/wysiwyg-tinymce/plugins-details.js
@@ -19,6 +19,8 @@ function setSummary(editor, summaryContent) {
         }
         summary.textContent = summaryContent;
     });
+
+    editor.selection.select(details);
 }
 
 /**
@@ -202,8 +204,12 @@ function register(editor) {
     });
 
     editor.on('dblclick', event => {
-        if (!getSelectedDetailsBlock(editor) || event.target.closest('doc-root')) return;
-        showDetailLabelEditWindow(editor);
+        const domElClass = event?.target?.ownerDocument?.defaultView?.HTMLDetailsElement;
+        if (domElClass && event.target instanceof domElClass && getSelectedDetailsBlock(editor)) {
+            showDetailLabelEditWindow(editor);
+            event.preventDefault();
+            event.stopPropagation();
+        }
     });
 
     editor.ui.registry.addButton('toggledetails', {
diff --git a/resources/js/wysiwyg-tinymce/scrolling.js b/resources/js/wysiwyg-tinymce/scrolling.js
index 92f8f158323..b4f07984ea6 100644
--- a/resources/js/wysiwyg-tinymce/scrolling.js
+++ b/resources/js/wysiwyg-tinymce/scrolling.js
@@ -15,6 +15,23 @@ function scrollToText(editor, scrollId) {
     editor.focus();
 }
 
+/**
+ * Scroll to a specific header of the given index, relative to all headers in the content.
+ * @param {Editor} editor
+ * @param {Number} index
+ */
+export function scrollToHeader(editor, index) {
+    const headers = editor.dom.select('h1, h2, h3, h4, h5, h6');
+    const targetHeader = headers[index];
+
+    if (targetHeader) {
+        targetHeader.scrollIntoView();
+        editor.selection.select(targetHeader, true);
+        editor.selection.collapse(false);
+        editor.focus();
+    }
+}
+
 /**
  * Scroll to a section dictated by the current URL query string, if present.
  * Used when directly editing a specific section of the page.
diff --git a/resources/js/wysiwyg/api/__tests__/api-test-utils.ts b/resources/js/wysiwyg/api/__tests__/api-test-utils.ts
new file mode 100644
index 00000000000..dacec339289
--- /dev/null
+++ b/resources/js/wysiwyg/api/__tests__/api-test-utils.ts
@@ -0,0 +1,14 @@
+import {createTestContext} from "lexical/__tests__/utils";
+import {EditorApi} from "../api";
+import {EditorUiContext} from "../../ui/framework/core";
+import {LexicalEditor} from "lexical";
+
+
+/**
+ * Create an instance of the EditorApi and EditorUiContext.
+ */
+export function createEditorApiInstance(): { api: EditorApi; context: EditorUiContext, editor: LexicalEditor} {
+    const context = createTestContext();
+    const api = new EditorApi(context);
+    return {api, context, editor: context.editor};
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/api/__tests__/content.test.ts b/resources/js/wysiwyg/api/__tests__/content.test.ts
new file mode 100644
index 00000000000..0915b6685bb
--- /dev/null
+++ b/resources/js/wysiwyg/api/__tests__/content.test.ts
@@ -0,0 +1,93 @@
+import {createEditorApiInstance} from "./api-test-utils";
+import {$createParagraphNode, $createTextNode, $getRoot, IS_BOLD, LexicalEditor} from "lexical";
+import {expectNodeShapeToMatch} from "lexical/__tests__/utils";
+
+
+describe('Editor API: Content Module', () => {
+
+    describe('insertHtml()', () => {
+        it('should insert html at selection by default', () => {
+            const {api, editor} = createEditorApiInstance();
+            insertAndSelectSampleBlock(editor);
+
+            api.content.insertHtml('<strong>pp</strong>');
+            editor.commitUpdates();
+
+            expectNodeShapeToMatch(editor, [
+                {type: 'paragraph', children: [
+                    {text: 'He'},
+                    {text: 'pp', format: IS_BOLD},
+                    {text: 'o World'}
+                ]}
+            ]);
+        });
+
+        it('should handle a mix of inline and block elements', () => {
+            const {api, editor} = createEditorApiInstance();
+            insertAndSelectSampleBlock(editor);
+
+            api.content.insertHtml('<p>cat</p><strong>pp</strong><p>dog</p>');
+            editor.commitUpdates();
+
+            expectNodeShapeToMatch(editor, [
+                {type: 'paragraph', children: [{text: 'cat'}]},
+                {type: 'paragraph', children: [
+                        {text: 'He'},
+                        {text: 'pp', format: IS_BOLD},
+                        {text: 'o World'}
+                    ]},
+                {type: 'paragraph', children: [{text: 'dog'}]},
+            ]);
+        });
+
+        it('should throw and error if an invalid position is provided', () => {
+            const {api, editor} = createEditorApiInstance();
+            insertAndSelectSampleBlock(editor);
+
+
+            expect(() => {
+                api.content.insertHtml('happy<p>cat</p>', 'near-the-end');
+            }).toThrow('Invalid position: near-the-end. Valid positions are: start, end, selection');
+        });
+
+        it('should append html if end provided as a position', () => {
+            const {api, editor} = createEditorApiInstance();
+            insertAndSelectSampleBlock(editor);
+
+            api.content.insertHtml('happy<p>cat</p>', 'end');
+            editor.commitUpdates();
+
+            expectNodeShapeToMatch(editor, [
+                {type: 'paragraph', children: [{text: 'Hello World'}]},
+                {type: 'paragraph', children: [{text: 'happy'}]},
+                {type: 'paragraph', children: [{text: 'cat'}]},
+            ]);
+        });
+
+        it('should prepend html if start provided as a position', () => {
+            const {api, editor} = createEditorApiInstance();
+            insertAndSelectSampleBlock(editor);
+
+            api.content.insertHtml('happy<p>cat</p>', 'start');
+            editor.commitUpdates();
+
+            expectNodeShapeToMatch(editor, [
+                {type: 'paragraph', children: [{text: 'happy'}]},
+                {type: 'paragraph', children: [{text: 'cat'}]},
+                {type: 'paragraph', children: [{text: 'Hello World'}]},
+            ]);
+        });
+    });
+
+    function insertAndSelectSampleBlock(editor: LexicalEditor) {
+        editor.updateAndCommit(() => {
+            const p = $createParagraphNode();
+            const text = $createTextNode('Hello World');
+            p.append(text);
+            $getRoot().append(p);
+
+            text.select(2, 4);
+        });
+    }
+
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/api/__tests__/ui.test.ts b/resources/js/wysiwyg/api/__tests__/ui.test.ts
new file mode 100644
index 00000000000..80045bb48e9
--- /dev/null
+++ b/resources/js/wysiwyg/api/__tests__/ui.test.ts
@@ -0,0 +1,123 @@
+import {createEditorApiInstance} from "./api-test-utils";
+import {EditorApiButton, EditorApiToolbar, EditorApiToolbarSection} from "../ui";
+import {getMainEditorFullToolbar} from "../../ui/defaults/toolbars";
+import {EditorContainerUiElement} from "../../ui/framework/core";
+import {EditorOverflowContainer} from "../../ui/framework/blocks/overflow-container";
+
+
+describe('Editor API: UI Module', () => {
+
+    describe('createButton()', () => {
+        it('should return a button', () => {
+            const {api} = createEditorApiInstance();
+            const button = api.ui.createButton({label: 'Test', icon: 'test', action: () => ''});
+            expect(button).toBeInstanceOf(EditorApiButton);
+        });
+
+        it('should only need action to be required', () => {
+            const {api} = createEditorApiInstance();
+            const button = api.ui.createButton({action: () => ''});
+            expect(button).toBeInstanceOf(EditorApiButton);
+        });
+
+        it('should pass the label and icon to the button', () => {
+            const {api} = createEditorApiInstance();
+            const button = api.ui.createButton({label: 'TestLabel', icon: '<svg>cat</svg>', action: () => ''});
+            const html = button._getOriginalModel().getDOMElement().outerHTML;
+            expect(html).toContain('TestLabel');
+            expect(html).toContain('<svg>cat</svg>');
+        })
+    });
+
+    describe('EditorApiButton', () => {
+
+        describe('setActive()', () => {
+            it('should update the active state of the button', () => {
+                const {api} = createEditorApiInstance();
+                const button = api.ui.createButton({label: 'Test', icon: 'test', action: () => ''});
+
+                button.setActive(true);
+                expect(button._getOriginalModel().isActive()).toBe(true);
+
+                button.setActive(false);
+                expect(button._getOriginalModel().isActive()).toBe(false);
+            })
+        });
+
+        it('should call the provided action on click', () => {
+            const {api} = createEditorApiInstance();
+            let count = 0;
+            const button = api.ui.createButton({label: 'Test', icon: 'test', action: () => {
+                count++;
+            }});
+
+            const dom = button._getOriginalModel().getDOMElement();
+            dom.click();
+            dom.click();
+            expect(count).toBe(2);
+        });
+
+    });
+
+    describe('getMainToolbar()', () => {
+        it('should return the main editor toolbar', () => {
+            const {api, context} = createEditorApiInstance();
+            context.manager.setToolbar(getMainEditorFullToolbar(context));
+
+            const toolbar = api.ui.getMainToolbar();
+
+            expect(toolbar).toBeInstanceOf(EditorApiToolbar);
+        });
+    });
+
+    describe('EditorApiToolbar', () => {
+        describe('getSections()', () => {
+            it('should return the sections of the toolbar', () => {
+                const {api, context} = createEditorApiInstance();
+                context.manager.setToolbar(testToolbar());
+                const toolbar = api.ui.getMainToolbar();
+
+                const sections = toolbar?.getSections() || [];
+
+                expect(sections.length).toBe(2);
+                expect(sections[0]).toBeInstanceOf(EditorApiToolbarSection);
+            })
+        })
+    })
+
+    describe('EditorApiToolbarSection', () => {
+
+        describe('getLabel()', () => {
+            it('should return the label of the section', () => {
+                const {api, context} = createEditorApiInstance();
+                context.manager.setToolbar(testToolbar());
+                const section = api.ui.getMainToolbar()?.getSections()[0] as EditorApiToolbarSection;
+                expect(section.getLabel()).toBe('section-a');
+             })
+        });
+
+        describe('addButton()', () => {
+            it('should add a button to the section', () => {
+                const {api, context} = createEditorApiInstance();
+                const toolbar = testToolbar();
+                context.manager.setToolbar(toolbar);
+                const section = api.ui.getMainToolbar()?.getSections()[0] as EditorApiToolbarSection;
+
+                const button = api.ui.createButton({label: 'TestButtonText!', action: () => ''});
+                section.addButton(button);
+
+                const toolbarRendered = toolbar.getDOMElement().innerHTML;
+                expect(toolbarRendered).toContain('TestButtonText!');
+            });
+        });
+
+    });
+
+    function testToolbar(): EditorContainerUiElement {
+        return new EditorContainerUiElement([
+            new EditorOverflowContainer('section-a', 1, []),
+            new EditorOverflowContainer('section-b', 1, []),
+        ]);
+    }
+
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/api/api.ts b/resources/js/wysiwyg/api/api.ts
new file mode 100644
index 00000000000..f732170b353
--- /dev/null
+++ b/resources/js/wysiwyg/api/api.ts
@@ -0,0 +1,14 @@
+import {EditorApiUiModule} from "./ui";
+import {EditorUiContext} from "../ui/framework/core";
+import {EditorApiContentModule} from "./content";
+
+export class EditorApi {
+
+    public ui: EditorApiUiModule;
+    public content: EditorApiContentModule;
+
+    constructor(context: EditorUiContext) {
+        this.ui = new EditorApiUiModule(context);
+        this.content = new EditorApiContentModule(context);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/api/content.ts b/resources/js/wysiwyg/api/content.ts
new file mode 100644
index 00000000000..167ec790590
--- /dev/null
+++ b/resources/js/wysiwyg/api/content.ts
@@ -0,0 +1,26 @@
+import {EditorUiContext} from "../ui/framework/core";
+import {appendHtmlToEditor, insertHtmlIntoEditor, prependHtmlToEditor} from "../utils/actions";
+
+
+export class EditorApiContentModule {
+    readonly #context: EditorUiContext;
+
+    constructor(context: EditorUiContext) {
+        this.#context = context;
+    }
+
+    insertHtml(html: string, position: string = 'selection'): void {
+        const validPositions = ['start', 'end', 'selection'];
+        if (!validPositions.includes(position)) {
+            throw new Error(`Invalid position: ${position}. Valid positions are: ${validPositions.join(', ')}`);
+        }
+
+        if (position === 'start') {
+            prependHtmlToEditor(this.#context.editor, html);
+        } else if (position === 'end') {
+            appendHtmlToEditor(this.#context.editor, html);
+        } else {
+            insertHtmlIntoEditor(this.#context.editor, html);
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/api/ui.ts b/resources/js/wysiwyg/api/ui.ts
new file mode 100644
index 00000000000..c5b822a46bc
--- /dev/null
+++ b/resources/js/wysiwyg/api/ui.ts
@@ -0,0 +1,89 @@
+import {EditorButton} from "../ui/framework/buttons";
+import {EditorContainerUiElement, EditorUiContext} from "../ui/framework/core";
+import {EditorOverflowContainer} from "../ui/framework/blocks/overflow-container";
+
+type EditorApiButtonOptions = {
+    label?: string;
+    icon?: string;
+    action: () => void;
+};
+
+export class EditorApiButton {
+    readonly #button: EditorButton;
+    #isActive: boolean = false;
+
+    constructor(options: EditorApiButtonOptions, context: EditorUiContext) {
+        this.#button = new EditorButton({
+            label: options.label || '',
+            icon: options.icon || '',
+            action: () => {
+                options.action();
+            },
+            isActive: () => this.#isActive,
+        });
+        this.#button.setContext(context);
+    }
+
+    setActive(active: boolean = true): void {
+        this.#isActive = active;
+        this.#button.setActiveState(active);
+    }
+
+    _getOriginalModel() {
+        return this.#button;
+    }
+}
+
+export class EditorApiToolbar {
+    readonly #toolbar: EditorContainerUiElement;
+
+    constructor(toolbar: EditorContainerUiElement) {
+        this.#toolbar = toolbar;
+    }
+
+    getSections(): EditorApiToolbarSection[] {
+        const sections = this.#toolbar.getChildren();
+        return sections.filter(section => {
+            return section instanceof EditorOverflowContainer;
+        }).map(section => new EditorApiToolbarSection(section));
+    }
+}
+
+export class EditorApiToolbarSection {
+    readonly #section: EditorOverflowContainer;
+
+    constructor(section: EditorOverflowContainer) {
+        this.#section = section;
+    }
+
+    getLabel(): string {
+        return this.#section.getLabel();
+    }
+
+    addButton(button: EditorApiButton, targetIndex: number = -1): void {
+        this.#section.addChild(button._getOriginalModel(), targetIndex);
+        this.#section.rebuildDOM();
+    }
+}
+
+
+export class EditorApiUiModule {
+    readonly #context: EditorUiContext;
+    
+    constructor(context: EditorUiContext) {
+        this.#context = context;
+    }
+    
+    createButton(options: EditorApiButtonOptions): EditorApiButton {
+        return new EditorApiButton(options, this.#context);
+    }
+
+    getMainToolbar(): EditorApiToolbar|null {
+        const toolbar = this.#context.manager.getToolbar();
+        if (!toolbar) {
+            return null;
+        }
+
+        return new EditorApiToolbar(toolbar);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/index.ts b/resources/js/wysiwyg/index.ts
index 2c8c3b9525b..59fb2acdea7 100644
--- a/resources/js/wysiwyg/index.ts
+++ b/resources/js/wysiwyg/index.ts
@@ -2,7 +2,12 @@ import {createEditor} from 'lexical';
 import {createEmptyHistoryState, registerHistory} from '@lexical/history';
 import {registerRichText} from '@lexical/rich-text';
 import {mergeRegister} from '@lexical/utils';
-import {getNodesForBasicEditor, getNodesForPageEditor, registerCommonNodeMutationListeners} from './nodes';
+import {
+    getNodesForBasicEditor,
+    getNodesForCommentEditor,
+    getNodesForPageEditor,
+    registerCommonNodeMutationListeners
+} from './nodes';
 import {buildEditorUI} from "./ui";
 import {focusEditor, getEditorContentAsHtml, setEditorContentFromHtml} from "./utils/actions";
 import {registerTableResizer} from "./ui/framework/helpers/table-resizer";
@@ -17,10 +22,14 @@ import {registerKeyboardHandling} from "./services/keyboard-handling";
 import {registerAutoLinks} from "./services/auto-links";
 import {contextToolbars, getBasicEditorToolbar, getMainEditorFullToolbar} from "./ui/defaults/toolbars";
 import {modals} from "./ui/defaults/modals";
-import {CodeBlockDecorator} from "./ui/decorators/code-block";
-import {DiagramDecorator} from "./ui/decorators/diagram";
+import {CodeBlockDecorator} from "./ui/decorators/CodeBlockDecorator";
+import {DiagramDecorator} from "./ui/decorators/DiagramDecorator";
 import {registerMouseHandling} from "./services/mouse-handling";
 import {registerSelectionHandling} from "./services/selection-handling";
+import {EditorApi} from "./api/api";
+import {registerMentions} from "./services/mentions";
+import {MentionDecorator} from "./ui/decorators/MentionDecorator";
+import {registerLists} from "@lexical/list";
 
 const theme = {
     text: {
@@ -50,8 +59,9 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     mergeRegister(
         registerRichText(editor),
+        registerLists(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
-        registerShortcuts(context),
+        registerShortcuts(context, true),
         registerKeyboardHandling(context),
         registerMouseHandling(context),
         registerSelectionHandling(context),
@@ -94,6 +104,11 @@ export function createPageEditorInstance(container: HTMLElement, htmlContent: st
 
     registerCommonNodeMutationListeners(context);
 
+    window.$events.emitPublic(container, 'editor-wysiwyg::post-init', {
+        usage: 'page-editor',
+        api: new EditorApi(context),
+    });
+
     return new SimpleWysiwygEditorInterface(context);
 }
 
@@ -109,8 +124,9 @@ export function createBasicEditorInstance(container: HTMLElement, htmlContent: s
 
     const editorTeardown = mergeRegister(
         registerRichText(editor),
+        registerLists(editor),
         registerHistory(editor, createEmptyHistoryState(), 300),
-        registerShortcuts(context),
+        registerShortcuts(context, false),
         registerAutoLinks(editor),
     );
 
@@ -122,6 +138,47 @@ export function createBasicEditorInstance(container: HTMLElement, htmlContent: s
 
     setEditorContentFromHtml(editor, htmlContent);
 
+    window.$events.emitPublic(container, 'editor-wysiwyg::post-init', {
+        usage: 'description-editor',
+        api: new EditorApi(context),
+    });
+
+    return new SimpleWysiwygEditorInterface(context);
+}
+
+export function createCommentEditorInstance(container: HTMLElement, htmlContent: string, options: Record<string, any> = {}): SimpleWysiwygEditorInterface {
+    const editor = createEditor({
+        namespace: 'BookStackCommentEditor',
+        nodes: getNodesForCommentEditor(),
+        onError: console.error,
+        theme: theme,
+    });
+
+    const context: EditorUiContext = buildEditorUI(container, editor, options);
+    editor.setRootElement(context.editorDOM);
+
+    const editorTeardown = mergeRegister(
+        registerRichText(editor),
+        registerHistory(editor, createEmptyHistoryState(), 300),
+        registerShortcuts(context, false),
+        registerAutoLinks(editor),
+        registerMentions(context),
+    );
+
+    // Register toolbars, modals & decorators
+    context.manager.setToolbar(getBasicEditorToolbar(context));
+    context.manager.registerContextToolbar('link', contextToolbars.link);
+    context.manager.registerModal('link', modals.link);
+    context.manager.onTeardown(editorTeardown);
+    context.manager.registerDecoratorType('mention', MentionDecorator);
+
+    setEditorContentFromHtml(editor, htmlContent);
+
+    window.$events.emitPublic(container, 'editor-wysiwyg::post-init', {
+        usage: 'comment-editor',
+        api: new EditorApi(context),
+    });
+
     return new SimpleWysiwygEditorInterface(context);
 }
 
diff --git a/resources/js/wysiwyg/lexical/clipboard/clipboard.ts b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
index 1d79c2d7ba4..86a814f2929 100644
--- a/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
+++ b/resources/js/wysiwyg/lexical/clipboard/clipboard.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import {$generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
+import {$generateHtmlFromNode, $generateHtmlFromNodes, $generateNodesFromDOM} from '@lexical/html';
 import {$addNodeStyle, $sliceSelectedTextNodeContent} from '@lexical/selection';
 import {objectKlassEquals} from '@lexical/utils';
 import {
@@ -31,6 +31,8 @@ import {
 } from 'lexical';
 import {CAN_USE_DOM} from 'lexical/shared/canUseDOM';
 import invariant from 'lexical/shared/invariant';
+import {$getSingleSelectableNode} from "../../utils/nodes";
+import {$createSingleNodeSelection, $selectSingleNode} from "../../utils/selection";
 
 const getDOMSelection = (targetWindow: Window | null): Selection | null =>
   CAN_USE_DOM ? (targetWindow || window).getSelection() : null;
@@ -58,6 +60,11 @@ export function $getHtmlContent(
   if (selection == null) {
     invariant(false, 'Expected valid LexicalSelection');
   }
+  // Handle single node selections
+  const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+  if (singleSelectableNode) {
+    return $generateHtmlFromNode(editor, singleSelectableNode);
+  }
 
   // If we haven't selected anything
   if (
@@ -88,6 +95,12 @@ export function $getLexicalContent(
     invariant(false, 'Expected valid LexicalSelection');
   }
 
+  // Handle single node selections
+  const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+  if (singleSelectableNode) {
+    return JSON.stringify($generateJSONFromNode(editor, singleSelectableNode));
+  }
+
   // If we haven't selected anything
   if (
     ($isRangeSelection(selection) && selection.isCollapsed()) ||
@@ -354,6 +367,26 @@ export function $generateJSONFromSelectedNodes<
   };
 }
 
+/**
+ * Gets the Lexical JSON of the given node.
+ */
+export function $generateJSONFromNode<
+    SerializedNode extends BaseSerializedNode,
+>(
+    editor: LexicalEditor,
+    node: LexicalNode,
+): {
+  namespace: string;
+  node: SerializedNode;
+} {
+  const serialized: Array<SerializedNode> = [];
+  $appendNodesToJSON(editor, null, node, serialized);
+  return {
+    namespace: editor._config.namespace,
+    node: serialized[0],
+  };
+}
+
 /**
  * This method takes an array of objects conforming to the BaseSeralizedNode interface and returns
  * an Array containing instances of the corresponding LexicalNode classes registered on the editor.
diff --git a/resources/js/wysiwyg/lexical/core/LexicalCommands.ts b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
index f995237a0cf..36badba977b 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalCommands.ts
@@ -16,7 +16,7 @@ import type {
 export type PasteCommandType = ClipboardEvent | InputEvent | KeyboardEvent;
 
 export function createCommand<T>(type?: string): LexicalCommand<T> {
-  return __DEV__ ? {type} : {};
+  return {type};
 }
 
 export const SELECTION_CHANGE_COMMAND: LexicalCommand<void> = createCommand(
@@ -78,6 +78,8 @@ export const KEY_ESCAPE_COMMAND: LexicalCommand<KeyboardEvent> =
   createCommand('KEY_ESCAPE_COMMAND');
 export const KEY_DELETE_COMMAND: LexicalCommand<KeyboardEvent> =
   createCommand('KEY_DELETE_COMMAND');
+export const KEY_AT_COMMAND: LexicalCommand<KeyboardEvent> =
+    createCommand('KEY_AT_COMMAND');
 export const KEY_TAB_COMMAND: LexicalCommand<KeyboardEvent> =
   createCommand('KEY_TAB_COMMAND');
 export const INSERT_TAB_COMMAND: LexicalCommand<void> =
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
index 364f6c6b7c3..46660c9b74a 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEditor.ts
@@ -45,6 +45,7 @@ import {LineBreakNode} from './nodes/LexicalLineBreakNode';
 import {ParagraphNode} from './nodes/LexicalParagraphNode';
 import {RootNode} from './nodes/LexicalRootNode';
 import {TabNode} from './nodes/LexicalTabNode';
+import {EditorUiContext} from "../../ui/framework/core";
 
 export type Spread<T1, T2> = Omit<T2, keyof T1> & T1;
 
@@ -621,6 +622,8 @@ export class LexicalEditor {
   _editable: boolean;
   /** @internal */
   _blockCursorElement: null | HTMLDivElement;
+  /** @internal */
+  _context: null | EditorUiContext;
 
   /** @internal */
   constructor(
@@ -682,6 +685,7 @@ export class LexicalEditor {
     this._headless = parentEditor !== null && parentEditor._headless;
     this._window = null;
     this._blockCursorElement = null;
+    this._context = null;
   }
 
   /**
@@ -1285,6 +1289,21 @@ export class LexicalEditor {
       triggerListeners('editable', this, true, editable);
     }
   }
+
+  /**
+   * Set the UI context that this editor is intended to be part of.
+   */
+  setUiContext(context: EditorUiContext) {
+    this._context = context;
+  }
+
+  /**
+   * Get the UI context that this editor is considered to be part of.
+   */
+  getUiContext(): EditorUiContext|null {
+    return this._context;
+  }
+
   /**
    * Returns a JSON-serializable javascript object NOT a JSON string.
    * You still must call JSON.stringify (or something else) to turn the
diff --git a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
index 26cf25a800d..7d87d9055b6 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalEvents.ts
@@ -67,7 +67,7 @@ import {
   SELECTION_CHANGE_COMMAND,
   UNDO_COMMAND,
 } from '.';
-import {KEY_MODIFIER_COMMAND, SELECT_ALL_COMMAND} from './LexicalCommands';
+import {KEY_AT_COMMAND, KEY_MODIFIER_COMMAND, SELECT_ALL_COMMAND} from './LexicalCommands';
 import {
   COMPOSITION_START_CHAR,
   DOM_ELEMENT_TYPE,
@@ -97,9 +97,8 @@ import {
   getEditorPropertyFromDOMNode,
   getEditorsToPropagate,
   getNearestEditorFromDOMNode,
-  getWindow,
+  getWindow, isAt,
   isBackspace,
-  isBold,
   isCopy,
   isCut,
   isDelete,
@@ -111,7 +110,6 @@ import {
   isDeleteWordForward,
   isEscape,
   isFirefoxClipboardEvents,
-  isItalic,
   isLexicalEditor,
   isLineBreak,
   isModifier,
@@ -128,7 +126,6 @@ import {
   isSelectionWithinEditor,
   isSpace,
   isTab,
-  isUnderline,
   isUndo,
 } from './LexicalUtils';
 
@@ -479,7 +476,6 @@ function onClick(event: PointerEvent, editor: LexicalEditor): void {
 }
 
 function onPointerDown(event: PointerEvent, editor: LexicalEditor) {
-  // TODO implement text drag & drop
   const target = event.target;
   const pointerType = event.pointerType;
   if (target instanceof Node && pointerType !== 'touch') {
@@ -1062,15 +1058,8 @@ function onKeyDown(event: KeyboardEvent, editor: LexicalEditor): void {
   } else if (isDeleteLineForward(key, metaKey)) {
     event.preventDefault();
     dispatchCommand(editor, DELETE_LINE_COMMAND, false);
-  } else if (isBold(key, altKey, metaKey, ctrlKey)) {
-    event.preventDefault();
-    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'bold');
-  } else if (isUnderline(key, altKey, metaKey, ctrlKey)) {
-    event.preventDefault();
-    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'underline');
-  } else if (isItalic(key, altKey, metaKey, ctrlKey)) {
-    event.preventDefault();
-    dispatchCommand(editor, FORMAT_TEXT_COMMAND, 'italic');
+  } else if (isAt(key)) {
+    dispatchCommand(editor, KEY_AT_COMMAND, event);
   } else if (isTab(key, altKey, ctrlKey, metaKey)) {
     dispatchCommand(editor, KEY_TAB_COMMAND, event);
   } else if (isUndo(key, shiftKey, metaKey, ctrlKey)) {
diff --git a/resources/js/wysiwyg/lexical/core/LexicalNode.ts b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
index 95a7234694a..4aba2a22f67 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalNode.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalNode.ts
@@ -208,9 +208,9 @@ export class LexicalNode {
   }
 
   /**
-   * Clones this node, creating a new node with a different key
-   * and adding it to the EditorState (but not attaching it anywhere!). All nodes must
-   * implement this method.
+   * Clones this node, creating a new matching instance.
+   * Should be created with the existing node key if it exists.
+   * All nodes must implement this method.
    *
    */
   static clone(_data: unknown): LexicalNode {
diff --git a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
index 36e2db5470a..520c001f61c 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalSelection.ts
@@ -63,7 +63,6 @@ import {
   toggleTextFormatType,
 } from './LexicalUtils';
 import {$createTabNode, $isTabNode} from './nodes/LexicalTabNode';
-import {$selectSingleNode} from "../../utils/selection";
 
 export type TextPointType = {
   _selection: BaseSelection;
@@ -1283,7 +1282,7 @@ export class RangeSelection implements BaseSelection {
     if (
       insertedParagraph &&
       $isElementNode(lastInsertedBlock) &&
-      (insertedParagraph.canMergeWhenEmpty() || INTERNAL_$isBlock(lastToInsert))
+      (insertedParagraph.canMergeWhenEmpty() || INTERNAL_$isBlock(lastToInsert) || ($isElementNode(lastToInsert) && lastToInsert.isShadowRoot()))
     ) {
       lastInsertedBlock.append(...insertedParagraph.getChildren());
       insertedParagraph.remove();
@@ -2220,10 +2219,23 @@ export function $createRangeSelection(): RangeSelection {
   return new RangeSelection(anchor, focus, 0, '');
 }
 
+export function $createCollapsedRangeSelectionForNode(node: LexicalNode, offset: number = 0): RangeSelection {
+  const type = $isTextNode(node) ? 'text' : 'element';
+  const anchor = $createPoint(node.getKey(), offset, type);
+  const focus = $createPoint(node.getKey(), offset, type);
+  return new RangeSelection(anchor, focus, 0, '');
+}
+
 export function $createNodeSelection(): NodeSelection {
   return new NodeSelection(new Set());
 }
 
+function $selectSingleNode(node: LexicalNode): void {
+  const nodeSelection = $createNodeSelection();
+  nodeSelection.add(node.getKey());
+  $setSelection(nodeSelection);
+}
+
 export function $internalCreateSelection(
   editor: LexicalEditor,
 ): null | BaseSelection {
diff --git a/resources/js/wysiwyg/lexical/core/LexicalUtils.ts b/resources/js/wysiwyg/lexical/core/LexicalUtils.ts
index 71096b19dce..840c5e8abae 100644
--- a/resources/js/wysiwyg/lexical/core/LexicalUtils.ts
+++ b/resources/js/wysiwyg/lexical/core/LexicalUtils.ts
@@ -783,39 +783,6 @@ export function isTab(
   return key === 'Tab' && !altKey && !ctrlKey && !metaKey;
 }
 
-export function isBold(
-  key: string,
-  altKey: boolean,
-  metaKey: boolean,
-  ctrlKey: boolean,
-): boolean {
-  return (
-    key.toLowerCase() === 'b' && !altKey && controlOrMeta(metaKey, ctrlKey)
-  );
-}
-
-export function isItalic(
-  key: string,
-  altKey: boolean,
-  metaKey: boolean,
-  ctrlKey: boolean,
-): boolean {
-  return (
-    key.toLowerCase() === 'i' && !altKey && controlOrMeta(metaKey, ctrlKey)
-  );
-}
-
-export function isUnderline(
-  key: string,
-  altKey: boolean,
-  metaKey: boolean,
-  ctrlKey: boolean,
-): boolean {
-  return (
-    key.toLowerCase() === 'u' && !altKey && controlOrMeta(metaKey, ctrlKey)
-  );
-}
-
 export function isParagraph(key: string, shiftKey: boolean): boolean {
   return isReturn(key) && !shiftKey;
 }
@@ -1056,6 +1023,10 @@ export function isDelete(key: string): boolean {
   return key === 'Delete';
 }
 
+export function isAt(key: string): boolean {
+  return key === '@';
+}
+
 export function isSelectAll(
   key: string,
   metaKey: boolean,
@@ -1367,6 +1338,10 @@ export function $isInlineElementOrDecoratorNode(node: LexicalNode): boolean {
   );
 }
 
+export function $isInlineElementOrTextNode(node: LexicalNode|null): boolean {
+  return node !== null && ($isTextNode(node) || ($isElementNode(node) && node.isInline()));
+}
+
 export function $getNearestRootOrShadowRoot(
   node: LexicalNode,
 ): RootNode | ElementNode {
diff --git a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
index 00c5ec79646..482f6d65fa3 100644
--- a/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
+++ b/resources/js/wysiwyg/lexical/core/__tests__/utils/index.ts
@@ -39,6 +39,9 @@ import {EditorUiContext} from "../../../../ui/framework/core";
 import {EditorUIManager} from "../../../../ui/framework/manager";
 import {ImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
+import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
+import {DiagramDecorator} from "../../../../ui/decorators/DiagramDecorator";
+import {$generateHtmlFromNodes} from "@lexical/html";
 
 type TestEnv = {
   readonly container: HTMLDivElement;
@@ -489,6 +492,7 @@ export function createTestContext(): EditorUiContext {
     nodes: [
         ImageNode,
         MediaNode,
+        DiagramNode,
     ]
   });
 
@@ -504,11 +508,12 @@ export function createTestContext(): EditorUiContext {
     options: {},
     scrollDOM: scrollWrap,
     translate(text: string): string {
-      return "";
+      return text;
     }
   };
 
   context.manager.setContext(context);
+  context.manager.registerDecoratorType('diagram', DiagramDecorator);
 
   return context;
 }
@@ -764,11 +769,19 @@ export function html(
 }
 
 export function expectHtmlToBeEqual(expected: string, actual: string): void {
-  expect(formatHtml(expected)).toBe(formatHtml(actual));
+  expect(formatHtml(actual)).toBe(formatHtml(expected));
+}
+
+export function expectEditorHtmlToBeEqual(editor: LexicalEditor, expected: string): void {
+  const html = editor.read(() => {
+    return $generateHtmlFromNodes(editor, null);
+  });
+  expect(formatHtml(html)).toBe(formatHtml(expected));
 }
 
 type nodeTextShape = {
   text: string;
+  format?: number;
 };
 
 type nodeShape = {
@@ -786,7 +799,13 @@ export function getNodeShape(node: SerializedLexicalNode): nodeShape|nodeTextSha
 
   if (shape.type === 'text') {
     // @ts-ignore
-    return  {text: node.text}
+    const shape: nodeTextShape =  {text: node.text}
+    // @ts-ignore
+    if (node && node.format) {
+      // @ts-ignore
+      shape.format = node.format;
+    }
+    return shape;
   }
 
   if (children.length > 0) {
@@ -830,22 +849,31 @@ function formatHtml(s: string): string {
   return s.replace(/>\s+</g, '><').replace(/\s*\n\s*/g, ' ').trim();
 }
 
-export function dispatchKeydownEventForNode(node: LexicalNode, editor: LexicalEditor, key: string) {
+interface TestKeyboardEventOptions {
+  ctrlKey?: boolean;
+  altKey?: boolean;
+  shiftKey?: boolean;
+  metaKey?: boolean;
+  keyCode?: number;
+}
+
+export function dispatchKeydownEventForNode(node: LexicalNode, editor: LexicalEditor, key: string, options: TestKeyboardEventOptions = {}) {
   const nodeDomEl = editor.getElementByKey(node.getKey());
   const event = new KeyboardEvent('keydown', {
     bubbles: true,
     cancelable: true,
     key,
+    ...options,
   });
   nodeDomEl?.dispatchEvent(event);
   editor.commitUpdates();
 }
 
-export function dispatchKeydownEventForSelectedNode(editor: LexicalEditor, key: string) {
+export function dispatchKeydownEventForSelectedNode(editor: LexicalEditor, key: string, options: TestKeyboardEventOptions = {}) {
   editor.getEditorState().read((): void => {
     const node = $getSelection()?.getNodes()[0] || null;
     if (node) {
-      dispatchKeydownEventForNode(node, editor, key);
+      dispatchKeydownEventForNode(node, editor, key, options);
     }
   });
 }
@@ -886,4 +914,19 @@ export function patchRange() {
             },
         };
     };
+}
+
+export function waitAnimationFrames(count: number = 1): Promise<void> {
+  return new Promise((resolve) => {
+    let handled = 0;
+    let tick = () => {
+      if (++handled > count) {
+        resolve();
+      } else {
+        setTimeout(tick, 16);
+      }
+    }
+
+    tick();
+  });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
index 5015f593ed9..a259a51bdac 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalDecoratorNode.ts
@@ -25,6 +25,8 @@ export interface DecoratorNode<T> {
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class DecoratorNode<T> extends LexicalNode {
   declare ['constructor']: KlassConstructor<typeof DecoratorNode<T>>;
+  __dir: 'ltr' | 'rtl' | null = null;
+
   constructor(key?: NodeKey) {
     super(key);
   }
@@ -47,6 +49,17 @@ export class DecoratorNode<T> extends LexicalNode {
   isKeyboardSelectable(): boolean {
     return true;
   }
+
+  getDirection(): 'ltr' | 'rtl' | null {
+    const self = this.getLatest();
+    return self.__dir;
+  }
+
+  setDirection(direction: 'ltr' | 'rtl' | null): this {
+    const self = this.getWritable();
+    self.__dir = direction;
+    return self;
+  }
 }
 
 export function $isDecoratorNode<T>(
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
index 0329aed6f4e..0304fe4ad37 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalElementNode.ts
@@ -16,11 +16,9 @@ import type {KlassConstructor, Spread} from 'lexical';
 
 import invariant from 'lexical/shared/invariant';
 
-import {$isTextNode, TextNode} from '../index';
+import {$isTextNode, TextNode} from './LexicalTextNode';
 import {
   DOUBLE_LINE_BREAK,
-
-
 } from '../LexicalConstants';
 import {LexicalNode} from '../LexicalNode';
 import {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
index b1746e7f842..cef982e5f31 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalLineBreakNode.ts
@@ -6,10 +6,10 @@
  *
  */
 
-import type {KlassConstructor} from '../LexicalEditor';
+import {KlassConstructor, LexicalEditor} from '../LexicalEditor';
 import type {
   DOMConversionMap,
-  DOMConversionOutput,
+  DOMConversionOutput, DOMExportOutput,
   NodeKey,
   SerializedLexicalNode,
 } from '../LexicalNode';
@@ -43,6 +43,25 @@ export class LineBreakNode extends LexicalNode {
     return document.createElement('br');
   }
 
+  exportDOM(editor: LexicalEditor): DOMExportOutput {
+    const output = super.exportDOM(editor);
+    const parent = this.getParent();
+
+    // We insert an extra line break when the line break is the last child of a block node
+    // so that a line break is properly represented as an empty line, which mirrors the in-editor
+    // behaviour, where it's handled at the reconciliation phase
+    if (parent && !parent.isInline() && parent.getLastChild()?.getKey() === this.getKey()) {
+      output.after = (el) => {
+        if (el instanceof HTMLElement) {
+          el.before(document.createElement('br'), el);
+        }
+        return null;
+      };
+    }
+
+    return output;
+  }
+
   updateDOM(): false {
     return false;
   }
diff --git a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
index 35cc073a0ba..860f0392525 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/LexicalTextNode.ts
@@ -58,7 +58,7 @@ import {
 import {errorOnReadOnly} from '../LexicalUpdates';
 import {
   $applyNodeReplacement,
-  $getCompositionKey,
+  $getCompositionKey, $isInlineElementOrTextNode,
   $setCompositionKey,
   getCachedClassNameArray,
   internalMarkSiblingsAsDirty,
@@ -275,6 +275,16 @@ function wrapElementWith(
   return el;
 }
 
+function alternatingWhitespaceReplacer(inlineAdjacent: boolean): (match: string) => string {
+  return (match: string): string => {
+    let offset = inlineAdjacent ? 1 : 0;
+    return match
+        .split('')
+        .map((char, i) => (i % 2 === offset ? '\u00A0' : char))
+        .join('');
+  };
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface TextNode {
   getTopLevelElement(): ElementNode | null;
@@ -626,10 +636,15 @@ export class TextNode extends LexicalNode {
       'Expected TextNode createDOM to always return a HTMLElement',
     );
 
-    // Wrap up to retain space if head/tail whitespace exists
-    const text = this.getTextContent();
-    if (/^\s|\s$/.test(text)) {
-      element.style.whiteSpace = 'pre-wrap';
+    // Handle head/tail whitespace if it exists
+    let text = this.getTextContent();
+    const prevIsInline = $isInlineElementOrTextNode(this.getPreviousSibling());
+    const nextIsInline = $isInlineElementOrTextNode(this.getNextSibling());
+    if (/^\s/.test(text)) {
+      text = text.replace(/^(\s+)/, alternatingWhitespaceReplacer(prevIsInline));
+    }
+    if (/\s$/.test(text)) {
+      text = text.replace(/(\s+)$/, alternatingWhitespaceReplacer(nextIsInline));
     }
 
     // Strip editor theme classes
@@ -645,6 +660,14 @@ export class TextNode extends LexicalNode {
     // Remove placeholder tag if redundant
     if (element.nodeName === 'SPAN' && !element.getAttribute('style')) {
       element = document.createTextNode(text);
+    } else {
+      // Apply whitespace replaced text to the element
+      // Search down the child chain in the event this element is already wrapped
+      let child: Element = element;
+      while (child.childElementCount > 0) {
+        child = child.children[0];
+      }
+      child.textContent = text;
     }
 
     // This is the only way to properly add support for most clients,
@@ -653,7 +676,7 @@ export class TextNode extends LexicalNode {
     if (this.hasFormat('bold') && originalElementName !== 'strong') {
       element = wrapElementWith(element, 'strong');
     }
-    if (this.hasFormat('italic')) {
+    if (this.hasFormat('italic') && originalElementName !== 'em') {
       element = wrapElementWith(element, 'em');
     }
     if (this.hasFormat('strikethrough')) {
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
index 110086ac816..8e5b04ef159 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalLineBreakNode.test.ts
@@ -6,9 +6,22 @@
  *
  */
 
-import {$createLineBreakNode, $isLineBreakNode} from 'lexical';
-
-import {initializeUnitTest} from '../../../__tests__/utils';
+import {
+  $createLineBreakNode,
+  $createParagraphNode,
+  $createTextNode,
+  $getRoot,
+  $isLineBreakNode,
+  ParagraphNode
+} from 'lexical';
+
+import {
+  createTestContext,
+  dispatchKeydownEventForSelectedNode, expectEditorHtmlToBeEqual,
+  expectNodeShapeToMatch,
+  initializeUnitTest
+} from '../../../__tests__/utils';
+import {registerRichText} from "@lexical/rich-text";
 
 describe('LexicalLineBreakNode tests', () => {
   initializeUnitTest((testEnv) => {
@@ -71,4 +84,38 @@ describe('LexicalLineBreakNode tests', () => {
       });
     });
   });
+
+  describe('LineBreakNode.exportDOM()', () => {
+    test('first linebreaks are represented as a double break on export', () => {
+      const {editor} = createTestContext();
+      registerRichText(editor);
+
+      let textNode;
+      let paragraph!: ParagraphNode;
+
+      editor.updateAndCommit(() => {
+        paragraph = $createParagraphNode();
+        textNode = $createTextNode('hello');
+        paragraph.append(textNode);
+
+        $getRoot().append(paragraph);
+        textNode.selectEnd();
+      });
+
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+
+      expectNodeShapeToMatch(editor, [
+        {type: 'paragraph', children: [
+            {text: 'hello'},
+            {type: 'linebreak'},
+          ]}
+      ]);
+      expectEditorHtmlToBeEqual(editor, `<p>hello<br><br></p>`);
+
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+      dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+
+      expectEditorHtmlToBeEqual(editor, `<p>hello<br><br><br><br></p>`);
+    });
+  });
 });
diff --git a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
index 0dbf9b94ed7..8c81d13ac5b 100644
--- a/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
+++ b/resources/js/wysiwyg/lexical/core/nodes/__tests__/unit/LexicalTextNode.test.ts
@@ -42,6 +42,7 @@ import {
   getEditorStateTextContent,
 } from '../../../LexicalUtils';
 import {$generateHtmlFromNodes} from "@lexical/html";
+import {setEditorContentFromHtml} from "../../../../../utils/actions";
 
 const editorConfig = Object.freeze({
   namespace: '',
@@ -806,12 +807,13 @@ describe('LexicalTextNode tests', () => {
       });
     });
 
-    test('simple text wrapped in span if leading or ending spacing', async () => {
+    test('non-breaking-spaces used if leading or ending spacing', async () => {
 
       const textByExpectedHtml = {
-        'hello ': '<p><span style="white-space: pre-wrap;">hello </span></p>',
-        ' hello': '<p><span style="white-space: pre-wrap;"> hello</span></p>',
-        ' hello ': '<p><span style="white-space: pre-wrap;"> hello </span></p>',
+        'hello ': '<p>hello&nbsp;</p>',
+        ' hello': '<p>&nbsp;hello</p>',
+        ' hello ': '<p>&nbsp;hello&nbsp;</p>',
+        'hello   ': '<p>hello&nbsp; &nbsp;</p>',
       }
 
       await update(() => {
@@ -827,6 +829,31 @@ describe('LexicalTextNode tests', () => {
       });
     });
 
+    test('normal spaces used when text is adjacent to other inline text', async () => {
+      await update(() => {
+        setEditorContentFromHtml($getEditor(), '<p>&nbsp;Hello <strong>there</strong> is <em>text</em> here&nbsp;</p>');
+      });
+
+      await update(() => {
+        const html = $generateHtmlFromNodes($getEditor(), null);
+        expect(html).toBe('<p>&nbsp;Hello <strong>there</strong> is <em>text</em> here&nbsp;</p>');
+      });
+    });
+
+    test('normal and non-breaking spaces used when text with multiple spaces is adjacent to inline text', async () => {
+      await update(() => {
+        const paragraph = $getRoot().getFirstChild<ElementNode>()!;
+        $getRoot().append(paragraph);
+        paragraph.append($createTextNode('hello   '));
+        const bold = $createTextNode('world   ');
+        bold.setFormat("bold");
+        paragraph.append(bold);
+
+        const html = $generateHtmlFromNodes($getEditor(), null);
+        expect(html).toBe('<p>hello &nbsp; <strong>world&nbsp; &nbsp;</strong></p>');
+      });
+    });
+
     test('text with formats exports using format elements instead of classes', async () => {
       await update(() => {
         const paragraph = $getRoot().getFirstChild<ElementNode>()!;
diff --git a/resources/js/wysiwyg/lexical/history/index.ts b/resources/js/wysiwyg/lexical/history/index.ts
index 8c731d3aaf4..ddb5d116c4a 100644
--- a/resources/js/wysiwyg/lexical/history/index.ts
+++ b/resources/js/wysiwyg/lexical/history/index.ts
@@ -294,9 +294,12 @@ function createMergeActionGetter(
         return HISTORY_MERGE;
       }
 
-      // A single node might have been marked as dirty, but not have changed
+      // A single node might have been marked as dirty but not have changed
       // due to some node transform reverting the change.
-      if (dirtyLeaves.size === 1) {
+      const hasIntentionalElementChanges = Array.from(
+          dirtyElements.values(),
+      ).some((value) => value);
+      if (!hasIntentionalElementChanges && dirtyLeaves.size === 1) {
         const dirtyLeafKey = Array.from(dirtyLeaves)[0];
         if (
           isTextNodeUnchanged(dirtyLeafKey, prevEditorState, nextEditorState)
diff --git a/resources/js/wysiwyg/lexical/html/index.ts b/resources/js/wysiwyg/lexical/html/index.ts
index de5e53bb8c4..baa96c3a2d7 100644
--- a/resources/js/wysiwyg/lexical/html/index.ts
+++ b/resources/js/wysiwyg/lexical/html/index.ts
@@ -99,6 +99,15 @@ export function $generateHtmlFromNodes(
   return nodeCode.join('\n');
 }
 
+/**
+ * Generates HTML from a single given node (and its children), regardless of selection.
+ */
+export function $generateHtmlFromNode(editor: LexicalEditor, node: LexicalNode): string {
+  const container = document.createElement('div');
+  $appendNodesToHTML(editor, node, container);
+  return container.innerHTML;
+}
+
 function $appendNodesToHTML(
   editor: LexicalEditor,
   currentNode: LexicalNode,
diff --git a/resources/js/wysiwyg/lexical/link/LexicalMentionNode.ts b/resources/js/wysiwyg/lexical/link/LexicalMentionNode.ts
new file mode 100644
index 00000000000..9010b3c78da
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/link/LexicalMentionNode.ts
@@ -0,0 +1,125 @@
+import {
+    DecoratorNode,
+    DOMConversion,
+    DOMConversionMap, DOMConversionOutput,
+    type EditorConfig,
+    LexicalEditor, LexicalNode,
+    SerializedLexicalNode,
+    Spread
+} from "lexical";
+import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
+
+export type SerializedMentionNode = Spread<{
+    user_id: number;
+    user_name: string;
+    user_slug: string;
+}, SerializedLexicalNode>
+
+export class MentionNode extends DecoratorNode<EditorDecoratorAdapter> {
+    __user_id: number = 0;
+    __user_name: string = '';
+    __user_slug: string = '';
+
+    static getType(): string {
+        return 'mention';
+    }
+    static clone(node: MentionNode): MentionNode {
+        const newNode = new MentionNode(node.__key);
+        newNode.__user_id = node.__user_id;
+        newNode.__user_name = node.__user_name;
+        newNode.__user_slug = node.__user_slug;
+        return newNode;
+    }
+
+    setUserDetails(userId: number, userName: string, userSlug: string): void {
+        const self = this.getWritable();
+        self.__user_id = userId;
+        self.__user_name = userName;
+        self.__user_slug = userSlug;
+    }
+
+    hasUserSet(): boolean {
+        return this.__user_id > 0;
+    }
+
+    isInline(): boolean {
+        return true;
+    }
+
+    isParentRequired(): boolean {
+        return true;
+    }
+
+    decorate(editor: LexicalEditor, config: EditorConfig): EditorDecoratorAdapter {
+        return {
+            type: 'mention',
+            getNode: () => this,
+        };
+    }
+
+    createDOM(_config: EditorConfig, _editor: LexicalEditor) {
+        const element = document.createElement('a');
+        element.setAttribute('target', '_blank');
+        element.setAttribute('href', window.baseUrl('/user/' + this.__user_slug));
+        element.setAttribute('data-mention-user-id', String(this.__user_id));
+        element.setAttribute('title', '@' + this.__user_name);
+        element.textContent = '@' + this.__user_name;
+        return element;
+    }
+
+    updateDOM(prevNode: MentionNode): boolean {
+        return prevNode.__user_id !== this.__user_id;
+    }
+
+    static importDOM(): DOMConversionMap|null {
+        return {
+            a(node: HTMLElement): DOMConversion|null {
+                if (node.hasAttribute('data-mention-user-id')) {
+                    return {
+                        conversion: (element: HTMLElement): DOMConversionOutput|null => {
+                            const node = new MentionNode();
+                            node.setUserDetails(
+                                Number(element.getAttribute('data-mention-user-id') || '0'),
+                                element.innerText.replace(/^@/, ''),
+                                element.getAttribute('href')?.split('/user/')[1] || ''
+                            );
+
+                            return {
+                                node,
+                                after(childNodes): LexicalNode[] {
+                                    return [];
+                                }
+                            };
+                        },
+                        priority: 4,
+                    };
+                }
+                return null;
+            },
+        };
+    }
+
+    exportJSON(): SerializedMentionNode {
+        return {
+            type: 'mention',
+            version: 1,
+            user_id: this.__user_id,
+            user_name: this.__user_name,
+            user_slug: this.__user_slug,
+        };
+    }
+
+    static importJSON(serializedNode: SerializedMentionNode): MentionNode {
+        return $createMentionNode(serializedNode.user_id, serializedNode.user_name, serializedNode.user_slug);
+    }
+}
+
+export function $createMentionNode(userId: number, userName: string, userSlug: string) {
+    const node = new MentionNode();
+    node.setUserDetails(userId, userName, userSlug);
+    return node;
+}
+
+export function $isMentionNode(node: LexicalNode | null | undefined): node is MentionNode {
+    return node instanceof MentionNode;
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
index 239c49a8c30..2a1b698b123 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListItemNode.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type {ListNode, ListType} from './';
+import type {ListNode, ListType} from './LexicalListNode';
 import type {
   BaseSelection,
   DOMConversionMap,
@@ -32,10 +32,11 @@ import {
 } from 'lexical';
 import invariant from 'lexical/shared/invariant';
 
-import {$createListNode, $isListNode} from './';
+import {$createListNode, $isListNode} from './LexicalListNode';
 import {mergeLists} from './formatList';
 import {isNestedListNode} from './utils';
 import {el} from "../../utils/dom";
+import {$escapeListAtItem} from "../../utils/lists";
 
 export type SerializedListItemNode = Spread<
   {
@@ -273,21 +274,13 @@ export class ListItemNode extends ElementNode {
     restoreSelection = true,
   ): ListItemNode | ParagraphNode | null {
 
-    if (this.getTextContent().trim() === '' && this.isLastChild()) {
-      const list = this.getParentOrThrow<ListNode>();
-      const parentListItem = list.getParent();
-      if ($isListItemNode(parentListItem)) {
-        // Un-nest list item if empty nested item
-        parentListItem.insertAfter(this);
-        this.selectStart();
-        return null;
-      } else {
-        // Insert empty paragraph after list if adding after last empty child
-        const paragraph = $createParagraphNode();
-        list.insertAfter(paragraph, restoreSelection);
-        this.remove();
-        return paragraph;
-      }
+    // If we're adding a new empty item, and coming from an empty item,
+    // take that as a desire to break from the current list level.
+    // Intended to be a bit more lenient on the last list item hence ignores whitespace,
+    // which allows empty items to be listed with just a space (except for last).
+    const textContent = this.getTextContent();
+    if (textContent === '' || (textContent.trim() === '' && this.isLastChild())) {
+        return $escapeListAtItem(this);
     }
 
     const newElement = $createListItemNode(
diff --git a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
index b5c83adddce..0311e8b313b 100644
--- a/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
+++ b/resources/js/wysiwyg/lexical/list/LexicalListNode.ts
@@ -30,7 +30,7 @@ import {
 import invariant from 'lexical/shared/invariant';
 import normalizeClassNames from 'lexical/shared/normalizeClassNames';
 
-import {$createListItemNode, $isListItemNode, ListItemNode} from '.';
+import {$createListItemNode, $isListItemNode, ListItemNode} from './LexicalListItemNode';
 import {
   mergeNextSiblingListIfSameType,
   updateChildrenListItemValue,
diff --git a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
index 10ff0fc6699..48fa2faf8b0 100644
--- a/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
+++ b/resources/js/wysiwyg/lexical/list/__tests__/unit/LexicalListItemNode.test.ts
@@ -9,12 +9,12 @@
 import {
   $createParagraphNode,
   $createRangeSelection,
-  $getRoot, LexicalEditor,
+  $getRoot, LexicalEditor, LexicalNode, ParagraphNode,
   TextNode,
 } from 'lexical';
 import {
   createTestContext, destroyFromContext,
-  expectHtmlToBeEqual,
+  expectHtmlToBeEqual, expectNodeShapeToMatch,
   html,
 } from 'lexical/__tests__/utils';
 
@@ -1200,6 +1200,70 @@ describe('LexicalListItemNode tests', () => {
           </ul>`,
       );
     });
+
+    test('new items after empty top-level items splits the list in two, and inserts a paragraph inbetween', () => {
+      let newItem: LexicalNode|null = null;
+      const input = `<ul>
+        <li>Item A</li>        
+        <li></li>        
+        <li>Item C</li>        
+        </ul>`;
+
+      editor.updateAndCommit(() => {
+        const root = $getRoot();
+        root.append(...$htmlToBlockNodes(editor, input));
+        const list = root.getFirstChild() as ListNode;
+        const itemB = list.getChildAtIndex(1) as ListItemNode;
+
+        newItem = itemB.insertNewAfter($createRangeSelection());
+      });
+
+      expect(newItem).toBeInstanceOf(ParagraphNode);
+
+      expectNodeShapeToMatch(editor, [
+        {
+          type: 'list',
+          children: [{type: 'listitem', children: [{text: 'Item A'}]}],
+        },
+        {
+          type: 'paragraph',
+        },
+        {
+          type: 'list',
+          children: [{type: 'listitem', children: [{text: 'Item C'}]}],
+        }
+      ])
+    });
+
+    test('new items after last empty top-level inserts a new paragraph below, and removes the list item', () => {
+      let newItem: LexicalNode|null = null;
+      const input = `<ul>
+        <li>Item A</li>        
+        <li>Item B</li>        
+        <li></li>        
+        </ul>`;
+
+      editor.updateAndCommit(() => {
+        const root = $getRoot();
+        root.append(...$htmlToBlockNodes(editor, input));
+        const list = root.getFirstChild() as ListNode;
+        const itemC = list.getChildAtIndex(2) as ListItemNode;
+
+        newItem = itemC.insertNewAfter($createRangeSelection());
+      });
+
+      expect(newItem).toBeInstanceOf(ParagraphNode);
+
+      expectNodeShapeToMatch(editor, [
+        {
+          type: 'list',
+          children: [{type: 'listitem', children: [{text: 'Item A'}]}, {type: 'listitem', children: [{text: 'Item B'}]}],
+        },
+        {
+          type: 'paragraph',
+        },
+      ])
+    });
   });
 
   test('$createListItemNode()', async () => {
diff --git a/resources/js/wysiwyg/lexical/list/formatList.ts b/resources/js/wysiwyg/lexical/list/formatList.ts
index aa0d5d61129..5c7b81b7a5f 100644
--- a/resources/js/wysiwyg/lexical/list/formatList.ts
+++ b/resources/js/wysiwyg/lexical/list/formatList.ts
@@ -25,12 +25,14 @@ import invariant from 'lexical/shared/invariant';
 
 import {
   $createListItemNode,
-  $createListNode,
   $isListItemNode,
-  $isListNode,
   ListItemNode,
+} from './LexicalListItemNode';
+import {
+  $createListNode,
+  $isListNode,
   ListNode,
-} from './';
+} from './LexicalListNode';
 import {ListType} from './LexicalListNode';
 import {
   $getAllListItems,
diff --git a/resources/js/wysiwyg/lexical/list/index.ts b/resources/js/wysiwyg/lexical/list/index.ts
index 157fe79de1d..00e33c115e8 100644
--- a/resources/js/wysiwyg/lexical/list/index.ts
+++ b/resources/js/wysiwyg/lexical/list/index.ts
@@ -8,7 +8,10 @@
 
 import type {SerializedListItemNode} from './LexicalListItemNode';
 import type {ListType, SerializedListNode} from './LexicalListNode';
-import type {LexicalCommand} from 'lexical';
+import {
+  $getSelection,
+  $isRangeSelection, COMMAND_PRIORITY_NORMAL, INSERT_PARAGRAPH_COMMAND, LexicalCommand, LexicalEditor
+} from 'lexical';
 
 import {createCommand} from 'lexical';
 
@@ -20,6 +23,8 @@ import {
 } from './LexicalListItemNode';
 import {$createListNode, $isListNode, ListNode} from './LexicalListNode';
 import {$getListDepth} from './utils';
+import {mergeRegister} from "@lexical/utils";
+import {$getAncestor, INTERNAL_$isBlock} from "lexical/LexicalUtils";
 
 export {
   $createListItemNode,
@@ -48,3 +53,34 @@ export const INSERT_CHECK_LIST_COMMAND: LexicalCommand<void> = createCommand(
 export const REMOVE_LIST_COMMAND: LexicalCommand<void> = createCommand(
   'REMOVE_LIST_COMMAND',
 );
+
+export function registerLists(editor: LexicalEditor): () => void {
+  return mergeRegister(
+
+      // Override the default insert paragraph command when within a list item
+      // so that new blocks are inserted as their own list items.
+      editor.registerCommand(INSERT_PARAGRAPH_COMMAND, () => {
+        const selection = $getSelection();
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+
+        const anchorNode = selection.anchor.getNode();
+        const block = $getAncestor(anchorNode, INTERNAL_$isBlock)!;
+        const blockParent = block.getParent();
+        if ($isListItemNode(blockParent)) {
+            const newBlock = selection.insertParagraph();
+            if (newBlock) {
+                const newListItem = $createListItemNode();
+                const newBlockSiblings = newBlock.getNextSiblings();
+                newListItem.append(newBlock, ...newBlockSiblings);
+                blockParent.insertAfter(newListItem, false);
+                newListItem.selectStart();
+            }
+            return true;
+        }
+
+        return false;
+      }, COMMAND_PRIORITY_NORMAL),
+  );
+}
diff --git a/resources/js/wysiwyg/lexical/list/utils.ts b/resources/js/wysiwyg/lexical/list/utils.ts
index c451a45085d..984e7701675 100644
--- a/resources/js/wysiwyg/lexical/list/utils.ts
+++ b/resources/js/wysiwyg/lexical/list/utils.ts
@@ -14,10 +14,12 @@ import invariant from 'lexical/shared/invariant';
 import {
   $createListItemNode,
   $isListItemNode,
-  $isListNode,
   ListItemNode,
+} from './LexicalListItemNode';
+import {
+  $isListNode,
   ListNode,
-} from './';
+} from './LexicalListNode';
 
 /**
  * Checks the depth of listNode from the root node.
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
index 49ba7754c4c..342d43fc21d 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalCodeBlockNode.ts
@@ -11,11 +11,14 @@ import type {EditorConfig} from "lexical/LexicalEditor";
 import {EditorDecoratorAdapter} from "../../ui/framework/decorator";
 import {CodeEditor} from "../../../components";
 import {el} from "../../utils/dom";
+import {focusEditor} from "../../utils/actions";
+import {elem} from "../../../services/dom";
 
 export type SerializedCodeBlockNode = Spread<{
     language: string;
     id: string;
     code: string;
+    dir: 'ltr' | 'rtl' | null;
 }, SerializedLexicalNode>
 
 const getLanguageFromClassList = (classes: string) => {
@@ -35,6 +38,7 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
     static clone(node: CodeBlockNode): CodeBlockNode {
         const newNode = new CodeBlockNode(node.__language, node.__code, node.__key);
         newNode.__id = node.__id;
+        newNode.__dir = node.__dir;
         return newNode;
     }
 
@@ -98,32 +102,48 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
             }, [this.__code]),
         ]);
 
-        return el('div', {class: 'editor-code-block-wrap'}, [codeBlock]);
+        return el('div', {
+            class: 'editor-code-block-wrap',
+            dir: this.__dir,
+        }, [codeBlock]);
     }
 
     updateDOM(prevNode: CodeBlockNode, dom: HTMLElement) {
         const code = dom.querySelector('code');
-        if (!code) return false;
+        const pre = dom.querySelector('pre');
+        if (!code || !pre) return false;
 
         if (prevNode.__language !== this.__language) {
             code.className = this.__language ? `language-${this.__language}` : '';
         }
 
         if (prevNode.__id !== this.__id) {
-            dom.setAttribute('id', this.__id);
+            pre.setAttribute('id', this.__id);
         }
 
         if (prevNode.__code !== this.__code) {
             code.textContent = this.__code;
         }
 
+        if (prevNode.__dir !== this.__dir) {
+            if (this.__dir !== null) {
+                dom.setAttribute('dir', this.__dir)
+            } else {
+                dom.removeAttribute('dir');
+            }
+        }
+
         return false;
     }
 
     exportDOM(editor: LexicalEditor): DOMExportOutput {
         const dom = this.createDOM(editor._config, editor);
+        const pre = dom.querySelector('pre') as HTMLElement;
+        if (this.__dir !== null) {
+            pre.setAttribute('dir', this.__dir);
+        }
         return {
-            element: dom.querySelector('pre') as HTMLElement,
+            element: pre,
         };
     }
 
@@ -145,6 +165,10 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
                             node.setId(element.id);
                         }
 
+                        if (element.dir && (element.dir === 'ltr' || element.dir === 'rtl')) {
+                            node.setDirection(element.dir);
+                        }
+
                         return {
                             node,
                             after(childNodes): LexicalNode[] {
@@ -167,12 +191,14 @@ export class CodeBlockNode extends DecoratorNode<EditorDecoratorAdapter> {
             id: this.__id,
             language: this.__language,
             code: this.__code,
+            dir: this.__dir,
         };
     }
 
     static importJSON(serializedNode: SerializedCodeBlockNode): CodeBlockNode {
         const node = $createCodeBlockNode(serializedNode.language, serializedNode.code);
         node.setId(serializedNode.id || '');
+        node.setDirection(serializedNode.dir || null);
         return node;
     }
 }
@@ -188,17 +214,19 @@ export function $isCodeBlockNode(node: LexicalNode | null | undefined) {
 export function $openCodeEditorForNode(editor: LexicalEditor, node: CodeBlockNode): void {
     const code = node.getCode();
     const language = node.getLanguage();
+    const direction = node.getDirection() || 'ltr';
 
     // @ts-ignore
     const codeEditor = window.$components.first('code-editor') as CodeEditor;
-    // TODO - Handle direction
-    codeEditor.open(code, language, 'ltr', (newCode: string, newLang: string) => {
+
+    codeEditor.open(code, language, direction, (newCode: string, newLang: string) => {
         editor.update(() => {
             node.setCode(newCode);
             node.setLanguage(newLang);
         });
-        // TODO - Re-focus
+
+        focusEditor(editor);
     }, () => {
-        // TODO - Re-focus
+        focusEditor(editor);
     });
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
index cdf32fdcbb1..e477d8b878d 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDetailsNode.ts
@@ -5,10 +5,11 @@ import {
     LexicalEditor,
     LexicalNode,
     SerializedElementNode, Spread,
-    EditorConfig, DOMExportOutput,
+    EditorConfig, DOMExportOutput, $getSelection,
 } from 'lexical';
 
 import {extractDirectionFromElement} from "lexical/nodes/common";
+import {$showDetailsForm} from "../../ui/defaults/forms/objects";
 
 export type SerializedDetailsNode = Spread<{
     id: string;
@@ -63,6 +64,10 @@ export class DetailsNode extends ElementNode {
         return newNode;
     }
 
+    isShadowRoot(): boolean {
+        return true;
+    }
+
     createDOM(_config: EditorConfig, _editor: LexicalEditor) {
         const el = document.createElement('details');
         if (this.__id) {
@@ -77,6 +82,7 @@ export class DetailsNode extends ElementNode {
             el.setAttribute('open', 'true');
             el.removeAttribute('contenteditable');
         } else {
+            el.setAttribute('draggable', 'true');
             el.setAttribute('contenteditable', 'false');
         }
 
@@ -89,6 +95,30 @@ export class DetailsNode extends ElementNode {
                 this.select();
             });
         });
+        summary.addEventListener('pointerdown', event => {
+            _editor.update(() => {
+                this.select();
+            });
+
+            // We juggle the draggable so that the details element can be dragged when started from the summary,
+            // but details element otherwise remains undraggable when open to allow editing of its contents
+            el.draggable = true;
+            const pointerUpCallback = () => {
+                document.removeEventListener('pointerup', pointerUpCallback);
+                el.draggable = false;
+            };
+            document.addEventListener('pointerup', pointerUpCallback);
+        });
+
+        summary.addEventListener('dblclick', event => {
+            event.preventDefault();
+            const uiContext = _editor.getUiContext();
+            if (uiContext) {
+                _editor.read(() => {
+                    $showDetailsForm(this, uiContext);
+                });
+            }
+        });
 
         el.append(summary);
 
@@ -101,8 +131,10 @@ export class DetailsNode extends ElementNode {
             dom.toggleAttribute('open', this.__open);
             if (this.__open) {
                 dom.removeAttribute('contenteditable');
+                dom.removeAttribute('draggable');
             } else {
                 dom.setAttribute('contenteditable', 'false');
+                dom.setAttribute('draggable', 'true');
             }
         }
 
@@ -153,6 +185,7 @@ export class DetailsNode extends ElementNode {
 
         element.removeAttribute('open');
         element.removeAttribute('contenteditable');
+        element.removeAttribute('draggable');
 
         return {element};
     }
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
index e69f97848ac..6be19c29371 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalDiagramNode.ts
@@ -27,7 +27,7 @@ export class DiagramNode extends DecoratorNode<EditorDecoratorAdapter> {
     }
 
     static clone(node: DiagramNode): DiagramNode {
-        const newNode = new DiagramNode(node.__drawingId, node.__drawingUrl);
+        const newNode = new DiagramNode(node.__drawingId, node.__drawingUrl, node.__key);
         newNode.__id = node.__id;
         return newNode;
     }
diff --git a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
index 40f4ab71165..42d96d15c98 100644
--- a/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/LexicalImageNode.ts
@@ -7,7 +7,6 @@ import {
 } from "lexical";
 import type {EditorConfig} from "lexical/LexicalEditor";
 import {CommonBlockAlignment, extractAlignmentFromElement} from "lexical/nodes/common";
-import {$selectSingleNode} from "../../utils/selection";
 import {SerializedElementNode} from "lexical/nodes/LexicalElementNode";
 
 export interface ImageNodeOptions {
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
index 828aad83938..79c61394914 100644
--- a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDetailsNode.test.ts
@@ -17,7 +17,7 @@ describe('LexicalDetailsNode tests', () => {
             html = details.createDOM(editorConfig, editor).outerHTML;
         });
 
-        expect(html).toBe(`<details contenteditable="false"><summary contenteditable="false"></summary></details>`);
+        expect(html).toBe(`<details draggable="true" contenteditable="false"><summary contenteditable="false"></summary></details>`);
     });
 
     test('exportDOM()', () => {
diff --git a/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDiagramNode.test.ts b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDiagramNode.test.ts
new file mode 100644
index 00000000000..e6bb244f49a
--- /dev/null
+++ b/resources/js/wysiwyg/lexical/rich-text/__tests__/unit/LexicalDiagramNode.test.ts
@@ -0,0 +1,33 @@
+import {createTestContext} from "lexical/__tests__/utils";
+import {$createDiagramNode, DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
+import {$getHtmlContent} from "@lexical/clipboard";
+import {getEditorContentAsHtml} from "../../../../utils/actions";
+import {$getRoot} from "lexical";
+
+
+describe('LexicalDiagramNode', () => {
+
+    test('clone creates new instance with same key', () => {
+        const {editor} = createTestContext();
+        editor.updateAndCommit(() => {
+            const node = $createDiagramNode('10', 'https://example.com/barry.png');
+            const clone = DiagramNode.clone(node);
+
+            expect(node).not.toBe(clone);
+            expect(node.getKey()).toBe(clone.getKey());
+        });
+    });
+
+    test('output HTML format', async () => {
+        const {editor} = createTestContext();
+        editor.updateAndCommit(() => {
+            const node = $createDiagramNode('10', 'https://example.com/barry.png');
+            node.setId('cat-123');
+            $getRoot().append(node);
+        });
+
+        const html = await getEditorContentAsHtml(editor);
+        expect(html).toBe(`<div id="cat-123" drawio-diagram="10"><img src="https://example.com/barry.png"></div>`);
+    });
+
+});
\ No newline at end of file
diff --git a/resources/js/wysiwyg/lexical/rich-text/index.ts b/resources/js/wysiwyg/lexical/rich-text/index.ts
index 477fdd78105..8fb4876b8b1 100644
--- a/resources/js/wysiwyg/lexical/rich-text/index.ts
+++ b/resources/js/wysiwyg/lexical/rich-text/index.ts
@@ -66,6 +66,7 @@ import {$moveCharacter, $shouldOverrideDefaultCharacterSelection,} from '@lexica
 import {$findMatchingParent, mergeRegister, objectKlassEquals,} from '@lexical/utils';
 import caretFromPoint from 'lexical/shared/caretFromPoint';
 import {CAN_USE_BEFORE_INPUT, IS_APPLE_WEBKIT, IS_IOS, IS_SAFARI,} from 'lexical/shared/environment';
+import {$getSingleSelectableNode} from "../../utils/nodes";
 
 export const DRAG_DROP_PASTE: LexicalCommand<Array<File>> = createCommand(
   'DRAG_DROP_PASTE_FILE',
@@ -107,7 +108,12 @@ async function onCutForRichText(
   editor.update(() => {
     const selection = $getSelection();
     if ($isRangeSelection(selection)) {
-      selection.removeText();
+      const singleSelectable = $getSingleSelectableNode(selection.getNodes())
+      if (singleSelectable) {
+          singleSelectable.remove();
+      } else {
+        selection.removeText();
+      }
     } else if ($isNodeSelection(selection)) {
       selection.getNodes().forEach((node) => node.remove());
     }
diff --git a/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
index d9d83562c29..5f2ef9a25bd 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalCaptionNode.ts
@@ -1,7 +1,6 @@
 import {
     $createTextNode,
     DOMConversionMap,
-    DOMExportOutput,
     EditorConfig,
     ElementNode,
     LexicalEditor,
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
index 1c9d7ecf692..0e714e70fc2 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableCellNode.ts
@@ -334,10 +334,13 @@ export function $convertTableCellNodeElement(
     width = parseFloat(domNode_.style.width);
   }
 
+  let isHeader = nodeName === 'th';
+  if (domNode instanceof HTMLElement && domNode.closest('thead')) {
+    isHeader = true;
+  }
+
   const tableCellNode = $createTableCellNode(
-      nodeName === 'th'
-          ? TableCellHeaderStates.ROW
-          : TableCellHeaderStates.NO_STATUS,
+      isHeader ? TableCellHeaderStates.ROW : TableCellHeaderStates.NO_STATUS,
       domNode_.colSpan,
       width,
   );
diff --git a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
index 6e5e5416fa0..7e2d93ad9e3 100644
--- a/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
+++ b/resources/js/wysiwyg/lexical/table/LexicalTableSelectionHelpers.ts
@@ -72,6 +72,7 @@ import {$isTableRowNode} from './LexicalTableRowNode';
 import {$isTableSelection} from './LexicalTableSelection';
 import {$computeTableMap, $getNodeTriplet} from './LexicalTableUtils';
 import {$selectOrCreateAdjacent} from "../../utils/nodes";
+import {$selectNodeAtXPixelOffset} from "../../utils/selection";
 
 const LEXICAL_ELEMENT_KEY = '__lexicalTableSelection';
 
@@ -1073,6 +1074,7 @@ const selectTableNodeInDirection = (
   x: number,
   y: number,
   direction: Direction,
+  selectionOffset: number = -1
 ): boolean => {
   const isForward = direction === 'forward';
 
@@ -1112,6 +1114,7 @@ const selectTableNodeInDirection = (
         selectTableCellNode(
           tableNode.getCellNodeFromCordsOrThrow(x, y - 1, tableObserver.table),
           false,
+          selectionOffset,
         );
       } else {
         $selectOrCreateAdjacent(tableNode, false);
@@ -1124,6 +1127,7 @@ const selectTableNodeInDirection = (
         selectTableCellNode(
           tableNode.getCellNodeFromCordsOrThrow(x, y + 1, tableObserver.table),
           true,
+          selectionOffset,
         );
       } else {
         $selectOrCreateAdjacent(tableNode, true);
@@ -1197,7 +1201,14 @@ function $isSelectionInTable(
   return false;
 }
 
-function selectTableCellNode(tableCell: TableCellNode, fromStart: boolean) {
+function selectTableCellNode(tableCell: TableCellNode, fromStart: boolean, selectionOffsetPixels : number = -1) {
+  if (selectionOffsetPixels !== -1) {
+    const selection = $selectNodeAtXPixelOffset(tableCell, selectionOffsetPixels, fromStart);
+    if (selection) {
+      return;
+    }
+  }
+
   if (fromStart) {
     tableCell.selectStart();
   } else {
@@ -1491,12 +1502,14 @@ function $handleArrowKey(
         tableObserver.setAnchorCellForSelection(cell);
         tableObserver.setFocusCellForSelection(cell, true);
       } else {
+        const selectionOffset = edgeSelectionRect.x - edgeRect.x;
         return selectTableNodeInDirection(
           tableObserver,
           tableNode,
           cords.x,
           cords.y,
           direction,
+          selectionOffset
         );
       }
 
diff --git a/resources/js/wysiwyg/nodes.ts b/resources/js/wysiwyg/nodes.ts
index 413e2c4cd3f..7c1a71579d9 100644
--- a/resources/js/wysiwyg/nodes.ts
+++ b/resources/js/wysiwyg/nodes.ts
@@ -19,6 +19,7 @@ import {MediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {HeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 import {QuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
 import {CaptionNode} from "@lexical/table/LexicalCaptionNode";
+import {MentionNode} from "@lexical/link/LexicalMentionNode";
 
 export function getNodesForPageEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
     return [
@@ -51,6 +52,13 @@ export function getNodesForBasicEditor(): (KlassConstructor<typeof LexicalNode>
     ];
 }
 
+export function getNodesForCommentEditor(): (KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement)[] {
+    return [
+        ...getNodesForBasicEditor(),
+        MentionNode,
+    ];
+}
+
 export function registerCommonNodeMutationListeners(context: EditorUiContext): void {
     const decorated = [ImageNode, CodeBlockNode, DiagramNode];
 
diff --git a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
index cd4235f2f06..98166c6d1d8 100644
--- a/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
+++ b/resources/js/wysiwyg/services/__tests__/keyboard-handling.test.ts
@@ -1,7 +1,7 @@
 import {
     createTestContext, destroyFromContext,
     dispatchKeydownEventForNode,
-    dispatchKeydownEventForSelectedNode, expectNodeShapeToMatch,
+    dispatchKeydownEventForSelectedNode, expectNodeShapeToMatch, waitAnimationFrames,
 } from "lexical/__tests__/utils";
 import {
     $createParagraphNode, $createTextNode,
@@ -14,6 +14,8 @@ import {registerRichText} from "@lexical/rich-text";
 import {EditorUiContext} from "../../ui/framework/core";
 import {$createListItemNode, $createListNode, ListItemNode, ListNode} from "@lexical/list";
 import {$createImageNode, ImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$selectSingleNode} from "../../utils/selection";
+import {$createLinkNode} from "@lexical/link";
 
 describe('Keyboard-handling service tests', () => {
 
@@ -158,4 +160,110 @@ describe('Keyboard-handling service tests', () => {
             ],
         }]);
     });
+
+    test('Images in list items: Shift Enter press inserts a new text element and line break above the image', async () => {
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            const list = $createListNode('bullet');
+            const listItem = $createListItemNode();
+            const image = $createImageNode('https://example.com/cat.png');
+            root.append(list);
+            list.append(listItem);
+            listItem.append(image);
+
+            $selectSingleNode(image);
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {type: 'image'}
+                    ],
+                }
+            ],
+        }]);
+
+        dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+        await waitAnimationFrames(2);
+
+        editor.updateAndCommit(() => {
+            $getSelection()?.insertText('p');
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {text: 'p'},
+                        {type: 'linebreak'},
+                        {type: 'image'}
+                    ],
+                }
+            ],
+        }]);
+    });
+
+    test('Linked images in list items: Shift Enter press inserts a new text element and line break above the link', async () => {
+        editor.updateAndCommit(() => {
+            const root = $getRoot();
+            const list = $createListNode('bullet');
+            const listItem = $createListItemNode();
+            const link = $createLinkNode('https://example.com');
+            const image = $createImageNode('https://example.com/cat.png');
+            root.append(list);
+            list.append(listItem);
+            listItem.append(link);
+            link.append(image);
+
+            $selectSingleNode(image);
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {
+                            type: 'link',
+                            children: [
+                                {type: 'image'}
+                            ]
+                        }
+                    ],
+                }
+            ],
+        }]);
+
+        dispatchKeydownEventForSelectedNode(editor, 'Enter', {shiftKey: true});
+        await waitAnimationFrames(2);
+
+        editor.updateAndCommit(() => {
+            $getSelection()?.insertText('p');
+        });
+
+        expectNodeShapeToMatch(editor, [{
+            type: 'list',
+            children: [
+                {
+                    type: 'listitem',
+                    children: [
+                        {text: 'p'},
+                        {type: 'linebreak'},
+                        {
+                            type: 'link',
+                            children: [
+                                {type: 'image'}
+                            ]
+                        }
+                    ],
+                }
+            ],
+        }]);
+    });
 });
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/__tests__/shortcuts.test.ts b/resources/js/wysiwyg/services/__tests__/shortcuts.test.ts
new file mode 100644
index 00000000000..f7e7298e829
--- /dev/null
+++ b/resources/js/wysiwyg/services/__tests__/shortcuts.test.ts
@@ -0,0 +1,91 @@
+import {
+    createTestContext, destroyFromContext,
+    dispatchKeydownEventForSelectedNode, expectEditorStateJSONPropToEqual,
+} from "lexical/__tests__/utils";
+import {
+    $createParagraphNode, $createTextNode,
+    $getRoot, IS_BOLD, LexicalEditor,
+} from "lexical";
+import {registerRichText} from "@lexical/rich-text";
+import {EditorUiContext} from "../../ui/framework/core";
+import {registerShortcuts} from "../shortcuts";
+
+describe('Keyboard-handling service tests', () => {
+
+    let context!: EditorUiContext;
+    let editor!: LexicalEditor;
+
+    beforeEach(() => {
+        context = createTestContext();
+        editor = context.editor;
+        registerRichText(editor);
+        registerShortcuts(context, true);
+    });
+
+    afterEach(() => {
+        destroyFromContext(context);
+    });
+
+    test('Basic block format shortcuts works', () => {
+        editor.updateAndCommit(() => {
+            const p = $createParagraphNode();
+            p.append($createTextNode('Hello World'))
+            $getRoot().append(p);
+            p.select();
+        });
+
+        dispatchKeydownEventForSelectedNode(editor, '1', {ctrlKey: true});
+
+        expectEditorStateJSONPropToEqual(editor, '0.type', 'heading');
+        expectEditorStateJSONPropToEqual(editor, '0.tag', 'h2');
+
+        dispatchKeydownEventForSelectedNode(editor, '2', {ctrlKey: true});
+
+        expectEditorStateJSONPropToEqual(editor, '0.type', 'heading');
+        expectEditorStateJSONPropToEqual(editor, '0.tag', 'h3');
+
+        dispatchKeydownEventForSelectedNode(editor, 'd', {ctrlKey: true});
+
+        expectEditorStateJSONPropToEqual(editor, '0.type', 'paragraph');
+        expectEditorStateJSONPropToEqual(editor, '0.0.text', 'Hello World');
+    });
+
+    test('Basic bold format shortcut works', () => {
+        editor.updateAndCommit(() => {
+            const p = $createParagraphNode();
+            const text = $createTextNode('Hello World');
+            p.append(text)
+            $getRoot().append(p);
+            text.select(0, 5);
+        });
+
+        // Toggle bold for selection
+        dispatchKeydownEventForSelectedNode(editor, 'b', {ctrlKey: true});
+        expectEditorStateJSONPropToEqual(editor, '0.0.format', IS_BOLD);
+        expectEditorStateJSONPropToEqual(editor, '0.1.format', 0);
+
+        // Untoggle bold for selection
+        dispatchKeydownEventForSelectedNode(editor, 'b', {ctrlKey: true});
+        expectEditorStateJSONPropToEqual(editor, '0.0.format', 0);
+    });
+
+    test('Basic bold format shortcut works when using cyrillic equivalent keys', () => {
+        editor.updateAndCommit(() => {
+            const p = $createParagraphNode();
+            const text = $createTextNode('Hello World');
+            p.append(text)
+            $getRoot().append(p);
+            text.select(0, 5);
+        });
+
+        // Toggle bold for selection
+        dispatchKeydownEventForSelectedNode(editor, 'и', {ctrlKey: true, keyCode: 66});
+        expectEditorStateJSONPropToEqual(editor, '0.0.format', IS_BOLD);
+        expectEditorStateJSONPropToEqual(editor, '0.1.format', 0);
+
+        // Untoggle bold for selection
+        dispatchKeydownEventForSelectedNode(editor, 'и', {ctrlKey: true, keyCode: 66});
+        expectEditorStateJSONPropToEqual(editor, '0.0.format', 0);
+    });
+
+});
diff --git a/resources/js/wysiwyg/services/common-events.ts b/resources/js/wysiwyg/services/common-events.ts
index 2ffa722e40c..9c6a91787cc 100644
--- a/resources/js/wysiwyg/services/common-events.ts
+++ b/resources/js/wysiwyg/services/common-events.ts
@@ -1,7 +1,7 @@
-import {$getSelection, LexicalEditor} from "lexical";
+import {LexicalEditor} from "lexical";
 import {
     appendHtmlToEditor,
-    focusEditor,
+    focusEditor, focusOnHeader,
     insertHtmlIntoEditor,
     prependHtmlToEditor,
     setEditorContentFromHtml
@@ -41,6 +41,10 @@ export function listen(editor: LexicalEditor): void {
         focusEditor(editor);
     });
 
+    window.$events.listen<{id: string, index: number}>('editor::focus-heading', ({index}) => {
+        focusOnHeader(editor, index);
+    });
+
     let changeFromLoading = true;
     editor.registerUpdateListener(({dirtyElements, dirtyLeaves, editorState, prevEditorState}) => {
         // Emit change event to component system (for draft detection) on actual user content change
diff --git a/resources/js/wysiwyg/services/drop-paste-handling.ts b/resources/js/wysiwyg/services/drop-paste-handling.ts
index 57f9a80ae18..5f90a6bb963 100644
--- a/resources/js/wysiwyg/services/drop-paste-handling.ts
+++ b/resources/js/wysiwyg/services/drop-paste-handling.ts
@@ -1,40 +1,42 @@
 import {
-    $createParagraphNode,
+    $createParagraphNode, $getSelection,
     $insertNodes,
-    $isDecoratorNode, COMMAND_PRIORITY_HIGH, DROP_COMMAND,
+    $isDecoratorNode,
+    $isRangeSelection, $isTextNode, $setSelection, COMMAND_PRIORITY_HIGH, DRAGSTART_COMMAND, DROP_COMMAND,
     LexicalEditor,
     LexicalNode, PASTE_COMMAND
 } from "lexical";
-import {$insertNewBlockNodesAtSelection, $selectSingleNode} from "../utils/selection";
-import {$getNearestBlockNodeForCoords, $htmlToBlockNodes} from "../utils/nodes";
+import {$getBlockElementNodesInSelection, $insertNewNodesAtSelection, $selectSingleNode} from "../utils/selection";
+import {
+    $getNodePositionFromMouseEvent,
+    $getSingleSelectableNode, $htmlToBlockNodes, $htmlToNodes,
+} from "../utils/nodes";
 import {Clipboard} from "../../services/clipboard";
 import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
 import {$createLinkNode} from "@lexical/link";
 import {EditorImageData, uploadImageFile} from "../utils/images";
 import {EditorUiContext} from "../ui/framework/core";
+import {$getHtmlContent} from "@lexical/clipboard";
+import {$generateHtmlFromNode} from "@lexical/html";
 
-function $getNodeFromMouseEvent(event: MouseEvent, editor: LexicalEditor): LexicalNode|null {
-    const x = event.clientX;
-    const y = event.clientY;
-    const dom = document.elementFromPoint(x, y);
-    if (!dom) {
-        return null;
-    }
-
-    return $getNearestBlockNodeForCoords(editor, event.clientX, event.clientY);
-}
+const internalActiveDragTracker: WeakMap<LexicalEditor, DragEvent>  = new WeakMap();
 
 function $insertNodesAtEvent(nodes: LexicalNode[], event: DragEvent, editor: LexicalEditor) {
-    const positionNode = $getNodeFromMouseEvent(event, editor);
+    const position = $getNodePositionFromMouseEvent(event, editor);
 
-    if (positionNode) {
-        $selectSingleNode(positionNode);
+    if (position && $isTextNode(position.node)) {
+        const selection = position.node.select(position.offset, position.offset);
+        $setSelection(selection);
+    } else if  (position) {
+        $selectSingleNode(position.node);
     }
 
-    $insertNewBlockNodesAtSelection(nodes, true);
+    $insertNewNodesAtSelection(nodes);
 
-    if (!$isDecoratorNode(positionNode) || !positionNode?.getTextContent()) {
-        positionNode?.remove();
+    if (position) {
+        if (!$isDecoratorNode(position.node) && !position.node?.getTextContent()) {
+            position.node.remove();
+        }
     }
 }
 
@@ -49,6 +51,34 @@ async function insertTemplateToEditor(editor: LexicalEditor, templateId: string,
     });
 }
 
+function insertHtmlToEditor(editor: LexicalEditor, html: string, isFromInternal: boolean, event: DragEvent) {
+    editor.update(() => {
+        if (isFromInternal) {
+            const selected = $getSelection();
+            if ($isRangeSelection(selected)) {
+                // Handle single selected node scenarios
+                const singleSelectedNode = $getSingleSelectableNode(selected.getNodes());
+                if (singleSelectedNode) {
+                    singleSelectedNode.remove();
+                } else {
+                    selected.removeText();
+                }
+
+                // Clear out empty blocks
+                const selectionBlocks = $getBlockElementNodesInSelection(selected);
+                for (const block of selectionBlocks) {
+                    if (block.isEmpty()) {
+                        block.remove();
+                    }
+                }
+            }
+        }
+
+        const newNodes = $htmlToNodes(editor, html);
+        $insertNodesAtEvent(newNodes, event, editor);
+    });
+}
+
 function handleMediaInsert(data: DataTransfer, context: EditorUiContext): boolean {
     const clipboard = new Clipboard(data);
     let handled = false;
@@ -113,6 +143,10 @@ function handleImageLinkInsert(data: DataTransfer, context: EditorUiContext): bo
 function createDropListener(context: EditorUiContext): (event: DragEvent) => boolean {
     const editor = context.editor;
     return (event: DragEvent): boolean => {
+
+        const hadInternalActiveDrag = internalActiveDragTracker.has(editor);
+        internalActiveDragTracker.delete(editor);
+
         // Template handling
         const templateId = event.dataTransfer?.getData('bookstack/template') || '';
         if (templateId) {
@@ -125,10 +159,7 @@ function createDropListener(context: EditorUiContext): (event: DragEvent) => boo
         // HTML contents drop
         const html = event.dataTransfer?.getData('text/html') || '';
         if (html) {
-            editor.update(() => {
-                const newNodes = $htmlToBlockNodes(editor, html);
-                $insertNodesAtEvent(newNodes, event, editor);
-            });
+            insertHtmlToEditor(editor, html, hadInternalActiveDrag, event);
             event.preventDefault();
             event.stopPropagation();
             return true;
@@ -165,17 +196,47 @@ function createPasteListener(context: EditorUiContext): (event: ClipboardEvent)
     };
 }
 
+function createDragStartListener(context: EditorUiContext): (event: DragEvent) => boolean {
+    return (event: DragEvent) => {
+        // Track when drag events are started internally from the editor
+        internalActiveDragTracker.set(context.editor, event);
+
+        // If an internal range selection, serialize the range contents
+        // fully as output HTML, instead of editor HTML
+        context.editor.update(() => {
+            const selection = $getSelection();
+            if ($isRangeSelection(selection)) {
+
+                const singleSelectableNode = $getSingleSelectableNode(selection.getNodes());
+                if (singleSelectableNode) {
+                    const html = $generateHtmlFromNode(context.editor, singleSelectableNode);
+                    event.dataTransfer?.setData('text/html', html);
+                    return;
+                }
+
+                selection.extract();
+                const html = $getHtmlContent(context.editor, selection);
+                event.dataTransfer?.setData('text/html', html);
+            }
+        });
+        return false;
+    };
+}
+
 export function registerDropPasteHandling(context: EditorUiContext): () => void {
     const dropListener = createDropListener(context);
     const pasteListener = createPasteListener(context);
+    const dragstartListener = createDragStartListener(context);
 
     const unregisterDrop = context.editor.registerCommand(DROP_COMMAND, dropListener, COMMAND_PRIORITY_HIGH);
     const unregisterPaste = context.editor.registerCommand(PASTE_COMMAND, pasteListener, COMMAND_PRIORITY_HIGH);
+    const unregisterDragStart = context.editor.registerCommand(DRAGSTART_COMMAND, dragstartListener, COMMAND_PRIORITY_HIGH);
     context.scrollDOM.addEventListener('drop', dropListener);
 
     return () => {
         unregisterDrop();
         unregisterPaste();
+        unregisterDragStart();
         context.scrollDOM.removeEventListener('drop', dropListener);
     };
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/keyboard-handling.ts b/resources/js/wysiwyg/services/keyboard-handling.ts
index aba0b1aa893..14997d98a6e 100644
--- a/resources/js/wysiwyg/services/keyboard-handling.ts
+++ b/resources/js/wysiwyg/services/keyboard-handling.ts
@@ -1,8 +1,8 @@
 import {EditorUiContext} from "../ui/framework/core";
 import {
-    $createParagraphNode,
+    $createLineBreakNode,
+    $createParagraphNode, $createTextNode,
     $getSelection,
-    $isDecoratorNode,
     COMMAND_PRIORITY_LOW, KEY_ARROW_DOWN_COMMAND, KEY_ARROW_UP_COMMAND,
     KEY_BACKSPACE_COMMAND,
     KEY_DELETE_COMMAND,
@@ -10,26 +10,19 @@ import {
     LexicalEditor,
     LexicalNode
 } from "lexical";
-import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
-import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
 import {getLastSelection} from "../utils/selection";
-import {$getNearestNodeBlockParent, $getParentOfType, $selectOrCreateAdjacent} from "../utils/nodes";
+import {
+    $getNearestNodeBlockParent,
+    $getParentOfType,
+    $isSingleSelectableNode,
+    $selectOrCreateAdjacent
+} from "../utils/nodes";
 import {$setInsetForSelection} from "../utils/lists";
 import {$isListItemNode} from "@lexical/list";
 import {$isDetailsNode, DetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
-import {$isDiagramNode} from "../utils/diagrams";
 import {$unwrapDetailsNode} from "../utils/details";
-
-function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
-    if (nodes.length === 1) {
-        const node = nodes[0];
-        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
-            return true;
-        }
-    }
-
-    return false;
-}
+import {$isLinkNode} from "@lexical/link";
+import {$isLinkedImageNode} from "../utils/images";
 
 /**
  * Delete the current node in the selection if the selection contains a single
@@ -37,7 +30,7 @@ function isSingleSelectedNode(nodes: LexicalNode[]): boolean {
  */
 function deleteSingleSelectedNode(editor: LexicalEditor) {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (isSingleSelectedNode(selectionNodes)) {
+    if ($isSingleSelectableNode(selectionNodes)) {
         editor.update(() => {
             selectionNodes[0].remove();
         });
@@ -50,33 +43,53 @@ function deleteSingleSelectedNode(editor: LexicalEditor) {
  */
 function insertAdjacentToSingleSelectedNode(editor: LexicalEditor, event: KeyboardEvent|null): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (isSingleSelectedNode(selectionNodes)) {
-        const node = selectionNodes[0];
-        const nearestBlock = $getNearestNodeBlockParent(node) || node;
-        const insertBefore = event?.shiftKey === true;
-        if (nearestBlock) {
-            requestAnimationFrame(() => {
-                editor.update(() => {
-                    const newParagraph = $createParagraphNode();
-                    if (insertBefore) {
-                        nearestBlock.insertBefore(newParagraph);
-                    } else {
-                        nearestBlock.insertAfter(newParagraph);
-                    }
-                    newParagraph.select();
-                });
-            });
-            event?.preventDefault();
-            return true;
-        }
+    if (!$isSingleSelectableNode(selectionNodes)) {
+        return false;
     }
 
-    return false;
+    const node = selectionNodes[0];
+    const nearestBlock = $getNearestNodeBlockParent(node) || node;
+    const insertBefore = event?.shiftKey === true;
+
+    let action: null|(()=>void) = null;
+
+    if ($isListItemNode(nearestBlock)) {
+        // If we're in a list item, we'd instead want to keep within the item and insert
+        // adjacent to the selected block.
+        action = () => {
+            const textNode = $createTextNode('');
+            const lineBreak = $createLineBreakNode();
+            const nodeParent = node.getParent();
+            let target = node;
+            if ($isLinkNode(nodeParent) && $isLinkedImageNode(node)) {
+                target = nodeParent;
+            }
+            const insertAction = insertBefore ? target.insertBefore : target.insertAfter;
+            insertAction.bind(target)(textNode);
+            insertAction.bind(target)(lineBreak);
+            textNode.selectStart();
+        };
+    } else if (nearestBlock) {
+        action = () => {
+            const newParagraph = $createParagraphNode();
+            const insertAction = insertBefore ? nearestBlock.insertBefore : nearestBlock.insertAfter;
+            insertAction.bind(nearestBlock)(newParagraph);
+            newParagraph.select();
+        };
+    }
+
+    if (!action) {
+        return false;
+    }
+
+    requestAnimationFrame(() => editor.update(action));
+    event?.preventDefault();
+    return true;
 }
 
 function focusAdjacentOrInsertForSingleSelectNode(editor: LexicalEditor, event: KeyboardEvent|null, after: boolean = true): boolean {
     const selectionNodes = getLastSelection(editor)?.getNodes() || [];
-    if (!isSingleSelectedNode(selectionNodes)) {
+    if (!$isSingleSelectableNode(selectionNodes)) {
         return false;
     }
 
diff --git a/resources/js/wysiwyg/services/mentions.ts b/resources/js/wysiwyg/services/mentions.ts
new file mode 100644
index 00000000000..ba6739f329f
--- /dev/null
+++ b/resources/js/wysiwyg/services/mentions.ts
@@ -0,0 +1,82 @@
+import {
+    $getSelection, $isRangeSelection,
+    COMMAND_PRIORITY_NORMAL, KEY_ENTER_COMMAND, RangeSelection, TextNode
+} from "lexical";
+import {KEY_AT_COMMAND} from "lexical/LexicalCommands";
+import {$createMentionNode, $isMentionNode, MentionNode} from "@lexical/link/LexicalMentionNode";
+import {EditorUiContext} from "../ui/framework/core";
+import {MentionDecorator} from "../ui/decorators/MentionDecorator";
+import {$selectSingleNode} from "../utils/selection";
+
+
+function enterUserSelectMode(context: EditorUiContext, selection: RangeSelection) {
+    const textNode = selection.getNodes()[0] as TextNode;
+    const selectionPos = selection.getStartEndPoints();
+    if (!selectionPos) {
+        return;
+    }
+
+    const offset = selectionPos[0].offset;
+
+    // Ignore if the @ sign is not after a space or the start of the line
+    const atStart = offset === 0;
+    const afterSpace = textNode.getTextContent().charAt(offset - 1) === ' ';
+    if (!atStart && !afterSpace) {
+        return;
+    }
+
+    const split = textNode.splitText(offset);
+    const priorTextNode = split[0];
+    const afterTextNode = split[atStart ? 0 : 1];
+
+    const mention = $createMentionNode(0, '', '');
+    priorTextNode.insertAfter(mention);
+    afterTextNode.spliceText(0, 1, '', false);
+    $selectSingleNode(mention);
+
+    requestAnimationFrame(() => {
+        const mentionDecorator = context.manager.getDecoratorByNodeKey(mention.getKey());
+        if (mentionDecorator instanceof MentionDecorator) {
+            mentionDecorator.showSelection()
+        }
+    });
+}
+
+function selectMention(context: EditorUiContext, event: KeyboardEvent): boolean {
+    const selected = $getSelection()?.getNodes() || [];
+    if (selected.length === 1 && $isMentionNode(selected[0])) {
+        const mention = selected[0] as MentionNode;
+        const decorator = context.manager.getDecoratorByNodeKey(mention.getKey()) as MentionDecorator;
+        decorator.showSelection();
+        event.preventDefault();
+        event.stopPropagation();
+        return true;
+    }
+
+    return false;
+}
+
+export function registerMentions(context: EditorUiContext): () => void {
+    const editor = context.editor;
+
+    const unregisterCommand = editor.registerCommand(KEY_AT_COMMAND, function (event: KeyboardEvent): boolean {
+        const selection = $getSelection();
+        if ($isRangeSelection(selection) && selection.isCollapsed()) {
+            window.setTimeout(() => {
+                editor.update(() => {
+                    enterUserSelectMode(context, selection);
+                });
+            }, 1);
+        }
+        return false;
+    }, COMMAND_PRIORITY_NORMAL);
+
+    const unregisterEnter = editor.registerCommand(KEY_ENTER_COMMAND, function (event: KeyboardEvent): boolean {
+        return selectMention(context, event);
+    }, COMMAND_PRIORITY_NORMAL);
+
+    return (): void => {
+        unregisterCommand();
+        unregisterEnter();
+    };
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/services/shortcuts.ts b/resources/js/wysiwyg/services/shortcuts.ts
index ead4c38d432..f666657038b 100644
--- a/resources/js/wysiwyg/services/shortcuts.ts
+++ b/resources/js/wysiwyg/services/shortcuts.ts
@@ -1,4 +1,11 @@
-import {$getSelection, COMMAND_PRIORITY_HIGH, FORMAT_TEXT_COMMAND, KEY_ENTER_COMMAND, LexicalEditor} from "lexical";
+import {
+    $getSelection,
+    COMMAND_PRIORITY_HIGH,
+    FORMAT_TEXT_COMMAND,
+    KEY_ENTER_COMMAND,
+    LexicalEditor,
+    TextFormatType
+} from "lexical";
 import {
     cycleSelectionCalloutFormats,
     formatCodeBlock, insertOrUpdateLink,
@@ -27,8 +34,8 @@ function wrapFormatAction(formatAction: (editor: LexicalEditor) => any): Shortcu
     };
 }
 
-function toggleInlineCode(editor: LexicalEditor): boolean {
-    editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'code');
+function toggleInlineFormat(editor: LexicalEditor, format: TextFormatType): boolean {
+    editor.dispatchCommand(FORMAT_TEXT_COMMAND, format);
     return true;
 }
 
@@ -38,7 +45,43 @@ type ShortcutAction = (editor: LexicalEditor, context: EditorUiContext) => boole
  * List of action functions by their shortcut combo.
  * We use "meta" as an abstraction for ctrl/cmd depending on platform.
  */
-const actionsByKeys: Record<string, ShortcutAction> = {
+const baseActionsByKeys: Record<string, ShortcutAction> = {
+    'meta+8': (e) => toggleInlineFormat(e, 'code'),
+    'meta+shift+e': (e) => toggleInlineFormat(e, 'code'),
+    'meta+b': (e) => toggleInlineFormat(e, 'bold'),
+    'meta+i': (e) => toggleInlineFormat(e, 'italic'),
+    'meta+u': (e) => toggleInlineFormat(e, 'underline'),
+    'meta+o': wrapFormatAction((e) => toggleSelectionAsList(e, 'number')),
+    'meta+p': wrapFormatAction((e) => toggleSelectionAsList(e, 'bullet')),
+    'meta+k': (editor, context) => {
+        editor.getEditorState().read(() => {
+            const selectedLink = $getNodeFromSelection($getSelection(), $isLinkNode) as LinkNode | null;
+            $showLinkForm(selectedLink, context);
+        });
+        return true;
+    },
+    'meta+shift+k': (editor, context) => {
+        editor.getEditorState().read(() => {
+            const selection = $getSelection();
+            const selectionText = selection?.getTextContent() || '';
+            showLinkSelector(entity => {
+                insertOrUpdateLink(editor, {
+                    text: entity.name,
+                    title: entity.link,
+                    target: '',
+                    url: entity.link,
+                });
+            }, selectionText);
+        });
+        return true;
+    },
+};
+
+/**
+ * An extended set of the above, used for fuller-featured editors with heavier block-level formatting.
+ */
+const extendedActionsByKeys: Record<string, ShortcutAction> = {
+    ...baseActionsByKeys,
     'meta+s': () => {
         window.$events.emit('editor-save-draft');
         return true;
@@ -54,59 +97,85 @@ const actionsByKeys: Record<string, ShortcutAction> = {
     'meta+5': wrapFormatAction(toggleSelectionAsParagraph),
     'meta+d': wrapFormatAction(toggleSelectionAsParagraph),
     'meta+6': wrapFormatAction(toggleSelectionAsBlockquote),
-    'meta+q': wrapFormatAction(toggleSelectionAsBlockquote),
     'meta+7': wrapFormatAction(formatCodeBlock),
     'meta+e': wrapFormatAction(formatCodeBlock),
-    'meta+8': toggleInlineCode,
-    'meta+shift+e': toggleInlineCode,
+    'meta+q': wrapFormatAction(toggleSelectionAsBlockquote),
     'meta+9': wrapFormatAction(cycleSelectionCalloutFormats),
-
-    'meta+o': wrapFormatAction((e) => toggleSelectionAsList(e, 'number')),
-    'meta+p': wrapFormatAction((e) => toggleSelectionAsList(e, 'bullet')),
-    'meta+k': (editor, context) => {
-        editor.getEditorState().read(() => {
-            const selectedLink = $getNodeFromSelection($getSelection(), $isLinkNode) as LinkNode | null;
-            $showLinkForm(selectedLink, context);
-        });
-        return true;
-    },
-    'meta+shift+k': (editor, context) => {
-        showLinkSelector(entity => {
-            insertOrUpdateLink(editor, {
-                text: entity.name,
-                title: entity.link,
-                target: '',
-                url: entity.link,
-            });
-        });
-        return true;
-    },
 };
 
-function createKeyDownListener(context: EditorUiContext): (e: KeyboardEvent) => void {
+function createKeyDownListener(context: EditorUiContext, useExtended: boolean): (e: KeyboardEvent) => void {
+    const baseKeySetToUse = useExtended ? extendedActionsByKeys : baseActionsByKeys;
+    const keySetToUse = extendKeySetWithKeyCodes(baseKeySetToUse);
     return (event: KeyboardEvent) => {
-        const combo = keyboardEventToKeyComboString(event);
-        // console.log(`pressed: ${combo}`);
-        if (actionsByKeys[combo]) {
-            const handled = actionsByKeys[combo](context.editor, context);
-            if (handled) {
-                event.stopPropagation();
-                event.preventDefault();
+        const comboStrings = keyboardEventToKeyComboStrings(event);
+        // console.log(comboStrings, event, keySetToUse);
+        for (const combo of comboStrings) {
+            if (keySetToUse[combo]) {
+                const handled = keySetToUse[combo](context.editor, context);
+                if (handled) {
+                    event.stopPropagation();
+                    event.preventDefault();
+                }
+                break;
             }
         }
     };
 }
 
-function keyboardEventToKeyComboString(event: KeyboardEvent): string {
+/**
+ * Takes a shortcut key set and returns a new set with added variations of shortcts where
+ * they can be sensibly represented as their key code instead of just key, which we can use
+ * for matching in scenarios where the physical key may be represented of the letter used
+ * in the shortcut, but produces a different 'key' value.
+ * Useful for Cyrillic scenarios where the keyboard key would show a latin character
+ * as an option, and therefore be expected for use for the relevant latin shortcut, but the main
+ * key output is a Cyrillic character.
+ */
+function extendKeySetWithKeyCodes(keySet: Record<string, ShortcutAction>): Record<string, ShortcutAction> {
+    const newKeys: Record<string, ShortcutAction> = {};
+
+    const setKeys = Object.keys(keySet);
+    for (const keyCombo of setKeys) {
+        const action = keySet[keyCombo];
+        newKeys[keyCombo] = action;
+
+        const comboParts = keyCombo.split('+');
+        const lastComboPart = comboParts.pop() || '';
+        if (lastComboPart.match(/^[a-zA-Z]$/)) {
+            const keyCode = lastComboPart.toUpperCase().charCodeAt(0);
+            comboParts.push(String(keyCode));
+            const newCombo = comboParts.join('+');
+            newKeys[newCombo] = action;
+        }
+    }
+
+    return newKeys;
+}
+
+function keyboardEventToKeyComboStrings(event: KeyboardEvent): string[] {
     const metaKeyPressed = isMac() ? event.metaKey : event.ctrlKey;
 
-    const parts = [
+    const mainParts = [
         metaKeyPressed ? 'meta' : '',
         event.shiftKey ? 'shift' : '',
         event.key,
     ];
 
-    return parts.filter(Boolean).join('+').toLowerCase();
+    const toReturn = [
+        mainParts.filter(Boolean).join('+').toLowerCase(),
+    ];
+
+    // If ending with a standard latin character, provide an alternative
+    // keyCode based option for scenarios of dual-language keyboard use.
+    const keyCode = event.keyCode || 0;
+    if (keyCode >= 65 && keyCode <= 90) {
+        const keyCodeParts = [...mainParts];
+        keyCodeParts.pop();
+        keyCodeParts.push(String(keyCode));
+        toReturn.push(keyCodeParts.filter(Boolean).join('+').toLowerCase());
+    }
+
+    return toReturn;
 }
 
 function isMac(): boolean {
@@ -123,8 +192,8 @@ function overrideDefaultCommands(editor: LexicalEditor) {
     }, COMMAND_PRIORITY_HIGH);
 }
 
-export function registerShortcuts(context: EditorUiContext) {
-    const listener = createKeyDownListener(context);
+export function registerShortcuts(context: EditorUiContext, useExtended: boolean) {
+    const listener = createKeyDownListener(context, useExtended);
     overrideDefaultCommands(context.editor);
 
     return context.editor.registerRootListener((rootElement: null | HTMLElement, prevRootElement: null | HTMLElement) => {
diff --git a/resources/js/wysiwyg/ui/decorators/code-block.ts b/resources/js/wysiwyg/ui/decorators/CodeBlockDecorator.ts
similarity index 84%
rename from resources/js/wysiwyg/ui/decorators/code-block.ts
rename to resources/js/wysiwyg/ui/decorators/CodeBlockDecorator.ts
index daae32e1982..d95185e0b79 100644
--- a/resources/js/wysiwyg/ui/decorators/code-block.ts
+++ b/resources/js/wysiwyg/ui/decorators/CodeBlockDecorator.ts
@@ -14,7 +14,7 @@ export class CodeBlockDecorator extends EditorDecorator {
     // @ts-ignore
     protected editor: any = null;
 
-    setup(context: EditorUiContext, element: HTMLElement) {
+    setup(element: HTMLElement) {
         const codeNode = this.getNode() as CodeBlockNode;
         const preEl = element.querySelector('pre');
         if (!preEl) {
@@ -35,24 +35,24 @@ export class CodeBlockDecorator extends EditorDecorator {
 
         element.addEventListener('click', event => {
             requestAnimationFrame(() => {
-                context.editor.update(() => {
+                this.context.editor.update(() => {
                     $selectSingleNode(this.getNode());
                 });
             });
         });
 
         element.addEventListener('dblclick', event => {
-            context.editor.getEditorState().read(() => {
-                $openCodeEditorForNode(context.editor, (this.getNode() as CodeBlockNode));
+            this.context.editor.getEditorState().read(() => {
+                $openCodeEditorForNode(this.context.editor, (this.getNode() as CodeBlockNode));
             });
         });
 
         const selectionChange = (selection: BaseSelection|null): void => {
             element.classList.toggle('selected', $selectionContainsNode(selection, codeNode));
         };
-        context.manager.onSelectionChange(selectionChange);
+        this.context.manager.onSelectionChange(selectionChange);
         this.onDestroy(() => {
-            context.manager.offSelectionChange(selectionChange);
+            this.context.manager.offSelectionChange(selectionChange);
         });
 
         // @ts-ignore
@@ -89,11 +89,11 @@ export class CodeBlockDecorator extends EditorDecorator {
         }
     }
 
-    render(context: EditorUiContext, element: HTMLElement): void {
+    render(element: HTMLElement): void {
         if (this.completedSetup) {
             this.update();
         } else {
-            this.setup(context, element);
+            this.setup(element);
         }
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/decorators/diagram.ts b/resources/js/wysiwyg/ui/decorators/DiagramDecorator.ts
similarity index 67%
rename from resources/js/wysiwyg/ui/decorators/diagram.ts
rename to resources/js/wysiwyg/ui/decorators/DiagramDecorator.ts
index 52a73ad7223..58a4de1dcff 100644
--- a/resources/js/wysiwyg/ui/decorators/diagram.ts
+++ b/resources/js/wysiwyg/ui/decorators/DiagramDecorator.ts
@@ -1,5 +1,4 @@
 import {EditorDecorator} from "../framework/decorator";
-import {EditorUiContext} from "../framework/core";
 import {BaseSelection, CLICK_COMMAND, COMMAND_PRIORITY_NORMAL} from "lexical";
 import {DiagramNode} from "@lexical/rich-text/LexicalDiagramNode";
 import {$selectionContainsNode, $selectSingleNode} from "../../utils/selection";
@@ -9,33 +8,33 @@ import {$openDrawingEditorForNode} from "../../utils/diagrams";
 export class DiagramDecorator extends EditorDecorator {
     protected completedSetup: boolean = false;
 
-    setup(context: EditorUiContext, element: HTMLElement) {
+    setup(element: HTMLElement) {
         const diagramNode = this.getNode();
         element.classList.add('editor-diagram');
 
-        context.editor.registerCommand(CLICK_COMMAND, (event: MouseEvent): boolean => {
+        this.context.editor.registerCommand(CLICK_COMMAND, (event: MouseEvent): boolean => {
             if (!element.contains(event.target as HTMLElement)) {
                 return false;
             }
 
-            context.editor.update(() => {
+            this.context.editor.update(() => {
                 $selectSingleNode(this.getNode());
             });
             return true;
         }, COMMAND_PRIORITY_NORMAL);
 
         element.addEventListener('dblclick', event => {
-            context.editor.getEditorState().read(() => {
-                $openDrawingEditorForNode(context, (this.getNode() as DiagramNode));
+            this.context.editor.getEditorState().read(() => {
+                $openDrawingEditorForNode(this.context, (this.getNode() as DiagramNode));
             });
         });
 
         const selectionChange = (selection: BaseSelection|null): void => {
             element.classList.toggle('selected', $selectionContainsNode(selection, diagramNode));
         };
-        context.manager.onSelectionChange(selectionChange);
+        this.context.manager.onSelectionChange(selectionChange);
         this.onDestroy(() => {
-            context.manager.offSelectionChange(selectionChange);
+            this.context.manager.offSelectionChange(selectionChange);
         });
 
         this.completedSetup = true;
@@ -45,11 +44,11 @@ export class DiagramDecorator extends EditorDecorator {
         //
     }
 
-    render(context: EditorUiContext, element: HTMLElement): void {
+    render(element: HTMLElement): void {
         if (this.completedSetup) {
             this.update();
         } else {
-            this.setup(context, element);
+            this.setup(element);
         }
     }
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/decorators/MentionDecorator.ts b/resources/js/wysiwyg/ui/decorators/MentionDecorator.ts
new file mode 100644
index 00000000000..d6cafba43cd
--- /dev/null
+++ b/resources/js/wysiwyg/ui/decorators/MentionDecorator.ts
@@ -0,0 +1,197 @@
+import {EditorDecorator} from "../framework/decorator";
+import {EditorUiContext} from "../framework/core";
+import {el, htmlToDom} from "../../utils/dom";
+import {showLoading} from "../../../services/dom";
+import {MentionNode} from "@lexical/link/LexicalMentionNode";
+import {debounce} from "../../../services/util";
+import {$createTextNode} from "lexical";
+import {KeyboardNavigationHandler} from "../../../services/keyboard-navigation";
+
+import searchIcon from "@icons/search.svg";
+
+function userClickHandler(onSelect: (id: number, name: string, slug: string)=>void): (event: PointerEvent) => void {
+    return (event: PointerEvent) => {
+        const userItem = (event.target as HTMLElement).closest('a[data-id]') as HTMLAnchorElement | null;
+        if (!userItem) {
+            return;
+        }
+
+        const id = Number(userItem.dataset.id || '0');
+        const name = userItem.dataset.name || '';
+        const slug = userItem.dataset.slug || '';
+
+        onSelect(id, name, slug);
+        event.preventDefault();
+    };
+}
+
+function handleUserSelectCancel(context: EditorUiContext, selectList: HTMLElement, controller: AbortController, onCancel: () => void): void {
+    selectList.addEventListener('keydown', (event) => {
+        if (event.key === 'Escape') {
+            onCancel();
+        }
+    }, {signal: controller.signal});
+
+    const input = selectList.querySelector('input') as HTMLInputElement;
+    input.addEventListener('keydown', (event) => {
+        if (event.key === 'Backspace' && input.value === '') {
+            onCancel();
+            event.preventDefault();
+            event.stopPropagation();
+        }
+    }, {signal: controller.signal});
+
+    context.editorDOM.addEventListener('click', (event) => {
+        onCancel()
+    }, {signal: controller.signal});
+    context.editorDOM.addEventListener('keydown', (event) => {
+        onCancel();
+    }, {signal: controller.signal});
+}
+
+function handleUserListLoading(selectList: HTMLElement) {
+    const cache = new Map<string, string>();
+
+    const updateUserList = async (searchTerm: string) => {
+        // Empty list
+        for (const child of [...selectList.children]) {
+            child.remove();
+        }
+
+        // Fetch new content
+        let responseHtml = '';
+        if (cache.has(searchTerm)) {
+            responseHtml = cache.get(searchTerm) || '';
+        } else {
+            const loadingWrap = el('div', {class: 'flex-container-row items-center dropdown-search-item'});
+            showLoading(loadingWrap);
+            selectList.appendChild(loadingWrap);
+
+            const resp = await window.$http.get(`/search/users/mention?search=${searchTerm}`);
+            responseHtml = resp.data as string;
+            cache.set(searchTerm, responseHtml);
+            loadingWrap.remove();
+        }
+
+        const doc = htmlToDom(responseHtml);
+        const toInsert = [...doc.body.children];
+        for (const listEl of toInsert) {
+            const adopted = window.document.adoptNode(listEl) as HTMLElement;
+            selectList.appendChild(adopted);
+        }
+    };
+
+    // Initial load
+    updateUserList('');
+
+    const input = selectList.parentElement?.querySelector('input') as HTMLInputElement;
+    const updateUserListDebounced = debounce(updateUserList, 200, false);
+    input.addEventListener('input', () => {
+        const searchTerm = input.value;
+        updateUserListDebounced(searchTerm);
+    });
+}
+
+function buildAndShowUserSelectorAtElement(context: EditorUiContext, mentionDOM: HTMLElement): HTMLElement {
+    const searchInput = el('input', {type: 'text'});
+    const list = el('div', {class: 'dropdown-search-list'});
+    const iconWrap = el('div');
+    iconWrap.innerHTML = searchIcon;
+    const icon = iconWrap.children[0] as HTMLElement;
+    icon.classList.add('svg-icon');
+    const userSelect = el('div', {class: 'dropdown-search-dropdown compact card'}, [
+        el('div', {class: 'dropdown-search-search'}, [icon, searchInput]),
+        list,
+    ]);
+
+    context.containerDOM.appendChild(userSelect);
+
+    userSelect.style.display = 'block';
+    userSelect.style.top = '0';
+    userSelect.style.left = '0';
+    const mentionPos = mentionDOM.getBoundingClientRect();
+    const userSelectPos = userSelect.getBoundingClientRect();
+    userSelect.style.top = `${mentionPos.bottom - userSelectPos.top + 3}px`;
+    userSelect.style.left = `${mentionPos.left - userSelectPos.left}px`;
+
+    searchInput.focus();
+
+    return userSelect;
+}
+
+export class MentionDecorator extends EditorDecorator {
+    protected abortController: AbortController | null = null;
+    protected dropdownContainer: HTMLElement | null = null;
+    protected mentionElement: HTMLElement | null = null;
+
+    setup(element: HTMLElement) {
+        this.mentionElement = element;
+
+        element.addEventListener('click', (event: PointerEvent) => {
+            this.showSelection();
+            event.preventDefault();
+            event.stopPropagation();
+        });
+    }
+
+    showSelection() {
+        if (!this.mentionElement || this.dropdownContainer) {
+            return;
+        }
+
+        this.hideSelection();
+        this.abortController = new AbortController();
+
+        this.dropdownContainer = buildAndShowUserSelectorAtElement(this.context, this.mentionElement);
+        handleUserListLoading(this.dropdownContainer.querySelector('.dropdown-search-list') as HTMLElement);
+
+        this.dropdownContainer.addEventListener('click', userClickHandler((id, name, slug) => {
+            this.context.editor.update(() => {
+                const mentionNode = this.getNode() as MentionNode;
+                this.hideSelection();
+                mentionNode.setUserDetails(id, name, slug);
+                mentionNode.selectNext();
+            });
+        }), {signal: this.abortController.signal});
+
+        handleUserSelectCancel(this.context, this.dropdownContainer, this.abortController, () => {
+            if ((this.getNode() as MentionNode).hasUserSet()) {
+                this.hideSelection()
+            } else {
+                this.revertMention();
+            }
+        });
+
+        new KeyboardNavigationHandler(this.dropdownContainer);
+    }
+
+    hideSelection() {
+        this.abortController?.abort();
+        this.dropdownContainer?.remove();
+        this.abortController = null;
+        this.dropdownContainer = null;
+        this.context.manager.focus();
+    }
+
+    revertMention() {
+        this.hideSelection();
+        this.context.editor.update(() => {
+            const text = $createTextNode('@');
+            const before = this.getNode().getPreviousSibling();
+            this.getNode().replace(text);
+            requestAnimationFrame(() => {
+                this.context.editor.update(() => {
+                    if (text.isAttached()) {
+                        text.selectEnd();
+                    } else if (before?.isAttached()) {
+                        before?.selectEnd();
+                    }
+                });
+            });
+        });
+    }
+
+    render(element: HTMLElement): void {
+        this.setup(element);
+    }
+}
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
index 98edf44b3b9..52f2af5a2b8 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/alignments.ts
@@ -8,7 +8,7 @@ import alignJustifyIcon from "@icons/editor/align-justify.svg";
 import ltrIcon from "@icons/editor/direction-ltr.svg";
 import rtlIcon from "@icons/editor/direction-rtl.svg";
 import {
-    $getBlockElementNodesInSelection,
+    $getBlockElementNodesInSelection, $getDecoratorNodesInSelection,
     $selectionContainsAlignment, $selectionContainsDirection, $selectSingleNode, getLastSelection
 } from "../../../utils/selection";
 import {CommonBlockAlignment} from "lexical/nodes/common";
@@ -47,6 +47,11 @@ function setDirectionForSelection(context: EditorUiContext, direction: 'ltr' | '
         node.setDirection(direction);
     }
 
+    const decoratorNodes = $getDecoratorNodesInSelection(selection);
+    for (const node of decoratorNodes) {
+        node.setDirection(direction);
+    }
+
     context.manager.triggerFutureStateRefresh();
 }
 
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
index 00dc9500ec8..bd6e41da918 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/objects.ts
@@ -221,7 +221,7 @@ export const detailsEditLabel: EditorButtonDefinition = {
             if ($isDetailsNode(details)) {
                 $showDetailsForm(details, context);
             }
-        })
+        });
     },
     isActive(selection: BaseSelection | null): boolean {
         return false;
diff --git a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
index 2e4883d88e6..0e01b301c48 100644
--- a/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
+++ b/resources/js/wysiwyg/ui/defaults/buttons/tables.ts
@@ -7,6 +7,7 @@ import insertColumnAfterIcon from "@icons/editor/table-insert-column-after.svg";
 import insertColumnBeforeIcon from "@icons/editor/table-insert-column-before.svg";
 import insertRowAboveIcon from "@icons/editor/table-insert-row-above.svg";
 import insertRowBelowIcon from "@icons/editor/table-insert-row-below.svg";
+import tableHeaderIcon from "@icons/editor/table-header.svg";
 import {EditorUiContext} from "../../framework/core";
 import {$getSelection, BaseSelection} from "lexical";
 import {
@@ -14,7 +15,7 @@ import {
     $deleteTableRow__EXPERIMENTAL,
     $insertTableColumn__EXPERIMENTAL,
     $insertTableRow__EXPERIMENTAL, $isTableCellNode,
-    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellNode,
+    $isTableNode, $isTableRowNode, $isTableSelection, $unmergeCell, TableCellHeaderStates, TableCellNode,
 } from "@lexical/table";
 import {$getNodeFromSelection, $selectionContainsNodeType} from "../../../utils/selection";
 import {$getParentOfType} from "../../../utils/nodes";
@@ -23,7 +24,7 @@ import {
     $clearTableFormatting,
     $clearTableSizes, $getTableFromSelection,
     $getTableRowsFromSelection,
-    $mergeTableCellsInSelection
+    $mergeTableCellsInSelection, $toggleRowCellHeaderState
 } from "../../../utils/tables";
 import {
     $copySelectedColumnsToClipboard,
@@ -239,6 +240,28 @@ export const pasteRowAfter: EditorButtonDefinition = {
     isDisabled: (selection) => cellNotSelected(selection) || isRowClipboardEmpty(),
 };
 
+export const toggleRowHeaders: EditorButtonDefinition = {
+    label: 'Row header',
+    format: 'small',
+    icon: tableHeaderIcon,
+    action(context: EditorUiContext, button) {
+        context.editor.update(() => {
+            const row = $getNodeFromSelection($getSelection(), $isTableCellNode)?.getParent();
+            if (!$isTableRowNode(row)) {
+                return;
+            }
+
+            const isNowHeader = $toggleRowCellHeaderState(row);
+            button.setActiveState(isNowHeader);
+        });
+    },
+    isActive: (selection) => {
+        return $selectionContainsNodeType(selection, (node) => {
+            return $isTableCellNode(node) && node.getHeaderStyles() !== TableCellHeaderStates.NO_STATUS;
+        });
+    }
+};
+
 export const cutColumn: EditorButtonDefinition = {
     label: 'Cut column',
     format: 'long',
diff --git a/resources/js/wysiwyg/ui/defaults/forms/controls.ts b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
index 8e7219d6749..c92a16834ed 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/controls.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/controls.ts
@@ -1,12 +1,16 @@
 import {EditorFormDefinition} from "../../framework/forms";
 import {EditorUiContext, EditorUiElement} from "../../framework/core";
-import {setEditorContentFromHtml} from "../../../utils/actions";
+import {focusEditor, setEditorContentFromHtml} from "../../../utils/actions";
 import {ExternalContent} from "../../framework/blocks/external-content";
 
 export const source: EditorFormDefinition = {
     submitText: 'Save',
     async action(formData, context: EditorUiContext) {
         setEditorContentFromHtml(context.editor, formData.get('source')?.toString() || '');
+        context.editor.commitUpdates();
+        window.requestAnimationFrame(() => {
+            focusEditor(context.editor);
+        });
         return true;
     },
     fields: [
diff --git a/resources/js/wysiwyg/ui/defaults/forms/objects.ts b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
index cdf464cb4f7..b278c094162 100644
--- a/resources/js/wysiwyg/ui/defaults/forms/objects.ts
+++ b/resources/js/wysiwyg/ui/defaults/forms/objects.ts
@@ -48,6 +48,7 @@ export const image: EditorFormDefinition = {
 
                 selectedImage.setWidth(Number(formData.get('width')?.toString() || '0'));
                 selectedImage.setHeight(Number(formData.get('height')?.toString() || '0'));
+                context.manager.triggerLayoutUpdate();
             }
         });
         return true;
@@ -152,10 +153,11 @@ export const link: EditorFormDefinition = {
                             showLinkSelector(entity => {
                                 const modal =  context.manager.getActiveModal('link');
                                 if (modal) {
+                                    const currentValues = modal.getForm().getValues();
                                     modal.getForm().setValues({
                                         url: entity.link,
-                                        text: entity.name,
-                                        title: entity.name,
+                                        text: currentValues.text || entity.name,
+                                        title: currentValues.title || entity.name,
                                     });
                                 }
                             });
diff --git a/resources/js/wysiwyg/ui/defaults/toolbars.ts b/resources/js/wysiwyg/ui/defaults/toolbars.ts
index 33468e0a23a..99d3b96d471 100644
--- a/resources/js/wysiwyg/ui/defaults/toolbars.ts
+++ b/resources/js/wysiwyg/ui/defaults/toolbars.ts
@@ -28,7 +28,7 @@ import {
     pasteRowBefore, resizeTableToContents,
     rowProperties,
     splitCell,
-    table, tableProperties
+    table, tableProperties, toggleRowHeaders
 } from "./buttons/tables";
 import {about, fullscreen, redo, source, undo} from "./buttons/controls";
 import {
@@ -88,7 +88,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
     return new EditorSimpleClassContainer('editor-toolbar-main', [
 
         // History state
-        new EditorOverflowContainer(2, [
+        new EditorOverflowContainer('history', 2, [
             new EditorButton(undo),
             new EditorButton(redo),
         ]),
@@ -110,7 +110,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         ]),
 
         // Inline formats
-        new EditorOverflowContainer(6, [
+        new EditorOverflowContainer('inline_formats', 6, [
             new EditorButton(bold),
             new EditorButton(italic),
             new EditorButton(underline),
@@ -128,7 +128,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         ]),
 
         // Alignment
-        new EditorOverflowContainer(6, [
+        new EditorOverflowContainer('alignment', 6, [
             new EditorButton(alignLeft),
             new EditorButton(alignCenter),
             new EditorButton(alignRight),
@@ -138,7 +138,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         ].filter(x => x !== null)),
 
         // Lists
-        new EditorOverflowContainer(3, [
+        new EditorOverflowContainer('lists', 3, [
             new EditorButton(bulletList),
             new EditorButton(numberList),
             new EditorButton(taskList),
@@ -147,7 +147,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         ]),
 
         // Insert types
-        new EditorOverflowContainer(4, [
+        new EditorOverflowContainer('inserts', 4, [
             new EditorButton(link),
 
             new EditorDropdownButton({button: table, direction: 'vertical', showAside: false}, [
@@ -200,7 +200,7 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
         ]),
 
         // Meta elements
-        new EditorOverflowContainer(3, [
+        new EditorOverflowContainer('meta', 3, [
             new EditorButton(source),
             new EditorButton(about),
             new EditorButton(fullscreen),
@@ -223,11 +223,14 @@ export function getMainEditorFullToolbar(context: EditorUiContext): EditorContai
 
 export function getBasicEditorToolbar(context: EditorUiContext): EditorContainerUiElement {
     return new EditorSimpleClassContainer('editor-toolbar-main', [
-        new EditorButton(bold),
-        new EditorButton(italic),
-        new EditorButton(link),
-        new EditorButton(bulletList),
-        new EditorButton(numberList),
+        new EditorOverflowContainer('formats', 7, [
+            new EditorButton(bold),
+            new EditorButton(italic),
+            new EditorButton(link),
+            new EditorButton(code),
+            new EditorButton(bulletList),
+            new EditorButton(numberList),
+        ])
     ]);
 }
 
@@ -241,7 +244,7 @@ export const contextToolbars: Record<string, EditorContextToolbarDefinition> = {
         content: () => [new EditorButton(media)],
     },
     link: {
-        selector: 'a',
+        selector: 'a:not([data-mention-user-id])',
         content() {
             return [
                 new EditorButton(link),
@@ -261,16 +264,16 @@ export const contextToolbars: Record<string, EditorContextToolbarDefinition> = {
         selector: 'td,th',
         content() {
             return [
-                new EditorOverflowContainer(2, [
+                new EditorOverflowContainer('table', 2, [
                     new EditorButton(tableProperties),
                     new EditorButton(deleteTable),
                 ]),
-                new EditorOverflowContainer(3, [
+                new EditorOverflowContainer('table_row',3, [
                     new EditorButton(insertRowAbove),
                     new EditorButton(insertRowBelow),
                     new EditorButton(deleteRow),
                 ]),
-                new EditorOverflowContainer(3, [
+                new EditorOverflowContainer('table_column', 3, [
                     new EditorButton(insertColumnBefore),
                     new EditorButton(insertColumnAfter),
                     new EditorButton(deleteColumn),
@@ -281,6 +284,19 @@ export const contextToolbars: Record<string, EditorContextToolbarDefinition> = {
             return originalTarget.closest('table') as HTMLTableElement;
         }
     },
+    table_header: {
+        selector: 'table tr:first-of-type td, table tr:first-of-type th',
+        content() {
+            return [
+                new EditorOverflowContainer('table_headers', 1, [
+                    new EditorButton(toggleRowHeaders),
+                ]),
+            ];
+        },
+        displayTargetLocator(originalTarget: HTMLElement): HTMLElement {
+            return originalTarget.closest('table') as HTMLTableElement;
+        }
+    },
     details: {
         selector: 'details',
         content() {
diff --git a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
index 1c96645058e..3b582eee671 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/overflow-container.ts
@@ -9,9 +9,11 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
     protected size: number;
     protected overflowButton: EditorDropdownButton;
     protected content: EditorUiElement[];
+    protected label: string;
 
-    constructor(size: number, children: EditorUiElement[]) {
+    constructor(label: string, size: number, children: EditorUiElement[]) {
         super(children);
+        this.label = label;
         this.size = size;
         this.content = children;
         this.overflowButton = new EditorDropdownButton({
@@ -24,6 +26,11 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
         this.addChildren(this.overflowButton);
     }
 
+    addChild(child: EditorUiElement, targetIndex: number = -1): void {
+        this.content.splice(targetIndex, 0, child);
+        this.addChildren(child);
+    }
+
     protected buildDOM(): HTMLElement {
         const slicePosition = this.content.length > this.size ? this.size - 1 : this.size;
         const visibleChildren = this.content.slice(0, slicePosition);
@@ -41,5 +48,8 @@ export class EditorOverflowContainer extends EditorContainerUiElement {
         }, visibleElements);
     }
 
+    getLabel(): string {
+        return this.label;
+    }
 
 }
\ No newline at end of file
diff --git a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
index 6f026ca1895..03e55ce64e8 100644
--- a/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
+++ b/resources/js/wysiwyg/ui/framework/blocks/table-creator.ts
@@ -27,7 +27,7 @@ export class EditorTableCreator extends EditorUiElement {
             }, rowCells));
         }
 
-        const display = el('div', {class: 'editor-table-creator-display'}, ['0 x 0']);
+        const display = el('div', {class: 'editor-table-creator-display', dir: 'ltr'}, ['0 x 0']);
         const grid = el('div', {class: 'editor-table-creator-grid'}, rows);
         grid.addEventListener('mousemove', event => {
             const cell = (event.target as HTMLElement).closest('.editor-table-creator-cell') as HTMLElement|null;
diff --git a/resources/js/wysiwyg/ui/framework/core.ts b/resources/js/wysiwyg/ui/framework/core.ts
index 9c524dff057..68a80d2e100 100644
--- a/resources/js/wysiwyg/ui/framework/core.ts
+++ b/resources/js/wysiwyg/ui/framework/core.ts
@@ -30,7 +30,7 @@ export function isUiBuilderDefinition(object: any): object is EditorUiBuilderDef
 export abstract class EditorUiElement {
     protected dom: HTMLElement|null = null;
     private context: EditorUiContext|null = null;
-    private abortController: AbortController = new AbortController();
+    protected abortController: AbortController = new AbortController();
 
     protected abstract buildDOM(): HTMLElement;
 
diff --git a/resources/js/wysiwyg/ui/framework/decorator.ts b/resources/js/wysiwyg/ui/framework/decorator.ts
index 6ea0b8b3934..2f46a19ef82 100644
--- a/resources/js/wysiwyg/ui/framework/decorator.ts
+++ b/resources/js/wysiwyg/ui/framework/decorator.ts
@@ -42,7 +42,7 @@ export abstract class EditorDecorator {
      * If an element is returned, this will be appended to the element
      * that is being decorated.
      */
-    abstract render(context: EditorUiContext, decorated: HTMLElement): HTMLElement|void;
+    abstract render(decorated: HTMLElement): HTMLElement|void;
 
     /**
      * Destroy this decorator. Used for tear-down operations upon destruction
diff --git a/resources/js/wysiwyg/ui/framework/forms.ts b/resources/js/wysiwyg/ui/framework/forms.ts
index b12d9f692fc..29f1cada1be 100644
--- a/resources/js/wysiwyg/ui/framework/forms.ts
+++ b/resources/js/wysiwyg/ui/framework/forms.ts
@@ -98,6 +98,23 @@ export class EditorForm extends EditorContainerUiElement {
         this.definition = definition;
     }
 
+    focusOnFirst() {
+        const focusable = this.getDOMElement().querySelector('input,select,textarea');
+        if (focusable) {
+            (focusable as HTMLElement).focus();
+        }
+    }
+
+    getValues(): Record<string, string> {
+        const values: Record<string, string> = {};
+        const formEl = this.getDOMElement() as HTMLFormElement;
+        const formData = new FormData(formEl);
+        for (const [name, value] of formData.entries()) {
+            values[name] = value as string;
+        }
+        return values;
+    }
+
     setValues(values: Record<string, string>) {
         for (const name of Object.keys(values)) {
             const field = this.getFieldByName(name);
diff --git a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
index 890d5b325fe..f86482fdc2d 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/dropdowns.ts
@@ -1,3 +1,5 @@
+import {getViewportRect, RTLRect} from "../../../utils/rtl";
+
 interface HandleDropdownParams {
     toggle: HTMLElement;
     menu: HTMLElement;
@@ -7,30 +9,31 @@ interface HandleDropdownParams {
     showAside?: boolean;
 }
 
-function positionMenu(menu: HTMLElement, toggle: HTMLElement, showAside: boolean) {
-    const toggleRect = toggle.getBoundingClientRect();
-    const menuBounds = menu.getBoundingClientRect();
+function positionMenu(menu: HTMLElement, toggle: HTMLElement, showAside: boolean, isRTL: boolean) {
+    const toggleRect = new RTLRect(toggle, isRTL);
+    const menuBounds = new RTLRect(menu, isRTL);
+    const viewport = getViewportRect();
 
     menu.style.position = 'fixed';
 
     if (showAside) {
-        let targetLeft = toggleRect.right;
-        const isRightOOB = toggleRect.right + menuBounds.width > window.innerWidth;
-        if (isRightOOB) {
-            targetLeft = Math.max(toggleRect.left - menuBounds.width, 0);
+        let targetLeft = toggleRect.inlineEnd;
+        const isEndOOB = toggleRect.inlineEnd + menuBounds.width > viewport.width;
+        if (isEndOOB) {
+            targetLeft = Math.max(toggleRect.inlineStart - menuBounds.width, 0);
         }
 
-        menu.style.top = toggleRect.top + 'px';
-        menu.style.left = targetLeft + 'px';
+        menu.style.top = toggleRect.blockStart + 'px';
+        menu.style.insetInlineStart = targetLeft + 'px';
     } else {
-        const isRightOOB = toggleRect.left + menuBounds.width > window.innerWidth;
-        let targetLeft = toggleRect.left;
-        if (isRightOOB) {
-            targetLeft = Math.max(toggleRect.right - menuBounds.width, 0);
+        const isEndOOB = toggleRect.inlineStart + menuBounds.width > viewport.width;
+        let targetLeft = toggleRect.inlineStart;
+        if (isEndOOB) {
+            targetLeft = Math.max(toggleRect.inlineEnd - menuBounds.width, 0);
         }
 
-        menu.style.top = toggleRect.bottom + 'px';
-        menu.style.left = targetLeft + 'px';
+        menu.style.top = toggleRect.blockEnd + 'px';
+        menu.style.insetInlineStart = targetLeft + 'px';
     }
 }
 
@@ -38,6 +41,7 @@ export class DropDownManager {
 
     protected dropdownOptions: WeakMap<HTMLElement, HandleDropdownParams> = new WeakMap();
     protected openDropdowns: Set<HTMLElement> = new Set();
+    protected isRTL: boolean = false;
 
     constructor() {
         this.onMenuMouseOver = this.onMenuMouseOver.bind(this);
@@ -46,6 +50,10 @@ export class DropDownManager {
         window.addEventListener('click', this.onWindowClick);
     }
 
+    setIsRTL(isRTL: boolean): void {
+        this.isRTL = isRTL;
+    }
+
     teardown(): void {
         window.removeEventListener('click', this.onWindowClick);
     }
@@ -80,7 +88,7 @@ export class DropDownManager {
     protected closeDropdown(menu: HTMLElement): void {
         menu.hidden = true;
         menu.style.removeProperty('position');
-        menu.style.removeProperty('left');
+        menu.style.removeProperty('inset-inline-start');
         menu.style.removeProperty('top');
 
         this.openDropdowns.delete(menu);
@@ -94,8 +102,8 @@ export class DropDownManager {
 
     protected openDropdown(menu: HTMLElement): void {
         const {toggle, showAside, onOpen} = this.getOptions(menu);
-        menu.hidden = false
-        positionMenu(menu, toggle, Boolean(showAside));
+        menu.hidden = false;
+        positionMenu(menu, toggle, Boolean(showAside), this.isRTL);
 
         this.openDropdowns.add(menu);
         menu.addEventListener('mouseover', this.onMenuMouseOver);
diff --git a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
index 8b0a1d2d7d0..addd6dedfd5 100644
--- a/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
+++ b/resources/js/wysiwyg/ui/framework/helpers/node-resizer.ts
@@ -25,9 +25,11 @@ class NodeResizer {
         this.scrollContainer = context.scrollDOM;
 
         this.onSelectionChange = this.onSelectionChange.bind(this);
+        this.onLayoutUpdate = this.onLayoutUpdate.bind(this);
         this.onTargetDOMLoad = this.onTargetDOMLoad.bind(this);
 
         context.manager.onSelectionChange(this.onSelectionChange);
+        context.manager.onLayoutUpdate(this.onLayoutUpdate);
     }
 
     onSelectionChange(selection: BaseSelection|null) {
@@ -46,6 +48,10 @@ class NodeResizer {
         }
     }
 
+    onLayoutUpdate() {
+        this.updateResizerPosition();
+    }
+
     protected getTargetDOM(targetNode: LexicalNode|null): HTMLElement|null {
         if (targetNode == null) {
             return null;
@@ -64,6 +70,7 @@ class NodeResizer {
 
     teardown() {
         this.context.manager.offSelectionChange(this.onSelectionChange);
+        this.context.manager.offLayoutUpdate(this.onLayoutUpdate);
         this.hide();
     }
 
diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.ts
index 3f46455da63..a6b8fd0af89 100644
--- a/resources/js/wysiwyg/ui/framework/manager.ts
+++ b/resources/js/wysiwyg/ui/framework/manager.ts
@@ -23,13 +23,15 @@ export class EditorUIManager {
     protected contextToolbarDefinitionsByKey: Record<string, EditorContextToolbarDefinition> = {};
     protected activeContextToolbars: EditorContextToolbar[] = [];
     protected selectionChangeHandlers: Set<SelectionChangeHandler> = new Set();
+    protected layoutUpdateHandlers: Set<() => void> = new Set();
     protected domEventAbortController = new AbortController();
     protected teardownCallbacks: (()=>void)[] = [];
 
     setContext(context: EditorUiContext) {
         this.context = context;
         this.setupEventListeners();
-        this.setupEditor(context.editor);
+        this.setupEditor(context.editor, context);
+        this.dropdowns.setIsRTL(this.context.manager.getDefaultDirection() === 'rtl');
     }
 
     getContext(): EditorUiContext {
@@ -90,7 +92,7 @@ export class EditorUIManager {
         }
 
         // @ts-ignore
-        const decorator = new decoratorClass(nodeKey);
+        const decorator = new decoratorClass(this.getContext());
         this.decoratorInstancesByNodeKey[nodeKey] = decorator;
         return decorator;
     }
@@ -109,6 +111,10 @@ export class EditorUIManager {
         this.getContext().containerDOM.prepend(toolbar.getDOMElement());
     }
 
+    getToolbar(): EditorContainerUiElement|null {
+        return this.toolbar;
+    }
+
     registerContextToolbar(key: string, definition: EditorContextToolbarDefinition) {
         this.contextToolbarDefinitionsByKey[key] = definition;
     }
@@ -160,10 +166,24 @@ export class EditorUIManager {
         this.selectionChangeHandlers.delete(handler);
     }
 
+    onLayoutUpdate(handler: () => void): void {
+        this.layoutUpdateHandlers.add(handler);
+    }
+
+    offLayoutUpdate(handler: () => void): void {
+        this.layoutUpdateHandlers.delete(handler);
+    }
+
     triggerLayoutUpdate(): void {
         window.requestAnimationFrame(() => {
+            const toolbarBounds: (DOMRect|null)[] = [];
             for (const toolbar of this.activeContextToolbars) {
-                toolbar.updatePosition();
+                const bounds = toolbar.updatePosition(toolbarBounds);
+                toolbarBounds.push(bounds);
+            }
+
+            for (const handler of this.layoutUpdateHandlers) {
+                handler();
             }
         });
     }
@@ -202,6 +222,14 @@ export class EditorUIManager {
         }
     }
 
+    /**
+     * Set the UI focus to the editor.
+     */
+    focus(): void {
+        this.getContext().editorDOM.focus();
+        this.getContext().editor.focus();
+    }
+
     protected updateContextToolbars(update: EditorUiStateUpdate): void {
         for (let i = this.activeContextToolbars.length - 1; i >= 0; i--) {
             const toolbar = this.activeContextToolbars[i];
@@ -234,17 +262,22 @@ export class EditorUIManager {
             }
         }
 
+        const toolbarBounds: (DOMRect|null)[] = [];
         for (const [target, contents] of contentByTarget) {
             const toolbar = new EditorContextToolbar(target, contents);
             toolbar.setContext(this.getContext());
             this.activeContextToolbars.push(toolbar);
 
             this.getContext().containerDOM.append(toolbar.getDOMElement());
-            toolbar.updatePosition();
+            const bounds = toolbar.updatePosition(toolbarBounds);
+            toolbarBounds.push(bounds);
         }
     }
 
-    protected setupEditor(editor: LexicalEditor) {
+    protected setupEditor(editor: LexicalEditor, context: EditorUiContext) {
+        // Pass the context to the editor
+        editor.setUiContext(context);
+
         // Register our DOM decorate listener with the editor
         const domDecorateListener: DecoratorListener<EditorDecoratorAdapter> = (decorators: Record<NodeKey, EditorDecoratorAdapter>) => {
             editor.getEditorState().read(() => {
@@ -258,7 +291,7 @@ export class EditorUIManager {
                     const adapter = decorators[key];
                     const decorator = this.getDecorator(adapter.type, key);
                     decorator.setNode(adapter.getNode());
-                    const decoratorEl = decorator.render(this.getContext(), decoratedEl);
+                    const decoratorEl = decorator.render(decoratedEl);
                     if (decoratorEl) {
                         decoratedEl.append(decoratorEl);
                     }
diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index 4dbe9d962c5..127463cccfd 100644
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -14,6 +14,7 @@ export interface EditorFormModalDefinition extends EditorModalDefinition {
 export class EditorFormModal extends EditorContainerUiElement {
     protected definition: EditorFormModalDefinition;
     protected key: string;
+    protected originalFocus: Element|null = null;
 
     constructor(definition: EditorFormModalDefinition, key: string) {
         super([new EditorForm(definition.form)]);
@@ -22,6 +23,7 @@ export class EditorFormModal extends EditorContainerUiElement {
     }
 
     show(defaultValues: Record<string, string>) {
+        this.originalFocus = document.activeElement as Element;
         const dom = this.getDOMElement();
         document.body.append(dom);
 
@@ -31,11 +33,18 @@ export class EditorFormModal extends EditorContainerUiElement {
         form.setOnSuccessfulSubmit(this.hide.bind(this));
 
         this.getContext().manager.setModalActive(this.key, this);
+        form.focusOnFirst();
     }
 
     hide() {
         this.getContext().manager.setModalInactive(this.key);
         this.teardown();
+
+        if (this.originalFocus === this.getContext().editorDOM) {
+            this.getContext().editor.focus();
+        } else if (this.originalFocus instanceof HTMLElement && this.originalFocus.isConnected) {
+            this.originalFocus.focus();
+        }
     }
 
     getForm(): EditorForm {
@@ -63,8 +72,27 @@ export class EditorFormModal extends EditorContainerUiElement {
 
         const wrapper = el('div', {class: 'editor-modal-wrapper'}, [modal]);
 
+        // Handle clicks but only when not started from within the modal
+        let mouseDownInModal = false;
+        modal.addEventListener('mousedown', () => {
+            mouseDownInModal = true;
+        });
+        wrapper.addEventListener('mouseup', () => {
+            window.setTimeout(() => {
+                mouseDownInModal = false;
+            }, 10);
+        });
         wrapper.addEventListener('click', event => {
-            if (event.target && !modal.contains(event.target as HTMLElement)) {
+            // We check our custom mouse down tracker but also have to check the event target since
+            // sometimes mousedown events are not tracked (for example, clicking outside an open select list).
+            if (!mouseDownInModal && !modal.contains(event.target as HTMLElement)) {
+                this.hide();
+            }
+        });
+
+        // Handle escape key press
+        wrapper.addEventListener('keydown', event => {
+            if (event.key === 'Escape') {
                 this.hide();
             }
         });
diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.ts
index cf5ec4ad151..ec8e9772b04 100644
--- a/resources/js/wysiwyg/ui/framework/toolbars.ts
+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts
@@ -18,13 +18,30 @@ export class EditorContextToolbar extends EditorContainerUiElement {
     }
 
     protected buildDOM(): HTMLElement {
-        return el('div', {
+        const toolbar = el('div', {
             class: 'editor-context-toolbar',
         }, this.getChildren().map(child => child.getDOMElement()));
+
+        // Focus back on the editor on escape press
+        toolbar.addEventListener('keydown', (event: KeyboardEvent) => {
+            if (event.key === 'Escape') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.getContext().editor.focus();
+            }
+        }, {signal: this.abortController.signal});
+
+        return toolbar;
     }
 
-    updatePosition() {
-        const editorBounds = this.getContext().scrollDOM.getBoundingClientRect();
+    /**
+     * Update the position of the toolbar based on the target element.
+     * Takes the bounds of other toolbars processed so far so that they can be considered
+     * when positioning the toolbar to help prevent overlaps.
+     */
+    updatePosition(otherBounds: (DOMRect|null)[] = []): DOMRect|null {
+        const context = this.getContext();
+        const editorBounds = context.scrollDOM.getBoundingClientRect();
         const targetBounds = this.target.getBoundingClientRect();
         const dom = this.getDOMElement();
         const domBounds = dom.getBoundingClientRect();
@@ -36,23 +53,43 @@ export class EditorContextToolbar extends EditorContainerUiElement {
 
         if (!this.target.isConnected) {
             // If our target is no longer in the DOM, tell the manager an update is needed.
-            this.getContext().manager.triggerFutureStateRefresh();
-            return;
+            context.manager.triggerFutureStateRefresh();
+            return null;
         } else if (!showing) {
-            return;
+            return null;
         }
 
-        const showAbove: boolean = targetBounds.bottom + 6 + domBounds.height > editorBounds.bottom;
-        dom.classList.toggle('is-above', showAbove);
-
         const targetMid = targetBounds.left + (targetBounds.width / 2);
-        const targetLeft = targetMid - (domBounds.width / 2);
+        const intendedBounds: DOMRectInit = {
+            x: targetMid - (domBounds.width / 2),
+            y: targetBounds.bottom + 6,
+            width: domBounds.width,
+            height: domBounds.height,
+        };
+
+        let showAbove: boolean = (
+            targetBounds.bottom + 6 + domBounds.height > editorBounds.bottom
+            || this.willOverlapWithOthersIfBelow(intendedBounds, otherBounds)
+        );
+        dom.classList.toggle('is-above', showAbove);
         if (showAbove) {
-            dom.style.top = (targetBounds.top - 6 - domBounds.height) + 'px';
-        } else {
-            dom.style.top = (targetBounds.bottom + 6) + 'px';
+            intendedBounds.y = targetBounds.top - 6 - domBounds.height;
+        }
+
+        dom.style.top = intendedBounds.y + 'px';
+        dom.style.left = intendedBounds.x + 'px';
+
+        // Set z-index based on depth, so that the most specific toolbar
+        // is bought forward.
+        let depth = 1;
+        let parent = this.target.parentElement;
+        while (parent && parent !== context.editorDOM) {
+            parent = parent.parentElement;
+            depth++;
         }
-        dom.style.left = targetLeft + 'px';
+        dom.style.zIndex = `${depth}`;
+
+        return dom.getBoundingClientRect();
     }
 
     insert(children: EditorUiElement[]) {
@@ -60,4 +97,27 @@ export class EditorContextToolbar extends EditorContainerUiElement {
         const dom = this.getDOMElement();
         dom.append(...children.map(child => child.getDOMElement()));
     }
-}
\ No newline at end of file
+
+    protected willOverlapWithOthersIfBelow(intendedBounds: DOMRectInit, otherBounds: (DOMRect|null)[]): boolean {
+        for (const bounds of otherBounds) {
+            if (bounds === null) continue;
+
+            const iLeft = intendedBounds.x ?? 0;
+            const iTop = intendedBounds.y ?? 0;
+            const iRight = iLeft + (intendedBounds.width ?? 0);
+            const iBottom = iTop + (intendedBounds.height ?? 0);
+
+            const overlaps =  (
+                iLeft < bounds.right &&
+                iRight > bounds.left &&
+                iTop < bounds.bottom &&
+                iBottom > bounds.top
+            );
+
+            if (overlaps) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/resources/js/wysiwyg/utils/__tests__/actions.test.ts b/resources/js/wysiwyg/utils/__tests__/actions.test.ts
new file mode 100644
index 00000000000..9450638f57f
--- /dev/null
+++ b/resources/js/wysiwyg/utils/__tests__/actions.test.ts
@@ -0,0 +1,107 @@
+import {
+    createTestContext,
+    destroyFromContext,
+    expectNodeShapeToMatch,
+} from "lexical/__tests__/utils";
+import { $createParagraphNode, $createTextNode, $getRoot, LexicalEditor } from "lexical";
+import { EditorUiContext } from "../../ui/framework/core";
+import { setEditorContentFromHtml } from "../actions";
+
+describe('Actions', () => {
+
+    let context!: EditorUiContext;
+    let editor!: LexicalEditor;
+
+    beforeEach(() => {
+        context = createTestContext();
+        editor = context.editor;
+    });
+
+    afterEach(() => {
+        destroyFromContext(context);
+    });
+
+    describe('setEditorContentFromHtml', () => {
+        it('parses HTML and sets content in editor', async () => {
+            setEditorContentFromHtml(editor, '<p>Hello World</p>');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                {
+                    type: 'paragraph',
+                    children: [{ text: 'Hello World' }],
+                },
+            ]);
+        });
+
+        it('parses multiple block elements', async () => {
+            setEditorContentFromHtml(editor, '<p>First</p><p>Second</p>');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                { type: 'paragraph', children: [{ text: 'First' }] },
+                { type: 'paragraph', children: [{ text: 'Second' }] },
+            ]);
+        });
+
+        it('wraps plain text in a paragraph', async () => {
+            setEditorContentFromHtml(editor, 'Plain text');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                {
+                    type: 'paragraph',
+                    children: [{ text: 'Plain text' }],
+                },
+            ]);
+        });
+
+        it('ensures at least a paragraph when HTML is empty', async () => {
+            setEditorContentFromHtml(editor, '');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                { type: 'paragraph' },
+            ]);
+        });
+
+        it('ensures at least a paragraph when HTML contains only whitespace', async () => {
+            setEditorContentFromHtml(editor, '   ');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                { type: 'paragraph' },
+            ]);
+        });
+
+        it('clears existing content before setting new content', async () => {
+            editor.updateAndCommit(() => {
+                const p = $createParagraphNode();
+                p.append($createTextNode('Existing'));
+                $getRoot().append(p);
+            });
+
+            setEditorContentFromHtml(editor, '<p>New</p>');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                { type: 'paragraph', children: [{ text: 'New' }] },
+            ]);
+        });
+
+        it('handles nested HTML structures', async () => {
+            setEditorContentFromHtml(editor, '<ul><li>Item A</li><li>Item B</li></ul>');
+            await Promise.resolve().then();
+
+            expectNodeShapeToMatch(editor, [
+                {
+                    type: 'list',
+                    children: [
+                        { type: 'listitem', children: [{ text: 'Item A' }] },
+                        { type: 'listitem', children: [{ text: 'Item B' }] },
+                    ],
+                },
+            ]);
+        });
+    });
+});
diff --git a/resources/js/wysiwyg/utils/actions.ts b/resources/js/wysiwyg/utils/actions.ts
index b7ce65eeb6c..9724a9b66f0 100644
--- a/resources/js/wysiwyg/utils/actions.ts
+++ b/resources/js/wysiwyg/utils/actions.ts
@@ -1,6 +1,20 @@
-import {$getRoot, $getSelection, LexicalEditor} from "lexical";
+import {
+    $createParagraphNode,
+    $getRoot,
+    $getSelection,
+    $insertNodes,
+    $isBlockElementNode,
+    LexicalEditor,
+} from "lexical";
 import {$generateHtmlFromNodes} from "@lexical/html";
-import {$htmlToBlockNodes} from "./nodes";
+import {
+    $getAllNodesOfType,
+    $getNearestNodeBlockParent,
+    $htmlToBlockNodes,
+    $htmlToNodes,
+    $isSingleSelectableNode
+} from "./nodes";
+import {$isHeadingNode} from "@lexical/rich-text/LexicalHeadingNode";
 
 export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
     editor.update(() => {
@@ -12,6 +26,12 @@ export function setEditorContentFromHtml(editor: LexicalEditor, html: string) {
 
         const nodes = $htmlToBlockNodes(editor, html);
         root.append(...nodes);
+
+        // Always ensure we at least have a paragraph in the root
+        // as a target for the cursor/focus/actions.
+        if (root.isEmpty()) {
+            root.append($createParagraphNode());
+        }
     });
 }
 
@@ -42,14 +62,34 @@ export function prependHtmlToEditor(editor: LexicalEditor, html: string) {
 export function insertHtmlIntoEditor(editor: LexicalEditor, html: string) {
     editor.update(() => {
         const selection = $getSelection();
-        const nodes = $htmlToBlockNodes(editor, html);
+        const nodes = $htmlToNodes(editor, html);
 
-        const reference = selection?.getNodes()[0];
-        const referencesParents = reference?.getParents() || [];
-        const topLevel = referencesParents[referencesParents.length - 1];
-        if (topLevel && reference) {
-            for (let i = nodes.length - 1; i >= 0; i--) {
-                reference.insertAfter(nodes[i]);
+        let reference = selection?.getNodes()[0];
+        let replacedReference = false;
+        let parentBlock = reference ? $getNearestNodeBlockParent(reference) : null;
+
+        for (let i = nodes.length - 1; i >= 0; i--) {
+            const toInsert = nodes[i];
+            if ($isBlockElementNode(toInsert) && parentBlock) {
+                // Insert at a block level, before or after the referenced block
+                // depending on if the reference has been replaced.
+                if (replacedReference) {
+                    parentBlock.insertBefore(toInsert);
+                } else {
+                    parentBlock.insertAfter(toInsert);
+                }
+            } else if ($isBlockElementNode(toInsert)) {
+                // Otherwise append blocks to the root
+                $getRoot().append(toInsert);
+            } else if (!replacedReference) {
+                // First inline node, replacing existing selection
+                $insertNodes([toInsert]);
+                reference = toInsert;
+                parentBlock = $getNearestNodeBlockParent(reference);
+                replacedReference = true;
+            } else {
+                // For other inline nodes, insert before the reference node
+                reference?.insertBefore(toInsert)
             }
         }
     });
@@ -65,5 +105,28 @@ export function getEditorContentAsHtml(editor: LexicalEditor): Promise<string> {
 }
 
 export function focusEditor(editor: LexicalEditor): void {
+    editor.update(() => {
+        const root = $getRoot();
+        const selection = $getSelection();
+        const firstChild = root.getFirstChild();
+        if (firstChild && !selection) {
+            firstChild.selectStart();
+        }
+
+        if ($isSingleSelectableNode(selection?.getNodes() || [])) {
+            editor._rootElement?.focus();
+        }
+    });
+    editor.commitUpdates();
     editor.focus(() => {}, {defaultSelection: "rootStart"});
-}
\ No newline at end of file
+}
+
+export function focusOnHeader(editor: LexicalEditor, headerIndex: number): void {
+    editor.update(() => {
+        const headers = $getAllNodesOfType($isHeadingNode);
+        const target = headers[headerIndex];
+        if (target) {
+            target.selectEnd();
+        }
+    });
+}
diff --git a/resources/js/wysiwyg/utils/formats.ts b/resources/js/wysiwyg/utils/formats.ts
index a5f06f147d2..6ddc3d6221a 100644
--- a/resources/js/wysiwyg/utils/formats.ts
+++ b/resources/js/wysiwyg/utils/formats.ts
@@ -3,7 +3,7 @@ import {
     $createTextNode,
     $getSelection,
     $insertNodes,
-    $isParagraphNode,
+    $isParagraphNode, $isRangeSelection,
     LexicalEditor,
     LexicalNode
 } from "lexical";
@@ -16,10 +16,12 @@ import {
 } from "./selection";
 import {$createCodeBlockNode, $isCodeBlockNode, $openCodeEditorForNode, CodeBlockNode} from "@lexical/rich-text/LexicalCodeBlockNode";
 import {$createCalloutNode, $isCalloutNode, CalloutCategory} from "@lexical/rich-text/LexicalCalloutNode";
-import {$isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
+import {$isListItemNode, $isListNode, insertList, ListNode, ListType, removeList} from "@lexical/list";
 import {$createLinkNode, $isLinkNode} from "@lexical/link";
 import {$createHeadingNode, $isHeadingNode, HeadingTagType} from "@lexical/rich-text/LexicalHeadingNode";
 import {$createQuoteNode, $isQuoteNode} from "@lexical/rich-text/LexicalQuoteNode";
+import {$setBlocksType} from "@lexical/selection";
+
 
 const $isHeaderNodeOfTag = (node: LexicalNode | null | undefined, tag: HeadingTagType) => {
     return $isHeadingNode(node) && node.getTag() === tag;
@@ -62,28 +64,35 @@ export function toggleSelectionAsList(editor: LexicalEditor, type: ListType) {
 }
 
 export function formatCodeBlock(editor: LexicalEditor) {
-    editor.getEditorState().read(() => {
+    editor.update(() => {
         const selection = $getSelection();
         const lastSelection = getLastSelection(editor);
         const codeBlock = $getNodeFromSelection(lastSelection, $isCodeBlockNode) as (CodeBlockNode | null);
         if (codeBlock === null) {
-            editor.update(() => {
-                const codeBlock = $createCodeBlockNode();
-                codeBlock.setCode(selection?.getTextContent() || '');
-
-                const selectionNodes = $getBlockElementNodesInSelection(selection);
-                const firstSelectionNode = selectionNodes[0];
-                const extraNodes = selectionNodes.slice(1);
-                if (firstSelectionNode) {
-                    firstSelectionNode.replace(codeBlock);
-                    extraNodes.forEach(n => n.remove());
-                } else {
-                    $insertNewBlockNodeAtSelection(codeBlock, true);
-                }
+            const codeBlock = $createCodeBlockNode();
 
-                $openCodeEditorForNode(editor, codeBlock);
-                $selectSingleNode(codeBlock);
-            });
+            const codeLines = [];
+            const selectionNodes = $getBlockElementNodesInSelection(selection);
+            for (const node of selectionNodes) {
+                codeLines.push(node.getTextContent());
+            }
+            codeBlock.setCode(codeLines.join('\n'));
+
+            const firstSelectionNode = selectionNodes[0];
+            const extraNodes = selectionNodes.slice(1);
+            if ($isListItemNode(firstSelectionNode)) {
+                firstSelectionNode.getChildren().forEach(c => c.remove());
+                firstSelectionNode.append(codeBlock);
+                extraNodes.forEach(n => n.remove());
+            } else if (firstSelectionNode) {
+                firstSelectionNode.replace(codeBlock);
+                extraNodes.forEach(n => n.remove());
+            } else {
+                $insertNewBlockNodeAtSelection(codeBlock, true);
+            }
+
+            $openCodeEditorForNode(editor, codeBlock);
+            $selectSingleNode(codeBlock);
         } else {
             $openCodeEditorForNode(editor, codeBlock);
         }
@@ -97,10 +106,29 @@ export function cycleSelectionCalloutFormats(editor: LexicalEditor) {
 
         let created = false;
         for (const block of blocks) {
-            if (!$isCalloutNode(block)) {
+            if ($isCalloutNode(block)) {
+                continue;
+            }
+
+            if ($isListItemNode(block)) {
+                const blockChildren = block.getChildren();
+                const alreadyHasCallout = blockChildren.some($isCalloutNode);
+                if (alreadyHasCallout) {
+                    continue;
+                }
+
+                const callout = $createCalloutNode('info');
+                callout.append(...blockChildren);
+                block.splice(0, 0, [callout]);
+            } else  {
+                const blockParents = block.getParents();
+                if (blockParents.some($isCalloutNode)) {
+                    continue;
+                }
                 block.replace($createCalloutNode('info'), true);
-                created = true;
             }
+
+            created = true;
         }
 
         if (created) {
diff --git a/resources/js/wysiwyg/utils/images.ts b/resources/js/wysiwyg/utils/images.ts
index 85bae18e5e5..bb8b25f0662 100644
--- a/resources/js/wysiwyg/utils/images.ts
+++ b/resources/js/wysiwyg/utils/images.ts
@@ -1,6 +1,7 @@
 import {ImageManager} from "../../components";
-import {$createImageNode} from "@lexical/rich-text/LexicalImageNode";
-import {$createLinkNode, LinkNode} from "@lexical/link";
+import {$createImageNode, $isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$createLinkNode, $isLinkNode, LinkNode} from "@lexical/link";
+import {$isElementNode, $isTextNode, LexicalNode} from "lexical";
 
 export type EditorImageData = {
     id: string;
@@ -26,6 +27,31 @@ export function $createLinkedImageNodeFromImageData(image: EditorImageData): Lin
     return linkNode;
 }
 
+/**
+ * Check if the given image node represents a simple linked image, where no other content
+ * exists within the link which wraps the image.
+ */
+export function $isLinkedImageNode(imageNode: LexicalNode): boolean {
+    if (!$isImageNode(imageNode)) {
+        return false;
+    }
+
+    const parent = imageNode.getParent();
+    if (!$isLinkNode(parent)) {
+        return false;
+    }
+
+    const linkChildren = parent.getChildren();
+    const withContent = linkChildren.filter(child => {
+        return child.getKey() !== imageNode.getKey() && (
+            $isElementNode(child)
+            || $isTextNode(child) && child.getTextContent().trim().length > 0
+        );
+    });
+
+    return withContent.length === 0;
+}
+
 /**
  * Upload an image file to the server
  */
diff --git a/resources/js/wysiwyg/utils/links.ts b/resources/js/wysiwyg/utils/links.ts
index 03c4a5ef075..a7d999d0c27 100644
--- a/resources/js/wysiwyg/utils/links.ts
+++ b/resources/js/wysiwyg/utils/links.ts
@@ -8,7 +8,7 @@ type EditorEntityData = {
 export function showLinkSelector(callback: (entity: EditorEntityData) => any, selectionText?: string) {
     const selector: EntitySelectorPopup = window.$components.first('entity-selector-popup') as EntitySelectorPopup;
     selector.show((entity: EditorEntityData) => callback(entity), {
-        initialValue: selectionText,
+        initialValue: selectionText || '',
         searchEndpoint: '/search/entity-selector',
         entityTypes: 'page,book,chapter,bookshelf',
         entityPermission: 'view',
diff --git a/resources/js/wysiwyg/utils/lists.ts b/resources/js/wysiwyg/utils/lists.ts
index 3deb9dfb6e9..cdbaba6fbbf 100644
--- a/resources/js/wysiwyg/utils/lists.ts
+++ b/resources/js/wysiwyg/utils/lists.ts
@@ -1,7 +1,7 @@
-import {$createTextNode, $getSelection, BaseSelection, LexicalEditor, TextNode} from "lexical";
+import {$createParagraphNode, $createTextNode, $getSelection, BaseSelection, LexicalEditor, ParagraphNode, TextNode} from "lexical";
 import {$getBlockElementNodesInSelection, $selectNodes, $toggleSelection} from "./selection";
 import {$sortNodes, nodeHasInset} from "./nodes";
-import {$createListItemNode, $createListNode, $isListItemNode, $isListNode, ListItemNode} from "@lexical/list";
+import {$createListItemNode, $createListNode, $isListItemNode, $isListNode, ListItemNode, ListNode} from "@lexical/list";
 
 
 export function $nestListItem(node: ListItemNode): ListItemNode {
@@ -186,4 +186,31 @@ export function $setInsetForSelection(editor: LexicalEditor, change: number): vo
     }
 
     $toggleSelection(editor);
-}
\ No newline at end of file
+}
+
+export function $escapeListAtItem(item: ListItemNode): ParagraphNode|null {
+    const list = item.getParentOrThrow<ListNode>();
+    const parentListItem = list.getParent();
+
+    // Un-nest list item if it's an empty nested item
+    if ($isListItemNode(parentListItem)) {
+        parentListItem.insertAfter(item);
+        item.selectStart();
+        return null;
+    }
+
+    // If we're anywhere but at the end, split the list, with following items
+    // moved into their own new list.
+    if (!item.isLastChild()) {
+        const afterSiblings = item.getNextSiblings();
+        const newList = $createListNode(list.getListType());
+        newList.append(...afterSiblings);
+        list.insertAfter(newList);
+    }
+
+    // Insert a new empty paragraph to land on after our list
+    const paragraph = $createParagraphNode();
+    list.insertAfter(paragraph, true);
+    item.remove();
+    return paragraph;
+}
diff --git a/resources/js/wysiwyg/utils/nodes.ts b/resources/js/wysiwyg/utils/nodes.ts
index 116a3f4e5c0..4309c471125 100644
--- a/resources/js/wysiwyg/utils/nodes.ts
+++ b/resources/js/wysiwyg/utils/nodes.ts
@@ -1,5 +1,6 @@
 import {
     $createParagraphNode,
+    $getNearestNodeFromDOMNode,
     $getRoot,
     $isDecoratorNode,
     $isElementNode, $isRootNode,
@@ -13,6 +14,11 @@ import {$generateNodesFromDOM} from "@lexical/html";
 import {htmlToDom} from "./dom";
 import {NodeHasAlignment, NodeHasInset} from "lexical/nodes/common";
 import {$findMatchingParent} from "@lexical/utils";
+import {$isImageNode} from "@lexical/rich-text/LexicalImageNode";
+import {$isMediaNode} from "@lexical/rich-text/LexicalMediaNode";
+import {$isDiagramNode} from "./diagrams";
+import {$isLinkedImageNode} from "./images";
+import {$isDetailsNode} from "@lexical/rich-text/LexicalDetailsNode";
 
 function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     return nodes.map(node => {
@@ -25,10 +31,13 @@ function wrapTextNodes(nodes: LexicalNode[]): LexicalNode[] {
     });
 }
 
-export function $htmlToBlockNodes(editor: LexicalEditor, html: string): LexicalNode[] {
+export function $htmlToNodes(editor: LexicalEditor, html: string): LexicalNode[] {
     const dom = htmlToDom(html);
-    const nodes = $generateNodesFromDOM(editor, dom);
-    return wrapTextNodes(nodes);
+    return $generateNodesFromDOM(editor, dom);
+}
+
+export function $htmlToBlockNodes(editor: LexicalEditor, html: string): LexicalNode[] {
+    return wrapTextNodes($htmlToNodes(editor, html));
 }
 
 export function $getParentOfType(node: LexicalNode, matcher: LexicalNodeMatcher): LexicalNode | null {
@@ -61,6 +70,27 @@ export function $getAllNodesOfType(matcher: LexicalNodeMatcher, root?: ElementNo
     return matches;
 }
 
+/**
+ * Get the node based on the given mouse event.
+ */
+export function $getNodePositionFromMouseEvent(event: MouseEvent, editor: LexicalEditor): {node: LexicalNode, offset: number}|null {
+    const x = event.clientX;
+    const y = event.clientY;
+    const caretPosition = window.document.caretPositionFromPoint(event.x, event.y);
+    if (!caretPosition) {
+        const backup = $getNearestBlockNodeForCoords(editor, x, y);
+        return backup ? {node: backup, offset: 0} : null;
+    }
+
+    const node = $getNearestNodeFromDOMNode(caretPosition.offsetNode);
+    if (!node) {
+        const backup = $getNearestBlockNodeForCoords(editor, x, y);
+        return backup ? {node: backup, offset: 0} : null;
+    }
+
+    return {node, offset: caretPosition.offset};
+}
+
 /**
  * Get the nearest root/block level node for the given position.
  */
@@ -94,7 +124,12 @@ export function $getNearestNodeBlockParent(node: LexicalNode): LexicalNode|null
     return $findMatchingParent(node, isBlockNode);
 }
 
-export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
+/**
+ * Sort the given node array by their position in the document.
+ * A search point can be provided to limit the search to a specific part of the document, which can
+ * avoid having to traverse the entire document.
+ */
+export function $sortNodes(nodes: LexicalNode[], searchPoint: ElementNode|null = null): LexicalNode[] {
     const idChain: string[] = [];
     const addIds = (n: ElementNode) => {
         for (const child of n.getChildren()) {
@@ -105,8 +140,7 @@ export function $sortNodes(nodes: LexicalNode[]): LexicalNode[] {
         }
     };
 
-    const root = $getRoot();
-    addIds(root);
+    addIds(searchPoint || $getRoot());
 
     const sorted = Array.from(nodes);
     sorted.sort((a, b) => {
@@ -134,6 +168,43 @@ export function $selectOrCreateAdjacent(node: LexicalNode, after: boolean): Rang
     return after ? target.selectStart() : target.selectEnd();
 }
 
+/**
+ * Check if the range of nodes represents a single node which is wholly selectable.
+ */
+export function $isSingleSelectableNode(nodes: LexicalNode[]): boolean {
+    if (nodes.length === 1) {
+        const node = nodes[0];
+        if ($isDecoratorNode(node) || $isImageNode(node) || $isMediaNode(node) || $isDiagramNode(node)) {
+            return true;
+        }
+
+        if ($isDetailsNode(node)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Get the single selectable node if the given range represents a single selectable node.
+ * Typically called with a selection's node ranges.
+ * Normalises the result, like for linked images, for example.
+ */
+export function $getSingleSelectableNode(nodes: LexicalNode[]): LexicalNode|null {
+    if (!$isSingleSelectableNode(nodes)) {
+        return null;
+    }
+
+    const node = nodes[0];
+
+    if ($isLinkedImageNode(node)) {
+        return node.getParent();
+    }
+
+    return node;
+}
+
 export function nodeHasAlignment(node: object): node is NodeHasAlignment {
     return '__alignment' in node;
 }
diff --git a/resources/js/wysiwyg/utils/rtl.ts b/resources/js/wysiwyg/utils/rtl.ts
new file mode 100644
index 00000000000..e04554f34b9
--- /dev/null
+++ b/resources/js/wysiwyg/utils/rtl.ts
@@ -0,0 +1,49 @@
+/**
+ * Create a viewport relative rect for an element which provides
+ * logical property support.
+ */
+export class RTLRect {
+    protected rect: DOMRect;
+    protected isRTL: boolean;
+
+    constructor(element: HTMLElement, isRTL = false) {
+        this.rect = element.getBoundingClientRect();
+        this.isRTL = isRTL;
+    }
+
+    get blockStart(): number {
+        return this.rect.top;
+    }
+
+    get inlineStart(): number {
+        if (!this.isRTL) {
+            return this.rect.left;
+        }
+
+        return window.innerWidth - this.rect.right;
+    }
+
+    get blockEnd(): number {
+        return this.rect.bottom;
+    }
+
+    get inlineEnd(): number {
+        if (!this.isRTL) {
+            return this.rect.right;
+        }
+
+        return window.innerWidth - this.rect.left;
+    }
+
+    get width(): number {
+        return this.rect.width;
+    }
+
+    get height(): number {
+        return this.rect.height;
+    }
+}
+
+export function getViewportRect(): RTLRect {
+    return new RTLRect(document.documentElement, false);
+}
diff --git a/resources/js/wysiwyg/utils/selection.ts b/resources/js/wysiwyg/utils/selection.ts
index e4b5bf2dce6..ba97fc1a20b 100644
--- a/resources/js/wysiwyg/utils/selection.ts
+++ b/resources/js/wysiwyg/utils/selection.ts
@@ -1,6 +1,6 @@
 import {
     $createNodeSelection,
-    $createParagraphNode, $createRangeSelection,
+    $createParagraphNode, $createRangeSelection, $getEditor, $getNearestNodeFromDOMNode,
     $getRoot,
     $getSelection, $isBlockElementNode, $isDecoratorNode,
     $isElementNode, $isParagraphNode,
@@ -8,15 +8,17 @@ import {
     $setSelection,
     BaseSelection, DecoratorNode,
     ElementNode, LexicalEditor,
-    LexicalNode,
+    LexicalNode, NodeSelection, RangeSelection,
     TextFormatType, TextNode
 } from "lexical";
 import {$getNearestBlockElementAncestorOrThrow} from "@lexical/utils";
 import {LexicalElementNodeCreator, LexicalNodeMatcher} from "../nodes";
 import {$setBlocksType} from "@lexical/selection";
 
-import {$getNearestNodeBlockParent, $getParentOfType, nodeHasAlignment} from "./nodes";
+import {$getNearestNodeBlockParent, $getParentOfType, $sortNodes, nodeHasAlignment} from "./nodes";
 import {CommonBlockAlignment} from "lexical/nodes/common";
+import {$isListItemNode} from "@lexical/list";
+import {$createCollapsedRangeSelectionForNode} from "lexical/LexicalSelection";
 
 const lastSelectionByEditor = new WeakMap<LexicalEditor, BaseSelection|null>;
 
@@ -76,9 +78,33 @@ export function $selectionContainsTextFormat(selection: BaseSelection | null, fo
     return false;
 }
 
+function createNewBlockIfSelectionIsSingleListItemText(selection: BaseSelection): void {
+    const startEnd = selection.getStartEndPoints();
+    if (!startEnd) {
+        return;
+    }
+
+    const startBlock = $getNearestNodeBlockParent(startEnd[0].getNode());
+    const endBlock = $getNearestNodeBlockParent(startEnd[1].getNode());
+    const isSingleListItemTextSelection = $isListItemNode(startBlock) && startBlock.getKey() === endBlock?.getKey();
+
+    if (isSingleListItemTextSelection) {
+        const wrapper = $createParagraphNode();
+        const firstNode = $sortNodes([startEnd[0].getNode(), startEnd[1].getNode()], startBlock)[0];
+        firstNode.insertBefore(wrapper);
+        wrapper.append(...selection.getNodes());
+    }
+}
+
 export function $toggleSelectionBlockNodeType(matcher: LexicalNodeMatcher, creator: LexicalElementNodeCreator) {
     const selection = $getSelection();
     const blockElement = selection ? $getNearestBlockElementAncestorOrThrow(selection.getNodes()[0]) : null;
+
+    const inListItem = $isListItemNode(blockElement);
+    if (inListItem && selection) {
+        createNewBlockIfSelectionIsSingleListItemText(selection);
+    }
+
     if (selection && matcher(blockElement)) {
         $setBlocksType(selection, $createParagraphNode);
     } else {
@@ -109,10 +135,49 @@ export function $insertNewBlockNodesAtSelection(nodes: LexicalNode[], insertAfte
     }
 }
 
-export function $selectSingleNode(node: LexicalNode) {
+export function $insertNewNodesAtSelection(nodes: LexicalNode[]) {
+    const selection = $getSelection();
+    if (selection) {
+        selection.insertNodes(nodes);
+        return;
+    }
+
+    // Do something relatively sensible if we don't have a selection within view
+    const root = $getRoot();
+    let targetBlock = root.getLastChild();
+    for (const node of nodes) {
+        const isBlock = $isBlockElementNode(node);
+        if (isBlock && !targetBlock) {
+            root.append(node);
+            targetBlock = node;
+        } else if (isBlock) {
+            targetBlock?.insertAfter(node);
+            targetBlock = node;
+        } else if ($isElementNode(targetBlock)) {
+            targetBlock.append(node);
+        } else {
+            const paragraph = $createParagraphNode();
+            paragraph.append(node);
+            root.append(paragraph);
+            targetBlock = paragraph;
+        }
+    }
+}
+
+/**
+ * Create a selection for a single node.
+ */
+export function $createSingleNodeSelection(node: LexicalNode): NodeSelection {
     const nodeSelection = $createNodeSelection();
     nodeSelection.add(node.getKey());
-    $setSelection(nodeSelection);
+    return nodeSelection;
+}
+
+/**
+ * Create and apply a selection for a single node.
+ */
+export function $selectSingleNode(node: LexicalNode): void {
+    $setSelection($createSingleNodeSelection(node));
 }
 
 function getFirstTextNodeInNodes(nodes: LexicalNode[]): TextNode|null {
@@ -246,4 +311,39 @@ export function $getDecoratorNodesInSelection(selection: BaseSelection | null):
     }
 
     return selection.getNodes().filter(node => $isDecoratorNode(node));
-}
\ No newline at end of file
+}
+
+/**
+ * Attempt to select the given node at roughly the pixel offset, relative to the left of the node.
+ * Returns the range selection if a selection could be made.
+ * Returns null if no selection can be made.
+ */
+export function $selectNodeAtXPixelOffset(node: LexicalNode, pixelOffset: number, targetStart: boolean = true): RangeSelection|null {
+    const targetDOM = $getEditor().getElementByKey(node.getKey());
+    if (!targetDOM) {
+        return null;
+    }
+
+    const targetChild = targetDOM.children[targetStart ? 0 : targetDOM.children.length - 1] || targetDOM;
+    const targetBounds = targetChild.getBoundingClientRect();
+    const targetY = targetBounds[targetStart ? 'top' : 'bottom'] + (targetStart ? 1 : -1);
+    const targetX = targetBounds.x + pixelOffset;
+    // Temporary caretRangeFromPoint usage due to caretPositionFromPoint being only
+    // very recently supported in Safari
+    // To remove post 2026
+    const caretRange = document.caretRangeFromPoint?.(targetX, targetY);
+    const caret = document.caretPositionFromPoint?.(targetX, targetY)
+        ?? (caretRange ? { offsetNode: caretRange.startContainer, offset: caretRange.startOffset } : undefined);
+    if (!caret) {
+        return null;
+    }
+
+    const targetNode = $getNearestNodeFromDOMNode(caret.offsetNode);
+    if (!targetNode) {
+        return null;
+    }
+
+    const rangeSelection = $createCollapsedRangeSelectionForNode(targetNode, caret.offset);
+    $setSelection(rangeSelection);
+    return rangeSelection;
+}
diff --git a/resources/js/wysiwyg/utils/tables.ts b/resources/js/wysiwyg/utils/tables.ts
index 15cc3cbbeb8..b835614ab3b 100644
--- a/resources/js/wysiwyg/utils/tables.ts
+++ b/resources/js/wysiwyg/utils/tables.ts
@@ -3,7 +3,7 @@ import {
     $isTableCellNode,
     $isTableNode,
     $isTableRowNode,
-    $isTableSelection, TableCellNode, TableNode,
+    $isTableSelection, TableCellHeaderStates, TableCellNode, TableNode,
     TableRowNode,
     TableSelection,
 } from "@lexical/table";
@@ -328,9 +328,21 @@ export function $getCellPaddingForTable(table: TableNode): string {
     return padding || '';
 }
 
-
-
-
+/**
+ * Toggle the header state of the cells in the provided row.
+ * Returns a boolean to indicate if the new state of the cells is as headers.
+ */
+export function $toggleRowCellHeaderState(row: TableRowNode): boolean {
+    const firstCell = row.getFirstChild();
+    const isHeader = $isTableCellNode(firstCell) ? firstCell.getHeaderStyles() !== TableCellHeaderStates.NO_STATUS : false;
+    const cells = row.getChildren();
+    for (const cell of cells) {
+        if ($isTableCellNode(cell)) {
+            cell.setHeaderStyles(isHeader ? TableCellHeaderStates.NO_STATUS : TableCellHeaderStates.ROW);
+        }
+    }
+    return !isHeader;
+}
 
 
 
diff --git a/resources/sass/_blocks.scss b/resources/sass/_blocks.scss
index 8c248caee14..a89cfea23ce 100644
--- a/resources/sass/_blocks.scss
+++ b/resources/sass/_blocks.scss
@@ -253,6 +253,9 @@
 /**
  * API Docs
  */
+.api-docs h2.list-heading {
+  font-size: 1.666rem;
+}
 .api-method {
   font-size: 0.75rem;
   background-color: #888;
@@ -274,7 +277,19 @@
 
 .sticky-sidebar {
   position: sticky;
-  top: vars.$m;
-  max-height: calc(100vh - #{vars.$m});
+  top: 0;
+  padding-left: 2px;
+  max-height: calc(100vh);
   overflow-y: auto;
+  .sticky-sidebar-header {
+    position: sticky;
+    top: 0;
+    background: #F2F2F2;
+    background: linear-gradient(180deg,rgba(242, 242, 242, 1) 80%, rgba(242, 242, 242, 0) 100%);
+    z-index: 4;
+  }
+}
+.dark-mode .sticky-sidebar-header {
+  background: #111;
+  background: linear-gradient(180deg,rgba(17, 17, 17, 1) 80%, rgba(17, 17, 17, 0) 100%);
 }
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 8ea15de8044..ba53bfb97f2 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -746,7 +746,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   @include mixins.lightDark(border-color, #DDD, #444);
   margin-inline-start: vars.$xs;
   width: vars.$l;
-  height: calc(100% - vars.$m);
+  height: calc(100% - #{vars.$m});
 }
 
 .comment-reference-indicator-wrap a {
@@ -982,8 +982,10 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   }
   .dropdown-search-item {
     padding: vars.$s vars.$m;
+    font-size: 0.8rem;
     &:hover,&:focus {
       background-color: #F2F2F2;
+      @include mixins.lightDark(background-color, #F2F2F2, #444);
       text-decoration: none;
     }
   }
@@ -996,6 +998,21 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   input:focus {
     outline: 0;
   }
+  .svg-icon {
+    font-size: vars.$fs-m;
+  }
+  &.compact {
+    .dropdown-search-list {
+      max-height: 320px;
+    }
+    .dropdown-search-item {
+      padding: vars.$xs vars.$s;
+    }
+    .avatar {
+      width: 22px;
+      height: 22px;
+    }
+  }
 }
 
 @include mixins.smaller-than(vars.$bp-l) {
@@ -1081,16 +1098,24 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 
 // Back to top link
 $btt-size: 40px;
-.back-to-top {
-  background-color: var(--color-primary);
+.back-to-top-container {
   position: fixed;
   bottom: vars.$m;
   right: vars.$l;
+  opacity: 0;
+  z-index: 999;
+  transition: opacity ease-in-out 180ms;
+  &:hover {
+    opacity: 1 !important;
+  }
+}
+.back-to-top {
+  background-color: var(--color-primary);
   padding: 5px 7px;
   cursor: pointer;
   color: #FFF;
   fill: #FFF;
-  svg {
+  .inner svg {
     width: math.div($btt-size, 1.5);
     height: math.div($btt-size, 1.5);
     margin-inline-end: 4px;
@@ -1099,8 +1124,6 @@ $btt-size: 40px;
   height: $btt-size;
   border-radius: $btt-size;
   transition: all ease-in-out 180ms;
-  opacity: 0;
-  z-index: 999;
   overflow: hidden;
   &:hover {
     width: $btt-size*3.4;
@@ -1108,6 +1131,7 @@ $btt-size: 40px;
   }
   .inner {
     width: $btt-size*3.4;
+    text-align: start;
   }
   span {
     position: relative;
@@ -1116,6 +1140,23 @@ $btt-size: 40px;
   }
 }
 
+.back-to-top-progress {
+  position: absolute;
+  top: -3px;
+  inset-inline-start: -3px;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  overflow: visible;
+  path {
+    fill: none;
+    stroke: var(--color-primary);
+    stroke-width: 2px;
+    stroke-linecap: butt;
+    transition: stroke-dasharray ease-in-out 120ms;
+  }
+}
+
 // Sortable scroll boxes
 .scroll-box {
   list-style: none;
@@ -1205,11 +1246,19 @@ input.scroll-box-search, .scroll-box-header-item {
   display: none;
 }
 
-.scroll-box > li.empty-state {
+.scroll-box.layout-editor-column-left [data-action="move_left"],
+.scroll-box.layout-editor-column-right [data-action="move_right"],
+.scroll-box.layout-editor-column-unused [data-action="move_right"],
+.scroll-box.layout-editor-column-unused [data-action="move_left"],
+.scroll-box.layout-editor-column-unused [data-action="remove"],
+.scroll-box.layout-editor-column-left [data-action="add"],
+.scroll-box.layout-editor-column-right [data-action="add"],
+.scroll-box.layout-editor-column-center [data-action="add"],
+{
   display: none;
 }
-.scroll-box > li.empty-state:last-child {
-  display: list-item;
+.scroll-box:has(> li:not(.empty-state)) .empty-state {
+  display: none;
 }
 
 details.section-expander summary {
diff --git a/resources/sass/_content.scss b/resources/sass/_content.scss
index aba1556a983..e77ea633001 100644
--- a/resources/sass/_content.scss
+++ b/resources/sass/_content.scss
@@ -198,4 +198,41 @@ body .page-content img,
     color: inherit;
     text-decoration: underline;
   }
+}
+
+/**
+ * Mention Links
+ */
+
+a[data-mention-user-id] {
+  display: inline-block;
+  position: relative;
+  color: var(--color-link);
+  padding: 0.1em 0.4em;
+  display: -webkit-inline-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  max-width: 180px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 0.92em;
+  margin-inline: 0.2em;
+  vertical-align: middle;
+  border-radius: 3px;
+  border: 1px solid transparent;
+  &:hover {
+    text-decoration: none;
+    border-color: currentColor;
+  }
+  &:after {
+    content: '';
+    background-color: currentColor;
+    opacity: 0.2;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
 }
\ No newline at end of file
diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index cd4bb5d2ef0..52311dba9ce 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -451,6 +451,9 @@ body.editor-is-fullscreen {
   outline: 1px dashed var(--editor-color-primary);
   outline-offset: 1px;
 }
+.editor-content-area  [drawio-diagram] {
+  cursor: pointer;
+}
 
 .editor-table-marker {
   position: fixed;
@@ -458,6 +461,7 @@ body.editor-is-fullscreen {
   z-index: 3;
   user-select: none;
   opacity: 0;
+  transition: opacity 120ms ease-in-out;
   &:hover, &.active {
     opacity: 0.4;
   }
@@ -536,7 +540,7 @@ body.editor-is-fullscreen {
 /**
  * Form elements
  */
-$inputWidth: 260px;
+$inputWidth: 400px;
 
 .editor-form-field-wrapper {
   margin-bottom: .5rem;
@@ -677,6 +681,10 @@ textarea.editor-form-field-input {
   align-items: end;
   justify-content: space-between;
   gap: .1rem;
+  > div:has(input) {
+    flex: 1;
+    min-width: 100px;
+  }
   .editor-button {
     margin-bottom: 12px;
   }
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 12fb3385f96..e5ae3fa88a8 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -142,6 +142,9 @@
     padding-inline-end: 12px;
     max-width: 864px;
   }
+  [drawio-diagram] {
+    cursor: pointer;
+  }
   [drawio-diagram]:hover {
     outline: 2px solid var(--color-primary);
   }
@@ -175,7 +178,7 @@ html.markdown-editor-display.dark-mode {
   .dropdown-menu {
     padding: 0;
   }
-  .toggle-switch {
+  .custom-checkbox {
     margin: vars.$s 0;
   }
 }
@@ -264,57 +267,52 @@ input[type=color] {
   }
 }
 
-.toggle-switch {
+.custom-checkbox {
   user-select: none;
   display: inline-grid;
   grid-template-columns: (16px + vars.$s) 1fr;
   align-items: center;
   margin: vars.$m 0;
-  .custom-checkbox {
+  input {
+    color: var(--color-primary);
+    appearance: none;
+    border: 2px solid currentColor;
     width: 16px;
     height: 16px;
-    border-radius: 2px;
-    display: inline-block;
-    border: 2px solid currentColor;
-    overflow: hidden;
-    fill: currentColor;
-    .svg-icon {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      bottom: auto;
-      top: -1.5px;
-      left: 0;
-      transition: transform ease-in-out 120ms;
-      transform: scale(0);
-      transform-origin: center center;
-    }
+    position: relative;
+    background-color: transparent;
   }
-  input[type=checkbox] {
-    display: none;
+  input:checked::before {
+    width: 12px;
+    height: 12px;
+    content: '';
+    background-color: currentColor;
+    -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns=%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 viewBox=%220%200%2024%2024%22%3E%3Cpath fill=%22white%22 d=%22m18.86 4.118-9.733 9.609-3.951-3.995-2.98 2.966 6.93 7.184L21.805 7.217z%22/%3E%3C/svg%3E")
+    center / contain no-repeat;
+    mask: url("data:image/svg+xml,%3Csvg xmlns=%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22 viewBox=%220%200%2024%2024%22%3E%3Cpath fill=%22white%22 d=%22m18.86 4.118-9.733 9.609-3.951-3.995-2.98 2.966 6.93 7.184L21.805 7.217z%22/%3E%3C/svg%3E")
+    center / contain no-repeat;
+    position: absolute;
+    left: 0;
+    top: 0;
   }
-  input[type=checkbox]:checked + .custom-checkbox .svg-icon {
-    transform: scale(1);
+  input:focus {
+    outline-offset: 2px;
+    outline: 1px dotted currentColor;
   }
-  .custom-checkbox:hover {
-    background-color: rgba(0, 0, 0, 0.05);
-    opacity: 0.8;
+  input:hover {
+    background-color: rgb(from var(--color-primary) r g b / 6%);
   }
-  input[type=checkbox][disabled] ~ * {
+  input:disabled {
+    color: currentColor;
     opacity: 0.8;
     cursor: not-allowed;
   }
-  input[type=checkbox][disabled] ~ .custom-checkbox {
-    border-color: #999;
-    color: #999 !important;
-    background: #f2f2f2;
-  }
 }
-.toggle-switch-list {
-  .toggle-switch {
+.custom-checkbox-list {
+  .custom-checkbox {
     margin: vars.$xs 0;
   }
-  &.compact .toggle-switch {
+  &.compact .custom-checkbox {
     margin: 1px 0;
   }
 }
@@ -348,6 +346,10 @@ input[type=color] {
   }
 }
 
+.small-inputs input {
+  width: 150px;
+}
+
 .simple-code-input {
   background-color: #F8F8F8;
   font-family: monospace;
diff --git a/resources/sass/_lists.scss b/resources/sass/_lists.scss
index 1e503dd0ffe..249dca0d57e 100644
--- a/resources/sass/_lists.scss
+++ b/resources/sass/_lists.scss
@@ -93,6 +93,8 @@
   list-style: none;
   @include mixins.margin(vars.$s, 0, vars.$m, vars.$xs);
   position: relative;
+  padding-inline: 0;
+  display: block;
   &:after {
     content: '';
     display: block;
@@ -153,6 +155,14 @@
     }
   }
 }
+.toolbox-tab-content .sidebar-page-nav {
+  .sidebar-page-nav-bullet {
+    box-shadow: 0 0 0 6px #FFFFFF;
+  }
+  li {
+    font-size: 1em;
+  }
+}
 
 // Sidebar list
 .book-tree .sidebar-page-list  {
@@ -366,9 +376,10 @@ details.sort-box[open] summary .caret-container svg {
 
 ul.pagination {
   display: inline-flex;
+  flex-wrap: wrap;
   list-style: none;
   margin: vars.$m 0;
-  padding-inline-start: 1px;
+  padding-inline: 1px;
   li:first-child {
     a, span {
       border-radius: 3px 0 0 3px;
@@ -384,6 +395,7 @@ ul.pagination {
     padding: vars.$xxs vars.$s;
     border: 1px solid #CCC;
     margin-inline-start: -1px;
+    margin-block-end: -1px;
     user-select: none;
     @include mixins.lightDark(color, #555, #eee);
     @include mixins.lightDark(border-color, #ccc, #666);
diff --git a/resources/sass/_mixins.scss b/resources/sass/_mixins.scss
index fc508600839..e9f2db69cd9 100644
--- a/resources/sass/_mixins.scss
+++ b/resources/sass/_mixins.scss
@@ -35,9 +35,17 @@
 
 // Define a property for both light and dark mode
 @mixin lightDark($prop, $light, $dark, $important: false) {
-  #{$prop}: if($important, $light !important, $light);
+  @if($important) {
+    #{$prop}: $light !important;
+  } @else {
+    #{$prop}: $light;
+  }
   html.dark-mode & {
-    #{$prop}: if($important, $dark !important, $dark);
+    @if($important) {
+      #{$prop}: $dark !important;
+    } @else {
+      #{$prop}: $dark;
+    }
   }
 }
 
diff --git a/resources/sass/_pages.scss b/resources/sass/_pages.scss
index 83aec46f093..9552b14f517 100755
--- a/resources/sass/_pages.scss
+++ b/resources/sass/_pages.scss
@@ -158,7 +158,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
   border-radius: 4px;
   box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.1);
   @include mixins.lightDark(background-color, #fff, #333);
-  width: 328px;
+  width: 344px;
 
   &:before {
     position: absolute;
diff --git a/resources/sass/_tables.scss b/resources/sass/_tables.scss
index 16be32fb39b..5ea520d733d 100644
--- a/resources/sass/_tables.scss
+++ b/resources/sass/_tables.scss
@@ -4,10 +4,6 @@
 table {
   min-width: 100px;
   max-width: 100%;
-  thead {
-    @include mixins.lightDark(background-color, #f8f8f8, #333);
-    font-weight: 500;
-  }
   td, th {
     min-width: 10px;
     padding: 6px 8px;
@@ -22,6 +18,15 @@ table {
   }
 }
 
+// Table Header styles.
+// Initial selector for in-body th cells, intended to (somewhat) not conflict with
+// previous approach (second selector) to table headers where
+// we would target the thead specifically.
+table:not(:has(thead)) th, table thead {
+  @include mixins.lightDark(background-color, #f8f8f8, #333);
+  font-weight: 500;
+}
+
 table.table {
   width: 100%;
   tr td, tr th {
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 8cc96df4193..d662550c613 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -202,4 +202,11 @@ body.page-content.mce-content-body  {
   background-image: url('data:image/svg+xml;utf8,<svg fill="%23FFFFFF" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8.4856 20.274-6.736-6.736 2.9287-2.7823 3.8073 3.8073 10.836-10.836 2.9287 2.9287z" stroke-width="1.4644"/></svg>');
   background-position: 50% 50%;
   background-size: 100% 100%;
-}
\ No newline at end of file
+}
+
+/**
+ * Ensure cursor indicates that drawings are clickable
+ */
+.page-content.mce-content-body [drawio-diagram] {
+  cursor: pointer;
+}
diff --git a/resources/sass/export-styles.scss b/resources/sass/export-styles.scss
index 8dd7be375e8..36901c0f122 100644
--- a/resources/sass/export-styles.scss
+++ b/resources/sass/export-styles.scss
@@ -12,12 +12,16 @@ html, body {
 }
 
 body {
-  font-family: 'DejaVu Sans', -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Roboto", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
   margin: 0;
   padding: 0;
   display: block;
 }
 
+// Set fonts to common system fonts, starting with DejaVu Sans due to support in DOMPDF
+body, h1, h2, h3, h4, h5, h6 {
+  font-family: 'DejaVu Sans', -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Roboto", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+}
+
 table {
   border-spacing: 0;
   border-collapse: collapse;
@@ -100,4 +104,4 @@ body.export-format-pdf.export-engine-dompdf {
   .page-content td a > img {
     max-width: 100%;
   }
-}
\ No newline at end of file
+}
diff --git a/resources/views/api-docs/download.blade.php b/resources/views/api-docs/download.blade.php
new file mode 100644
index 00000000000..e7bf7457f0e
--- /dev/null
+++ b/resources/views/api-docs/download.blade.php
@@ -0,0 +1,65 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <title>{{ setting('app-name') }} API Docs</title>
+    <style>
+        body {
+            max-width: 800px;
+            margin: 0 auto;
+            padding-bottom: 2rem;
+            font-family: sans-serif;
+        }
+        h2 {
+            margin-top: 2rem;
+        }
+        table.table {
+            border-collapse: collapse;
+        }
+        table.table th, table.table td {
+            border: 1px solid #ccc;
+            padding: 0.2em 0.4em;
+        }
+    </style>
+</head>
+<body>
+
+<h1>{{ setting('app-name') }} API Documentation</h1>
+
+<h2>Contents</h2>
+<ul>
+@foreach($gettingStartedSections as $id => $label)
+    <li><a href="#{{ $id }}">{{ $label }}</a></li>
+@endforeach
+<li style="list-style: none">---</li>
+@foreach($docs as $model => $endpoints)
+    <li><a href="#section-{{ str_replace(' ', '-', $model) }}">{{ $model }}</a></li>
+@endforeach
+</ul>
+
+<section id="section-getting-started" component="code-highlighter" class="card content-wrap auto-height">
+    @include('api-docs.parts.getting-started')
+</section>
+
+@foreach($docs as $model => $endpoints)
+    <section id="section-{{ str_replace(' ', '-', $model) }}" class="card content-wrap auto-height">
+        <h2>{{ $model }}</h2>
+
+        @if($endpoints[0]['model_description'])
+            <p>{{ $endpoints[0]['model_description'] }}</p>
+        @endif
+
+        @foreach($endpoints as $endpoint)
+            <div>
+                <h3 id="{{ $endpoint['name'] }}">{{ $endpoint['name'] }}</h3>
+                <p>{{ $endpoint['method'] }} {{ url($endpoint['uri']) }}</p>
+            </div>
+            @include('api-docs.parts.endpoint-details')
+        @endforeach
+    </section>
+@endforeach
+
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/api-docs/index.blade.php b/resources/views/api-docs/index.blade.php
index 9345a7bcead..573dbf0b3c5 100644
--- a/resources/views/api-docs/index.blade.php
+++ b/resources/views/api-docs/index.blade.php
@@ -2,50 +2,71 @@
 
 @section('body')
 
-    <div class="container pt-xl">
+    <div component="api-nav" class="container api-docs">
 
         <div class="grid right-focus reverse-collapse">
             <div>
 
-                <div class="sticky-sidebar">
-                    <p class="text-uppercase text-muted mb-xm mt-l"><strong>Getting Started</strong></p>
+                <div refs="api-nav@sidebar" class="sticky-sidebar">
 
-                    <div class="text-mono">
-                        <div class="mb-xs"><a href="#authentication">Authentication</a></div>
-                        <div class="mb-xs"><a href="#request-format">Request Format</a></div>
-                        <div class="mb-xs"><a href="#listing-endpoints">Listing Endpoints</a></div>
-                        <div class="mb-xs"><a href="#error-handling">Error Handling</a></div>
-                        <div class="mb-xs"><a href="#rate-limits">Rate Limits</a></div>
-                        <div class="mb-xs"><a href="#content-security">Content Security</a></div>
+                    <div class="sticky-sidebar-header pt-xl pb-m">
+                        <select refs="api-nav@select" name="navigation" id="navigation">
+                            <option value="getting-started" selected>Jump To Section</option>
+                            <option value="getting-started">Getting Started</option>
+                            @foreach($docs as $model => $endpoints)
+                                <option value="{{ str_replace(' ', '-', $model) }}">{{ ucfirst($model) }}</option>
+                                @if($model === 'docs' || $model === 'shelves')
+                                    <hr>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class="flex-container-row wrap gap-xs mb-s">
+                        <a href="{{ url('/api/docs/download?format=html') }}" title="Download API docs as HTML" class="button outline small">@icon('download')<span>HTML</span></a>
+                        <a href="{{ url('/api/docs/download?format=json') }}" title="Download API docs as JSON" class="button outline small">@icon('download')<span>JSON</span></a>
+                    </div>
+
+                    <div class="mb-xl">
+                        <p id="sidebar-header-getting-started" class="text-uppercase text-muted mb-xm"><strong>Getting Started</strong></p>
+                        <div class="text-mono">
+                            @foreach($gettingStartedSections as $id => $label)
+                                <div class="mb-xs"><a href="#{{ $id }}">{{ $label }}</a></div>
+                            @endforeach
+                        </div>
                     </div>
 
                     @foreach($docs as $model => $endpoints)
-                        <p class="text-uppercase text-muted mb-xm mt-l"><strong>{{ $model }}</strong></p>
+                        <div class="mb-xl">
+                            <p id="sidebar-header-{{ str_replace(' ', '-', $model) }}" class="text-uppercase text-muted mb-xm"><strong>{{ $model }}</strong></p>
 
-                        @foreach($endpoints as $endpoint)
-                            <div class="mb-xs">
-                                <a href="#{{ $endpoint['name'] }}" class="text-mono inline block mr-s">
-                                    <span class="api-method" data-method="{{ $endpoint['method'] }}">{{ $endpoint['method'] }}</span>
-                                </a>
-                                <a href="#{{ $endpoint['name'] }}" class="text-mono">
-                                    {{ $endpoint['controller_method_kebab'] }}
-                                </a>
-                            </div>
-                        @endforeach
+                            @foreach($endpoints as $endpoint)
+                                <div class="mb-xs">
+                                    <a href="#{{ $endpoint['name'] }}" class="text-mono inline block mr-s">
+                                        <span class="api-method" data-method="{{ $endpoint['method'] }}">{{ $endpoint['method'] }}</span>
+                                    </a>
+                                    <a href="#{{ $endpoint['name'] }}" class="text-mono">
+                                        {{ $endpoint['controller_method_kebab'] }}
+                                    </a>
+                                </div>
+                            @endforeach
+                        </div>
                     @endforeach
                 </div>
             </div>
 
-            <div style="overflow: auto;">
+            <div class="pt-xl" style="overflow: auto;">
 
-                <section component="code-highlighter" class="card content-wrap auto-height">
+                <section id="section-getting-started" component="code-highlighter" class="card content-wrap auto-height">
                     @include('api-docs.parts.getting-started')
                 </section>
 
                 @foreach($docs as $model => $endpoints)
-                    <section class="card content-wrap auto-height">
-                        <h1 class="list-heading text-capitals">{{ $model }}</h1>
-
+                    <section id="section-{{ str_replace(' ', '-', $model) }}" class="card content-wrap auto-height">
+                        <h2 class="list-heading text-capitals">{{ $model }}</h2>
+                        @if($endpoints[0]['model_description'])
+                            <p>{{ $endpoints[0]['model_description'] }}</p>
+                        @endif
                         @foreach($endpoints as $endpoint)
                             @include('api-docs.parts.endpoint', ['endpoint' => $endpoint, 'loop' => $loop])
                         @endforeach
diff --git a/resources/views/api-docs/parts/endpoint-details.blade.php b/resources/views/api-docs/parts/endpoint-details.blade.php
new file mode 100644
index 00000000000..979eeb964f1
--- /dev/null
+++ b/resources/views/api-docs/parts/endpoint-details.blade.php
@@ -0,0 +1,41 @@
+<div class="mb-m">
+    @foreach(explode("\n", $endpoint['description'] ?? '') as $descriptionBlock)
+        <p class="mb-xxs">{{ $descriptionBlock }}</p>
+    @endforeach
+</div>
+
+@if($endpoint['body_params'] ?? false)
+    <details class="mb-m">
+        <summary class="text-muted">{{ $endpoint['method'] === 'GET' ? 'Query' : 'Body'  }} Parameters</summary>
+        <table class="table">
+            <tr>
+                <th>Param Name</th>
+                <th>Value Rules</th>
+            </tr>
+            @foreach($endpoint['body_params'] as $paramName => $rules)
+                <tr>
+                    <td>{{ $paramName }}</td>
+                    <td>
+                        @foreach($rules as $rule)
+                            <code class="mr-xs">{{ $rule }}</code>
+                        @endforeach
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </details>
+@endif
+
+@if($endpoint['example_request'] ?? false)
+    <details component="details-highlighter" class="mb-m">
+        <summary class="text-muted">Example Request</summary>
+        <pre><code class="language-json">{{ $endpoint['example_request'] }}</code></pre>
+    </details>
+@endif
+
+@if($endpoint['example_response'] ?? false)
+    <details component="details-highlighter" class="mb-m">
+        <summary class="text-muted">Example Response</summary>
+        <pre><code class="language-json">{{ $endpoint['example_response'] }}</code></pre>
+    </details>
+@endif
\ No newline at end of file
diff --git a/resources/views/api-docs/parts/endpoint.blade.php b/resources/views/api-docs/parts/endpoint.blade.php
index 024a5ecdf04..b82a46d1371 100644
--- a/resources/views/api-docs/parts/endpoint.blade.php
+++ b/resources/views/api-docs/parts/endpoint.blade.php
@@ -1,7 +1,7 @@
 <div class="flex-container-row items-center gap-m">
     <span class="api-method text-mono" data-method="{{ $endpoint['method'] }}">{{ $endpoint['method'] }}</span>
     <h5 id="{{ $endpoint['name'] }}" class="text-mono pb-xs">
-        @if($endpoint['controller_method_kebab'] === 'list')
+        @if(str_starts_with($endpoint['controller_method_kebab'], 'list') && !str_contains($endpoint['uri'], '{'))
             <a style="color: inherit;" target="_blank" rel="noopener" href="{{ url($endpoint['uri']) }}">{{ url($endpoint['uri']) }}</a>
         @else
             <span>{{ url($endpoint['uri']) }}</span>
@@ -10,47 +10,7 @@
     <h6 class="text-uppercase text-muted text-mono ml-auto">{{ $endpoint['controller_method_kebab'] }}</h6>
 </div>
 
-<div class="mb-m">
-    @foreach(explode("\n", $endpoint['description'] ?? '') as $descriptionBlock)
-        <p class="mb-xxs">{{ $descriptionBlock }}</p>
-    @endforeach
-</div>
-
-@if($endpoint['body_params'] ?? false)
-    <details class="mb-m">
-        <summary class="text-muted">{{ $endpoint['method'] === 'GET' ? 'Query' : 'Body'  }} Parameters</summary>
-        <table class="table">
-            <tr>
-                <th>Param Name</th>
-                <th>Value Rules</th>
-            </tr>
-            @foreach($endpoint['body_params'] as $paramName => $rules)
-                <tr>
-                    <td>{{ $paramName }}</td>
-                    <td>
-                        @foreach($rules as $rule)
-                            <code class="mr-xs">{{ $rule }}</code>
-                        @endforeach
-                    </td>
-                </tr>
-            @endforeach
-        </table>
-    </details>
-@endif
-
-@if($endpoint['example_request'] ?? false)
-    <details component="details-highlighter" class="mb-m">
-        <summary class="text-muted">Example Request</summary>
-        <pre><code class="language-json">{{ $endpoint['example_request'] }}</code></pre>
-    </details>
-@endif
-
-@if($endpoint['example_response'] ?? false)
-    <details component="details-highlighter" class="mb-m">
-        <summary class="text-muted">Example Response</summary>
-        <pre><code class="language-json">{{ $endpoint['example_response'] }}</code></pre>
-    </details>
-@endif
+@include('api-docs.parts.endpoint-details')
 
 @if(!$loop->last)
     <hr>
diff --git a/resources/views/api-docs/parts/getting-started.blade.php b/resources/views/api-docs/parts/getting-started.blade.php
index 229fe7dce74..ab8de44a0a8 100644
--- a/resources/views/api-docs/parts/getting-started.blade.php
+++ b/resources/views/api-docs/parts/getting-started.blade.php
@@ -1,8 +1,8 @@
-<h1 class="list-heading text-capitals mb-l">Getting Started</h1>
+<h2 class="list-heading text-capitals mb-l">Getting Started</h2>
 
 <p class="mb-none">
     This documentation covers use of the REST API. <br>
-    Examples of API usage, in a variety of programming languages, can be found in the <a href="https://github.com/BookStackApp/api-scripts" target="_blank" rel="noopener noreferrer">BookStack api-scripts repo on GitHub</a>.
+    Examples of API usage, in a variety of programming languages, can be found in the <a href="https://codeberg.org/bookstack/api-scripts" target="_blank" rel="noopener noreferrer">BookStack api-scripts repo on Codeberg</a>.
 
     <br> <br>
     Some alternative options for extension and customization can be found below:
@@ -14,11 +14,11 @@
         HTTP POST calls upon events occurring in BookStack.
     </li>
     <li>
-        <a href="https://github.com/BookStackApp/BookStack/blob/development/dev/docs/visual-theme-system.md" target="_blank" rel="noopener noreferrer">Visual Theme System</a> -
+        <a href="https://codeberg.org/bookstack/bookstack/src/branch/development/dev/docs/visual-theme-system.md" target="_blank" rel="noopener noreferrer">Visual Theme System</a> -
         Methods to override views, translations and icons within BookStack.
     </li>
     <li>
-        <a href="https://github.com/BookStackApp/BookStack/blob/development/dev/docs/logical-theme-system.md" target="_blank" rel="noopener noreferrer">Logical Theme System</a> -
+        <a href="https://codeberg.org/bookstack/bookstack/src/branch/development/dev/docs/logical-theme-system.md" target="_blank" rel="noopener noreferrer">Logical Theme System</a> -
         Methods to extend back-end functionality within BookStack.
     </li>
 </ul>
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index 52d23241a6f..6e311a88bae 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -5,58 +5,9 @@
 @stop
 
 @section('left')
-    @if($recents)
-        <div id="recents" class="mb-xl">
-            <h5>{{ trans('entities.recently_viewed') }}</h5>
-            @include('entities.list', ['entities' => $recents, 'style' => 'compact'])
-        </div>
-    @endif
-
-    <div id="popular" class="mb-xl">
-        <h5>{{ trans('entities.books_popular') }}</h5>
-        @if(count($popular) > 0)
-            @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
-        @else
-            <p class="text-muted pb-l mb-none">{{ trans('entities.books_popular_empty') }}</p>
-        @endif
-    </div>
-
-    <div id="new" class="mb-xl">
-        <h5>{{ trans('entities.books_new') }}</h5>
-        @if(count($new) > 0)
-            @include('entities.list', ['entities' => $new, 'style' => 'compact'])
-        @else
-            <p class="text-muted pb-l mb-none">{{ trans('entities.books_new_empty') }}</p>
-        @endif
-    </div>
+    @include('common.view-blocks', ['location' => 'books-index', 'position' => 'left'])
 @stop
 
 @section('right')
-
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
-                <a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.books_create') }}</span>
-                </a>
-            @endif
-
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
-
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-
-            @if(userCan(\BookStack\Permissions\Permission::ContentImport))
-                <a href="{{ url('/import') }}" class="icon-list-item">
-                    <span>@icon('upload')</span>
-                    <span>{{ trans('entities.import') }}</span>
-                </a>
-            @endif
-        </div>
-    </div>
-
+    @include('common.view-blocks', ['location' => 'books-index', 'position' => 'right'])
 @stop
diff --git a/resources/views/books/parts/form.blade.php b/resources/views/books/parts/form.blade.php
index 44d495c2777..bb2cc936fe0 100644
--- a/resources/views/books/parts/form.blade.php
+++ b/resources/views/books/parts/form.blade.php
@@ -18,7 +18,7 @@
 
         @include('form.image-picker', [
             'defaultImage' => url('/book_default_cover.png'),
-            'currentImage' => (isset($model) && $model->cover) ? $model->getBookCover() : url('/book_default_cover.png') ,
+            'currentImage' => (($model ?? null)?->coverInfo()->getUrl(440, 250, null) ?? url('/book_default_cover.png')),
             'name' => 'image',
             'imageClass' => 'cover'
         ])
diff --git a/resources/views/books/parts/index-sidebar-section-actions.blade.php b/resources/views/books/parts/index-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..8f8b254c819
--- /dev/null
+++ b/resources/views/books/parts/index-sidebar-section-actions.blade.php
@@ -0,0 +1,25 @@
+<div id="actions" class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+        @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
+            <a href="{{ url("/create-book") }}" data-shortcut="new" class="icon-list-item">
+                <span>@icon('add')</span>
+                <span>{{ trans('entities.books_create') }}</span>
+            </a>
+        @endif
+
+        @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
+
+        <a href="{{ url('/tags') }}" class="icon-list-item">
+            <span>@icon('tag')</span>
+            <span>{{ trans('entities.tags_view_tags') }}</span>
+        </a>
+
+        @if(userCan(\BookStack\Permissions\Permission::ContentImport))
+            <a href="{{ url('/import') }}" class="icon-list-item">
+                <span>@icon('upload')</span>
+                <span>{{ trans('entities.import') }}</span>
+            </a>
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/books/parts/index-sidebar-section-new.blade.php b/resources/views/books/parts/index-sidebar-section-new.blade.php
new file mode 100644
index 00000000000..a9aa52c5910
--- /dev/null
+++ b/resources/views/books/parts/index-sidebar-section-new.blade.php
@@ -0,0 +1,8 @@
+<div id="new" class="mb-xl">
+    <h5>{{ trans('entities.books_new') }}</h5>
+    @if(count($new) > 0)
+        @include('entities.list', ['entities' => $new, 'style' => 'compact'])
+    @else
+        <p class="text-muted pb-l mb-none">{{ trans('entities.books_new_empty') }}</p>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/books/parts/index-sidebar-section-popular.blade.php b/resources/views/books/parts/index-sidebar-section-popular.blade.php
new file mode 100644
index 00000000000..030c75eb9a7
--- /dev/null
+++ b/resources/views/books/parts/index-sidebar-section-popular.blade.php
@@ -0,0 +1,8 @@
+<div id="popular" class="mb-xl">
+    <h5>{{ trans('entities.books_popular') }}</h5>
+    @if(count($popular) > 0)
+        @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
+    @else
+        <p class="text-muted pb-l mb-none">{{ trans('entities.books_popular_empty') }}</p>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/books/parts/index-sidebar-section-recents.blade.php b/resources/views/books/parts/index-sidebar-section-recents.blade.php
new file mode 100644
index 00000000000..f1a68ba4f99
--- /dev/null
+++ b/resources/views/books/parts/index-sidebar-section-recents.blade.php
@@ -0,0 +1,6 @@
+@if($recents)
+    <div id="recents" class="mb-xl">
+        <h5>{{ trans('entities.recently_viewed') }}</h5>
+        @include('entities.list', ['entities' => $recents, 'style' => 'compact'])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/books/parts/list-item.blade.php b/resources/views/books/parts/list-item.blade.php
index a3ff0971f11..0852670fe6d 100644
--- a/resources/views/books/parts/list-item.blade.php
+++ b/resources/views/books/parts/list-item.blade.php
@@ -1,11 +1,16 @@
+@php
+    /**
+     * @var \BookStack\Entities\Models\Book $book
+     */
+@endphp
 <a href="{{ $book->getUrl() }}" class="book entity-list-item" data-entity-type="book" data-entity-id="{{$book->id}}">
-    <div class="entity-list-item-image bg-book" style="background-image: url('{{ $book->getBookCover() }}')">
+    <div class="entity-list-item-image bg-book" style="background-image: url('{{ $book->coverInfo()->getUrl() }}')">
         @icon('book')
     </div>
     <div class="content">
         <h4 class="entity-list-item-name break-text">{{ $book->name }}</h4>
         <div class="entity-item-snippet">
-            <p class="text-muted break-text mb-s text-limit-lines-1">{{ $book->description }}</p>
+            <p class="text-muted break-text mb-s text-limit-lines-1">{{ $book->descriptionInfo()->getPlain() }}</p>
         </div>
     </div>
 </a>
\ No newline at end of file
diff --git a/resources/views/books/parts/show-sidebar-section-actions.blade.php b/resources/views/books/parts/show-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..8e5b5c4d74a
--- /dev/null
+++ b/resources/views/books/parts/show-sidebar-section-actions.blade.php
@@ -0,0 +1,61 @@
+<div class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+
+        @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))
+            <a href="{{ $book->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
+                <span>@icon('add')</span>
+                <span>{{ trans('entities.pages_new') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))
+            <a href="{{ $book->getUrl('/create-chapter') }}" data-shortcut="new" class="icon-list-item">
+                <span>@icon('add')</span>
+                <span>{{ trans('entities.chapters_new') }}</span>
+            </a>
+        @endif
+
+        <hr class="primary-background">
+
+        @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))
+            <a href="{{ $book->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
+                <span>@icon('edit')</span>
+                <span>{{ trans('common.edit') }}</span>
+            </a>
+            <a href="{{ $book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
+                <span>@icon('sort')</span>
+                <span>{{ trans('common.sort') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
+            <a href="{{ $book->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
+                <span>@icon('copy')</span>
+                <span>{{ trans('common.copy') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
+            <a href="{{ $book->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
+                <span>@icon('lock')</span>
+                <span>{{ trans('entities.permissions') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book))
+            <a href="{{ $book->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
+                <span>@icon('delete')</span>
+                <span>{{ trans('common.delete') }}</span>
+            </a>
+        @endif
+
+        <hr class="primary-background">
+
+        @if($watchOptions->canWatch() && !$watchOptions->isWatching())
+            @include('entities.watch-action', ['entity' => $book])
+        @endif
+        @if(!user()->isGuest())
+            @include('entities.favourite-action', ['entity' => $book])
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ContentExport))
+            @include('entities.export-menu', ['entity' => $book])
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/books/parts/show-sidebar-section-activity.blade.php b/resources/views/books/parts/show-sidebar-section-activity.blade.php
new file mode 100644
index 00000000000..c1c5c1d3ecf
--- /dev/null
+++ b/resources/views/books/parts/show-sidebar-section-activity.blade.php
@@ -0,0 +1,6 @@
+@if(count($activity) > 0)
+    <div id="recent-activity" class="mb-xl">
+        <h5>{{ trans('entities.recent_activity') }}</h5>
+        @include('common.activity-list', ['activity' => $activity])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/books/parts/show-sidebar-section-details.blade.php b/resources/views/books/parts/show-sidebar-section-details.blade.php
new file mode 100644
index 00000000000..2c3d6d141dd
--- /dev/null
+++ b/resources/views/books/parts/show-sidebar-section-details.blade.php
@@ -0,0 +1,21 @@
+<div class="mb-xl">
+    <h5>{{ trans('common.details') }}</h5>
+    <div class="blended-links">
+        @include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions, 'referenceCount' => $referenceCount])
+        @if($book->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
+                    <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/books/parts/show-sidebar-section-shelves.blade.php b/resources/views/books/parts/show-sidebar-section-shelves.blade.php
new file mode 100644
index 00000000000..9704c180c43
--- /dev/null
+++ b/resources/views/books/parts/show-sidebar-section-shelves.blade.php
@@ -0,0 +1,6 @@
+@if(count($shelves) > 0)
+    <div class="actions mb-xl">
+        <h5>{{ trans('entities.shelves') }}</h5>
+        @include('entities.list', ['entities' => $shelves, 'style' => 'compact'])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/books/parts/show-sidebar-section-tags.blade.php b/resources/views/books/parts/show-sidebar-section-tags.blade.php
new file mode 100644
index 00000000000..440a780c814
--- /dev/null
+++ b/resources/views/books/parts/show-sidebar-section-tags.blade.php
@@ -0,0 +1,5 @@
+@if($book->tags->count() > 0)
+    <div class="mb-xl">
+        @include('entities.tag-list', ['entity' => $book])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index e28d9564829..b2fa0b3932b 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -8,8 +8,8 @@
 
 @push('social-meta')
     <meta property="og:description" content="{{ Str::limit($book->description, 100, '...') }}">
-    @if($book->cover)
-        <meta property="og:image" content="{{ $book->getBookCover() }}">
+    @if($book->coverInfo()->exists())
+        <meta property="og:image" content="{{ $book->coverInfo()->getUrl() }}">
     @endif
 @endpush
 
@@ -26,7 +26,7 @@
     <main class="content-wrap card">
         <h1 class="break-text">{{$book->name}}</h1>
         <div refs="entity-search@contentView" class="book-content">
-            <div class="text-muted break-text">{!! $book->descriptionHtml() !!}</div>
+            <div class="text-muted break-text">{!! $book->descriptionInfo()->getHtml() !!}</div>
             @if(count($bookChildren) > 0)
                 <div class="entity-list book-contents">
                     @foreach($bookChildren as $childElement)
@@ -66,115 +66,10 @@
 
 @stop
 
-@section('right')
-    <div class="mb-xl">
-        <h5>{{ trans('common.details') }}</h5>
-        <div class="blended-links">
-            @include('entities.meta', ['entity' => $book, 'watchOptions' => $watchOptions])
-            @if($book->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
-                        <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-        </div>
-    </div>
-
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-
-            @if(userCan(\BookStack\Permissions\Permission::PageCreate, $book))
-                <a href="{{ $book->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.pages_new') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ChapterCreate, $book))
-                <a href="{{ $book->getUrl('/create-chapter') }}" data-shortcut="new" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.chapters_new') }}</span>
-                </a>
-            @endif
-
-            <hr class="primary-background">
-
-            @if(userCan(\BookStack\Permissions\Permission::BookUpdate, $book))
-                <a href="{{ $book->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
-                    <span>@icon('edit')</span>
-                    <span>{{ trans('common.edit') }}</span>
-                </a>
-                <a href="{{ $book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
-                    <span>@icon('sort')</span>
-                    <span>{{ trans('common.sort') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
-                <a href="{{ $book->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
-                    <span>@icon('copy')</span>
-                    <span>{{ trans('common.copy') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
-                <a href="{{ $book->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
-                    <span>@icon('lock')</span>
-                    <span>{{ trans('entities.permissions') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::BookDelete, $book))
-                <a href="{{ $book->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
-                    <span>@icon('delete')</span>
-                    <span>{{ trans('common.delete') }}</span>
-                </a>
-            @endif
-
-            <hr class="primary-background">
-
-            @if($watchOptions->canWatch() && !$watchOptions->isWatching())
-                @include('entities.watch-action', ['entity' => $book])
-            @endif
-            @if(!user()->isGuest())
-                @include('entities.favourite-action', ['entity' => $book])
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
-                @include('entities.export-menu', ['entity' => $book])
-            @endif
-        </div>
-    </div>
-
-@stop
-
 @section('left')
-
-    @include('entities.search-form', ['label' => trans('entities.books_search_this')])
-
-    @if($book->tags->count() > 0)
-        <div class="mb-xl">
-            @include('entities.tag-list', ['entity' => $book])
-        </div>
-    @endif
-
-    @if(count($bookParentShelves) > 0)
-        <div class="actions mb-xl">
-            <h5>{{ trans('entities.shelves') }}</h5>
-            @include('entities.list', ['entities' => $bookParentShelves, 'style' => 'compact'])
-        </div>
-    @endif
-
-    @if(count($activity) > 0)
-        <div id="recent-activity" class="mb-xl">
-            <h5>{{ trans('entities.recent_activity') }}</h5>
-            @include('common.activity-list', ['activity' => $activity])
-        </div>
-    @endif
+    @include('common.view-blocks', ['location' => 'books-show', 'position' => 'left'])
 @stop
 
+@section('right')
+    @include('common.view-blocks', ['location' => 'books-show', 'position' => 'right'])
+@stop
diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index e090708b1d7..37a87d9abfc 100644
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -20,7 +20,12 @@
                     <h1 class="list-heading">{{ trans('entities.books_sort') }}</h1>
 
                     <div class="flex-container-row gap-m wrap mb-m">
-                        <p class="text-muted flex min-width-s mb-none">{{ trans('entities.books_sort_desc') }}</p>
+                        <div class="flex min-width-s">
+                            <p class="text-muted  mb-none">{{ trans('entities.books_sort_desc') }}</p>
+                            @if(!userCan(\BookStack\Permissions\Permission::SettingsManage))
+                                <p class="text-muted mb-none mt-s small">{{ trans('entities.books_sort_auto_sort_creation_hint') }}</p>
+                            @endif
+                        </div>
                         <div class="min-width-s">
                             @php
                                 $autoSortVal = intval(old('auto-sort') ?? $book->sort_rule_id ?? 0);
@@ -41,6 +46,11 @@ class="{{ $errors->has('auto-sort') ? 'neg' : '' }}">
                                     </option>
                                 @endforeach
                             </select>
+                            @if(userCan(\BookStack\Permissions\Permission::SettingsManage))
+                                <p class="small">
+                                    <a href="{{ url('/settings/sorting/rules/new') }}" class="text-button" target="_blank">{{ trans('settings.sort_rule_create') }}</a>
+                                </p>
+                            @endif
                         </div>
                     </div>
 
diff --git a/resources/views/chapters/parts/show-sidebar-section-actions.blade.php b/resources/views/chapters/parts/show-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..55df999a22c
--- /dev/null
+++ b/resources/views/chapters/parts/show-sidebar-section-actions.blade.php
@@ -0,0 +1,65 @@
+<div class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+
+        @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))
+            <a href="{{ $chapter->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
+                <span>@icon('add')</span>
+                <span>{{ trans('entities.pages_new') }}</span>
+            </a>
+        @endif
+
+        <hr class="primary-background"/>
+
+        @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter))
+            <a href="{{ $chapter->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
+                <span>@icon('edit')</span>
+                <span>{{ trans('common.edit') }}</span>
+            </a>
+        @endif
+        @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCan(\BookStack\Permissions\Permission::ChapterCreateAll) || userCan(\BookStack\Permissions\Permission::ChapterCreateOwn))
+            <a href="{{ $chapter->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
+                <span>@icon('copy')</span>
+                <span>{{ trans('common.copy') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter) && userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
+            <a href="{{ $chapter->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
+                <span>@icon('folder')</span>
+                <span>{{ trans('common.move') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
+            <a href="{{ $chapter->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
+                <span>@icon('lock')</span>
+                <span>{{ trans('entities.permissions') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
+            <a href="{{ $chapter->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
+                <span>@icon('delete')</span>
+                <span>{{ trans('common.delete') }}</span>
+            </a>
+        @endif
+
+        @if($chapter->book && userCan(\BookStack\Permissions\Permission::BookUpdate, $chapter->book))
+            <hr class="primary-background"/>
+            <a href="{{ $chapter->book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
+                <span>@icon('sort')</span>
+                <span>{{ trans('entities.chapter_sort_book') }}</span>
+            </a>
+        @endif
+
+        <hr class="primary-background"/>
+
+        @if($watchOptions->canWatch() && !$watchOptions->isWatching())
+            @include('entities.watch-action', ['entity' => $chapter])
+        @endif
+        @if(!user()->isGuest())
+            @include('entities.favourite-action', ['entity' => $chapter])
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ContentExport))
+            @include('entities.export-menu', ['entity' => $chapter])
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/chapters/parts/show-sidebar-section-details.blade.php b/resources/views/chapters/parts/show-sidebar-section-details.blade.php
new file mode 100644
index 00000000000..a424b8d3fac
--- /dev/null
+++ b/resources/views/chapters/parts/show-sidebar-section-details.blade.php
@@ -0,0 +1,38 @@
+<div class="mb-xl">
+    <h5>{{ trans('common.details') }}</h5>
+    <div class="blended-links">
+        @include('entities.meta', ['entity' => $chapter, 'watchOptions' => $watchOptions])
+
+        @if($book->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
+                    <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+
+        @if($chapter->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
+                    <a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/chapters/parts/show-sidebar-section-tags.blade.php b/resources/views/chapters/parts/show-sidebar-section-tags.blade.php
new file mode 100644
index 00000000000..d28ff63833e
--- /dev/null
+++ b/resources/views/chapters/parts/show-sidebar-section-tags.blade.php
@@ -0,0 +1,5 @@
+@if($chapter->tags->count() > 0)
+    <div class="mb-xl">
+        @include('entities.tag-list', ['entity' => $chapter])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index da914b32d21..2c481ee14fa 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -24,7 +24,7 @@
     <main class="content-wrap card">
         <h1 class="break-text">{{ $chapter->name }}</h1>
         <div refs="entity-search@contentView" class="chapter-content">
-            <div class="text-muted break-text">{!! $chapter->descriptionHtml() !!}</div>
+            <div class="text-muted break-text">{!! $chapter->descriptionInfo()->getHtml() !!}</div>
             @if(count($pages) > 0)
                 <div class="entity-list book-contents">
                     @foreach($pages as $page)
@@ -62,125 +62,10 @@
 
 @stop
 
-@section('right')
-
-    <div class="mb-xl">
-        <h5>{{ trans('common.details') }}</h5>
-        <div class="blended-links">
-            @include('entities.meta', ['entity' => $chapter, 'watchOptions' => $watchOptions])
-
-            @if($book->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
-                        <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-
-            @if($chapter->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
-                        <a href="{{ $chapter->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-        </div>
-    </div>
-
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-
-            @if(userCan(\BookStack\Permissions\Permission::PageCreate, $chapter))
-                <a href="{{ $chapter->getUrl('/create-page') }}" data-shortcut="new" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.pages_new') }}</span>
-                </a>
-            @endif
-
-            <hr class="primary-background"/>
-
-            @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter))
-                <a href="{{ $chapter->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
-                    <span>@icon('edit')</span>
-                    <span>{{ trans('common.edit') }}</span>
-                </a>
-            @endif
-            @if(userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCan(\BookStack\Permissions\Permission::ChapterCreateAll) || userCan(\BookStack\Permissions\Permission::ChapterCreateOwn))
-                <a href="{{ $chapter->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
-                    <span>@icon('copy')</span>
-                    <span>{{ trans('common.copy') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ChapterUpdate, $chapter) && userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
-                <a href="{{ $chapter->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
-                    <span>@icon('folder')</span>
-                    <span>{{ trans('common.move') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $chapter))
-                <a href="{{ $chapter->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
-                    <span>@icon('lock')</span>
-                    <span>{{ trans('entities.permissions') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ChapterDelete, $chapter))
-                <a href="{{ $chapter->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
-                    <span>@icon('delete')</span>
-                    <span>{{ trans('common.delete') }}</span>
-                </a>
-            @endif
-
-            @if($chapter->book && userCan(\BookStack\Permissions\Permission::BookUpdate, $chapter->book))
-                <hr class="primary-background"/>
-                <a href="{{ $chapter->book->getUrl('/sort') }}" data-shortcut="sort" class="icon-list-item">
-                    <span>@icon('sort')</span>
-                    <span>{{ trans('entities.chapter_sort_book') }}</span>
-                </a>
-            @endif
-
-            <hr class="primary-background"/>
-
-            @if($watchOptions->canWatch() && !$watchOptions->isWatching())
-                @include('entities.watch-action', ['entity' => $chapter])
-            @endif
-            @if(!user()->isGuest())
-                @include('entities.favourite-action', ['entity' => $chapter])
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
-                @include('entities.export-menu', ['entity' => $chapter])
-            @endif
-        </div>
-    </div>
-@stop
-
 @section('left')
-
-    @include('entities.search-form', ['label' => trans('entities.chapters_search_this')])
-
-    @if($chapter->tags->count() > 0)
-        <div class="mb-xl">
-            @include('entities.tag-list', ['entity' => $chapter])
-        </div>
-    @endif
-
-    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('common.view-blocks', ['location' => 'chapters-show', 'position' => 'left'])
 @stop
 
-
+@section('right')
+    @include('common.view-blocks', ['location' => 'chapters-show', 'position' => 'right'])
+@stop
diff --git a/resources/views/common/view-blocks.blade.php b/resources/views/common/view-blocks.blade.php
new file mode 100644
index 00000000000..98fafbb37dd
--- /dev/null
+++ b/resources/views/common/view-blocks.blade.php
@@ -0,0 +1,10 @@
+{{--
+$location - string
+$position - string
+--}}
+@php
+    $sectionVars = get_defined_vars();
+@endphp
+@foreach($viewBlocks->getInstancesForLocationAndPositionForCurrentUser($location, $position) as $block)
+    @include($block->getView($sectionVars), $block->getViewData($sectionVars))
+@endforeach
\ No newline at end of file
diff --git a/resources/views/entities/book-tree.blade.php b/resources/views/entities/book-tree.blade.php
index c95b1eebc43..81dbd302e2b 100644
--- a/resources/views/entities/book-tree.blade.php
+++ b/resources/views/entities/book-tree.blade.php
@@ -11,7 +11,7 @@ class="book-tree mb-xl"
             </li>
         @endif
 
-        @foreach($sidebarTree as $bookChild)
+        @foreach($bookTree as $bookChild)
             <li class="list-item-{{ $bookChild->getType() }} {{ $bookChild->getType() }} {{ $bookChild->isA('page') && $bookChild->draft ? 'draft' : '' }}">
                 @include('entities.list-item-basic', ['entity' => $bookChild, 'classes' => $current->matches($bookChild)? 'selected' : ''])
 
diff --git a/resources/views/entities/grid-item.blade.php b/resources/views/entities/grid-item.blade.php
index 17c54e26353..e64d0f42cd8 100644
--- a/resources/views/entities/grid-item.blade.php
+++ b/resources/views/entities/grid-item.blade.php
@@ -1,7 +1,7 @@
 <a href="{{ $entity->getUrl() }}" class="grid-card"
    data-entity-type="{{ $entity->getType() }}" data-entity-id="{{ $entity->id }}">
     <div class="bg-{{ $entity->getType() }} featured-image-container-wrap">
-        <div class="featured-image-container" @if($entity->cover) style="background-image: url('{{ $entity->getBookCover() }}')"@endif>
+        <div class="featured-image-container" @if($entity->coverInfo()->exists()) style="background-image: url('{{ $entity->coverInfo()->getUrl() }}')"@endif>
         </div>
         @icon($entity->getType())
     </div>
diff --git a/resources/views/entities/meta.blade.php b/resources/views/entities/meta.blade.php
index 060c197a466..6c425a2401b 100644
--- a/resources/views/entities/meta.blade.php
+++ b/resources/views/entities/meta.blade.php
@@ -9,7 +9,7 @@
         </div>
     @endif
 
-    @if ($entity->isA('page'))
+    @if ($entity->isA('page') && userCan(\BookStack\Permissions\Permission::RevisionViewAll))
         <a href="{{ $entity->getUrl('/revisions') }}" class="entity-meta-item">
             @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }}
         </a>
diff --git a/resources/views/errors/debug.blade.php b/resources/views/errors/debug.blade.php
index e7155431c86..969c49595ef 100644
--- a/resources/views/errors/debug.blade.php
+++ b/resources/views/errors/debug.blade.php
@@ -113,13 +113,13 @@
                     <a href="https://www.bookstackapp.com/docs/admin/debugging/" target="_blank">Review BookStack debugging documentation &raquo;</a>
                 </li>
                 <li>
-                    <a href="https://github.com/BookStackApp/BookStack/releases" target="_blank">Ensure your instance is up-to-date &raquo;</a>
+                    <a href="https://codeberg.org/bookstack/bookstack/releases" target="_blank">Ensure your instance is up-to-date &raquo;</a>
                 </li>
                 <li>
-                    <a href="https://github.com/BookStackApp/BookStack/issues?q=is%3Aissue+{{ urlencode($error) }}" target="_blank">Search for the issue on GitHub &raquo;</a>
+                    <a href="https://codeberg.org/bookstack/bookstack/issues?q={{ urlencode($error) }}" target="_blank">Search for the issue on GitHub &raquo;</a>
                 </li>
                 <li>
-                    <a href="https://discord.gg/ztkBqR2" target="_blank">Ask for help via Discord &raquo;</a>
+                    <a href="https://community.bookstackapp.com" target="_blank">Ask for help in our community forums &raquo;</a>
                 </li>
                 <li>
                     <a href="https://duckduckgo.com/?q={{urlencode("BookStack {$error}")}}" target="_blank">Search the error message &raquo;</a>
diff --git a/resources/views/exports/book.blade.php b/resources/views/exports/book.blade.php
index 9de7b8eba6c..8935c515184 100644
--- a/resources/views/exports/book.blade.php
+++ b/resources/views/exports/book.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 
     <h1 style="font-size: 4.8em">{{$book->name}}</h1>
-    <div>{!! $book->descriptionHtml() !!}</div>
+    <div>{!! $book->descriptionInfo()->getHtml() !!}</div>
 
     @include('exports.parts.book-contents-menu', ['children' => $bookChildren])
 
diff --git a/resources/views/exports/chapter.blade.php b/resources/views/exports/chapter.blade.php
index 515366d60e3..46a07388749 100644
--- a/resources/views/exports/chapter.blade.php
+++ b/resources/views/exports/chapter.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 
     <h1 style="font-size: 4.8em">{{$chapter->name}}</h1>
-    <div>{!! $chapter->descriptionHtml() !!}</div>
+    <div>{!! $chapter->descriptionInfo()->getHtml() !!}</div>
 
     @include('exports.parts.chapter-contents-menu', ['pages' => $pages])
 
diff --git a/resources/views/exports/parts/chapter-item.blade.php b/resources/views/exports/parts/chapter-item.blade.php
index fa0b1f22884..beb3b8abbe9 100644
--- a/resources/views/exports/parts/chapter-item.blade.php
+++ b/resources/views/exports/parts/chapter-item.blade.php
@@ -1,7 +1,7 @@
 <div class="page-break"></div>
 <h1 id="chapter-{{$chapter->id}}">{{ $chapter->name }}</h1>
 
-<div>{!! $chapter->descriptionHtml() !!}</div>
+<div>{!! $chapter->descriptionInfo()->getHtml() !!}</div>
 
 @if(count($chapter->visible_pages) > 0)
     @foreach($chapter->visible_pages as $page)
diff --git a/resources/views/exports/parts/meta.blade.php b/resources/views/exports/parts/meta.blade.php
index 00117f4a157..07eff14a470 100644
--- a/resources/views/exports/parts/meta.blade.php
+++ b/resources/views/exports/parts/meta.blade.php
@@ -1,5 +1,5 @@
 <div class="entity-meta">
-    @if ($entity->isA('page'))
+    @if ($entity->isA('page') && userCan(\BookStack\Permissions\Permission::RevisionViewAll))
         @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }} <br>
     @endif
 
diff --git a/resources/views/form/custom-checkbox.blade.php b/resources/views/form/custom-checkbox.blade.php
index 7750c6f0007..9d799c861d7 100644
--- a/resources/views/form/custom-checkbox.blade.php
+++ b/resources/views/form/custom-checkbox.blade.php
@@ -1,13 +1,21 @@
 {{--
-$name
-$value
-$checked
-$label
+$name - string
+$value - string
+$checked - boolean
+$disabled - boolean
+$label - string
+$ariaLabel? (optional, intended for use if $label is non-visble/empty)
 --}}
-<label component="custom-checkbox" class="toggle-switch @if($errors->has($name)) text-neg @endif">
-    <input type="checkbox" name="{{$name}}" value="{{ $value }}" @if($checked) checked="checked" @endif @if($disabled ?? false) disabled="disabled" @endif>
-    <span tabindex="0" role="checkbox"
-          aria-checked="{{ $checked ? 'true' : 'false' }}"
-          class="custom-checkbox text-primary">@icon('check')</span>
-    <span class="label">{{$label}}</span>
+<label id="custom-checkbox-label-{{ $name }}" class="custom-checkbox @if($errors->has($name)) text-neg @endif">
+    <input type="checkbox"
+           name="{{ $name }}"
+           value="{{ $value }}"
+           @if($checked) checked="checked" @endif
+           @if(isset($ariaLabel))
+               aria-label="{{ $ariaLabel }}"
+           @else
+               aria-labelledby="custom-checkbox-label-{{ $name }}"
+           @endif
+           @if($disabled ?? false) disabled="disabled" @endif>
+    <span class="label">{{ $label }}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/form/description-html-input.blade.php b/resources/views/form/description-html-input.blade.php
index 52244eda6f9..4b0a74df1b3 100644
--- a/resources/views/form/description-html-input.blade.php
+++ b/resources/views/form/description-html-input.blade.php
@@ -1,7 +1,7 @@
 <textarea component="wysiwyg-input"
           option:wysiwyg-input:text-direction="{{ $locale->htmlDirection() }}"
           id="description_html" name="description_html" rows="5"
-          @if($errors->has('description_html')) class="text-neg" @endif>@if(isset($model) || old('description_html')){{ old('description_html') ?? $model->descriptionHtml()}}@endif</textarea>
+          @if($errors->has('description_html')) class="text-neg" @endif>@if(isset($model) || old('description_html')){{ old('description_html') ?? $model->descriptionInfo()->getHtml() }}@else{{ '<p></p>' }}@endif</textarea>
 @if($errors->has('description_html'))
     <div class="text-neg text-small">{{ $errors->first('description_html') }}</div>
 @endif
\ No newline at end of file
diff --git a/resources/views/form/number.blade.php b/resources/views/form/number.blade.php
index a37cd36941c..b70b7e8db3c 100644
--- a/resources/views/form/number.blade.php
+++ b/resources/views/form/number.blade.php
@@ -6,7 +6,8 @@
        @if($readonly ?? false) readonly="readonly" @endif
        @if($min ?? false) min="{{ $min }}" @endif
        @if($max ?? false) max="{{ $max }}" @endif
-       @if(isset($model) || old($name)) value="{{ old($name) ? old($name) : $model->$name}}" @endif>
+       @if($step ?? false) step="{{ $step }}" @endif
+       @if(isset($model) || old($name) || isset($value)) value="{{ old($name) ?? $model->$name ?? $value }}" @endif>
 @if($errors->has($name))
     <div class="text-neg text-small">{{ $errors->first($name) }}</div>
 @endif
diff --git a/resources/views/form/role-checkboxes.blade.php b/resources/views/form/role-checkboxes.blade.php
index b7b969d8973..487fa18b851 100644
--- a/resources/views/form/role-checkboxes.blade.php
+++ b/resources/views/form/role-checkboxes.blade.php
@@ -1,5 +1,5 @@
 
-<div class="toggle-switch-list dual-column-content">
+<div class="custom-checkbox-list dual-column-content">
     <input type="hidden" name="{{ $name }}[0]" value="0">
     @foreach($roles as $role)
         <div>
diff --git a/resources/views/form/toggle-switch.blade.php b/resources/views/form/toggle-switch.blade.php
index 375eda3d7b5..9f665155f9a 100644
--- a/resources/views/form/toggle-switch.blade.php
+++ b/resources/views/form/toggle-switch.blade.php
@@ -1,8 +1,7 @@
-<label components="custom-checkbox toggle-switch" class="toggle-switch">
-    <input type="hidden" name="{{$name}}" value="{{$value?'true':'false'}}"/>
-    <input type="checkbox" @if($value) checked="checked" @endif>
-    <span tabindex="0" role="checkbox"
-          aria-checked="{{ $value ? 'true' : 'false' }}"
-          class="custom-checkbox text-primary">@icon('check')</span>
+<label component="toggle-switch" id="toggle-switch-label-{{ $name }}" class="custom-checkbox">
+    <input type="hidden" name="{{ $name }}" value="{{ $value ? 'true' : 'false' }}"/>
+    <input type="checkbox"
+           aria-labelledby="toggle-switch-label-{{ $name }}"
+           @if($value) checked="checked" @endif>
     <span class="label">{{ $label }}</span>
 </label>
\ No newline at end of file
diff --git a/resources/views/form/user-mention-list.blade.php b/resources/views/form/user-mention-list.blade.php
new file mode 100644
index 00000000000..020cfb35b9d
--- /dev/null
+++ b/resources/views/form/user-mention-list.blade.php
@@ -0,0 +1,14 @@
+@if($users->isEmpty())
+    <div class="flex-container-row items-center dropdown-search-item dropdown-search-item text-muted mt-m">
+        <span>{{ trans('common.no_items') }}</span>
+    </div>
+@endif
+@foreach($users as $user)
+<a href="{{ $user->getProfileUrl() }}" class="flex-container-row items-center dropdown-search-item"
+   data-id="{{ $user->id }}"
+   data-name="{{ $user->name }}"
+   data-slug="{{ $user->slug }}">
+    <img class="avatar mr-m" src="{{ $user->getAvatar(30) }}" alt="{{ $user->name }}">
+    <span>{{ $user->name }}</span>
+</a>
+@endforeach
\ No newline at end of file
diff --git a/resources/views/home/books.blade.php b/resources/views/home/books.blade.php
index afd3f30fce2..3c4225b5636 100644
--- a/resources/views/home/books.blade.php
+++ b/resources/views/home/books.blade.php
@@ -5,26 +5,9 @@
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
-                <a href="{{ url("/create-book") }}" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.books_create') }}</span>
-                </a>
-            @endif
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
diff --git a/resources/views/home/default.blade.php b/resources/views/home/default.blade.php
index a546ddecacb..508631c8cdb 100644
--- a/resources/views/home/default.blade.php
+++ b/resources/views/home/default.blade.php
@@ -16,65 +16,16 @@
     <div class="container" id="home-default">
         <div class="grid third gap-x-xxl no-row-gap">
             <div>
-                @if(count($draftPages) > 0)
-                    <div id="recent-drafts" class="card mb-xl">
-                        <h3 class="card-title">{{ trans('entities.my_recent_drafts') }}</h3>
-                        <div class="px-m">
-                            @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
-                        </div>
-                    </div>
-                @endif
-
-                <div id="{{ auth()->check() ? 'recently-viewed' : 'recent-books' }}" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h3>
-                    <div class="px-m">
-                        @include('entities.list', [
-                        'entities' => $recents,
-                        'style' => 'compact',
-                        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-                        ])
-                    </div>
-                </div>
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'left'])
             </div>
 
             <div>
-                @if(count($favourites) > 0)
-                    <div id="top-favourites" class="card mb-xl">
-                        <h3 class="card-title">{{ trans('entities.my_most_viewed_favourites') }}</h3>
-                        <div class="px-m">
-                            @include('entities.list', [
-                            'entities' => $favourites,
-                            'style' => 'compact',
-                            ])
-                        </div>
-                        <a href="{{ url('/favourites')  }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
-                    </div>
-                @endif
-
-                <div id="recent-pages" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.recently_updated_pages') }}</h3>
-                    <div id="recently-updated-pages" class="px-m">
-                        @include('entities.list', [
-                        'entities' => $recentlyUpdatedPages,
-                        'style' => 'compact',
-                        'emptyText' => trans('entities.no_pages_recently_updated'),
-                        ])
-                    </div>
-                    @if(count($recentlyUpdatedPages) > 0)
-                        <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
-                    @endif
-                </div>
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'center'])
             </div>
 
             <div>
-                <div id="recent-activity" class="card mb-xl">
-                    <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
-                    <div class="px-m">
-                        @include('common.activity-list', ['activity' => $activity])
-                    </div>
-                </div>
+                @include('common.view-blocks', ['location' => 'home-default', 'position' => 'right'])
             </div>
-
         </div>
     </div>
 
diff --git a/resources/views/home/parts/configured-section-actions.blade.php b/resources/views/home/parts/configured-section-actions.blade.php
new file mode 100644
index 00000000000..6386670d5b9
--- /dev/null
+++ b/resources/views/home/parts/configured-section-actions.blade.php
@@ -0,0 +1,36 @@
+{{--
+$homeView - string - The type of home view being used
+$view - string - Configured view type from parent (for books/shelves list/grid view)
+--}}
+<div class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+        @if($homeView === 'books')
+            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll))
+                <a href="{{ url("/create-book") }}" class="icon-list-item">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.books_create') }}</span>
+                </a>
+            @endif
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'books'])
+            <a href="{{ url('/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>
+        @elseif ($homeView === 'bookshelves')
+            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
+                <a href="{{ url("/create-shelf") }}" class="icon-list-item">
+                    <span>@icon('add')</span>
+                    <span>{{ trans('entities.shelves_new_action') }}</span>
+                </a>
+            @endif
+            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
+            <a href="{{ url('/tags') }}" class="icon-list-item">
+                <span>@icon('tag')</span>
+                <span>{{ trans('entities.tags_view_tags') }}</span>
+            </a>
+        @endif
+        @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
+        @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/configured-section-recent-activity.blade.php b/resources/views/home/parts/configured-section-recent-activity.blade.php
new file mode 100644
index 00000000000..8a82f90061f
--- /dev/null
+++ b/resources/views/home/parts/configured-section-recent-activity.blade.php
@@ -0,0 +1,7 @@
+{{--
+$activity - array
+--}}
+<div id="recent-activity" class="mb-xl">
+    <h5>{{ trans('entities.recent_activity') }}</h5>
+    @include('common.activity-list', ['activity' => $activity])
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/configured-section-recent-drafts.blade.php b/resources/views/home/parts/configured-section-recent-drafts.blade.php
new file mode 100644
index 00000000000..648f541556d
--- /dev/null
+++ b/resources/views/home/parts/configured-section-recent-drafts.blade.php
@@ -0,0 +1,9 @@
+{{--
+$draftPages - array
+--}}
+@if(count($draftPages) > 0)
+    <div id="recent-drafts" class="mb-xl">
+        <h5>{{ trans('entities.my_recent_drafts') }}</h5>
+        @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/configured-section-recently-updated-pages.blade.php b/resources/views/home/parts/configured-section-recently-updated-pages.blade.php
new file mode 100644
index 00000000000..290c385a169
--- /dev/null
+++ b/resources/views/home/parts/configured-section-recently-updated-pages.blade.php
@@ -0,0 +1,14 @@
+{{--
+$recentlyUpdatedPages - array
+--}}
+<div class="mb-xl">
+    <h5>{{ trans('entities.recently_updated_pages') }}</h5>
+    <div id="recently-updated-pages">
+        @include('entities.list', [
+        'entities' => $recentlyUpdatedPages,
+        'style' => 'compact',
+        'emptyText' => trans('entities.no_pages_recently_updated')
+        ])
+    </div>
+    <a href="{{ url('/pages/recently-updated')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/configured-section-recently-viewed-or-recent-books.blade.php b/resources/views/home/parts/configured-section-recently-viewed-or-recent-books.blade.php
new file mode 100644
index 00000000000..d9c6edea811
--- /dev/null
+++ b/resources/views/home/parts/configured-section-recently-viewed-or-recent-books.blade.php
@@ -0,0 +1,11 @@
+{{--
+$recents - array
+--}}
+<div class="mb-xl">
+    <h5>{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h5>
+    @include('entities.list', [
+        'entities' => $recents,
+        'style' => 'compact',
+        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+        ])
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/configured-section-top-favourites.blade.php b/resources/views/home/parts/configured-section-top-favourites.blade.php
new file mode 100644
index 00000000000..09b33b17655
--- /dev/null
+++ b/resources/views/home/parts/configured-section-top-favourites.blade.php
@@ -0,0 +1,13 @@
+{{--
+$favourites - array
+--}}
+@if(count($favourites) > 0)
+    <div id="top-favourites" class="mb-xl">
+        <h5>{{ trans('entities.my_most_viewed_favourites') }}</h5>
+        @include('entities.list', [
+            'entities' => $favourites,
+            'style' => 'compact',
+        ])
+        <a href="{{ url('/favourites')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recent-activity.blade.php b/resources/views/home/parts/default-card-recent-activity.blade.php
new file mode 100644
index 00000000000..c848ff1bca5
--- /dev/null
+++ b/resources/views/home/parts/default-card-recent-activity.blade.php
@@ -0,0 +1,9 @@
+{{--
+$activity - array
+--}}
+<div id="recent-activity" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.recent_activity') }}</h3>
+    <div class="px-m">
+        @include('common.activity-list', ['activity' => $activity])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recent-drafts.blade.php b/resources/views/home/parts/default-card-recent-drafts.blade.php
new file mode 100644
index 00000000000..d9d7a51304f
--- /dev/null
+++ b/resources/views/home/parts/default-card-recent-drafts.blade.php
@@ -0,0 +1,11 @@
+{{--
+$draftPages - array
+--}}
+@if(count($draftPages) > 0)
+    <div id="recent-drafts" class="card mb-xl">
+        <h3 class="card-title">{{ trans('entities.my_recent_drafts') }}</h3>
+        <div class="px-m">
+            @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
+        </div>
+    </div>
+@endif
diff --git a/resources/views/home/parts/default-card-recently-updated-pages.blade.php b/resources/views/home/parts/default-card-recently-updated-pages.blade.php
new file mode 100644
index 00000000000..6e637d710d8
--- /dev/null
+++ b/resources/views/home/parts/default-card-recently-updated-pages.blade.php
@@ -0,0 +1,16 @@
+{{--
+$recentlyUpdatedPages - array
+--}}
+<div id="recent-pages" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.recently_updated_pages') }}</h3>
+    <div id="recently-updated-pages" class="px-m">
+        @include('entities.list', [
+        'entities' => $recentlyUpdatedPages,
+        'style' => 'compact',
+        'emptyText' => trans('entities.no_pages_recently_updated'),
+        ])
+    </div>
+    @if(count($recentlyUpdatedPages) > 0)
+        <a href="{{ url("/pages/recently-updated") }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php b/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php
new file mode 100644
index 00000000000..31bafaa2b02
--- /dev/null
+++ b/resources/views/home/parts/default-card-recently-viewed-or-recent-books.blade.php
@@ -0,0 +1,14 @@
+{{--
+$recents - array
+--}}
+
+<div id="{{ auth()->check() ? 'recently-viewed' : 'recent-books' }}" class="card mb-xl">
+    <h3 class="card-title">{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h3>
+    <div class="px-m">
+        @include('entities.list', [
+        'entities' => $recents,
+        'style' => 'compact',
+        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
+        ])
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/home/parts/default-card-top-favourites.blade.php b/resources/views/home/parts/default-card-top-favourites.blade.php
new file mode 100644
index 00000000000..81f3895c68a
--- /dev/null
+++ b/resources/views/home/parts/default-card-top-favourites.blade.php
@@ -0,0 +1,15 @@
+{{--
+$favourites - array
+--}}
+@if(count($favourites) > 0)
+    <div id="top-favourites" class="card mb-xl">
+        <h3 class="card-title">{{ trans('entities.my_most_viewed_favourites') }}</h3>
+        <div class="px-m">
+            @include('entities.list', [
+            'entities' => $favourites,
+            'style' => 'compact',
+            ])
+        </div>
+        <a href="{{ url('/favourites')  }}" class="card-footer-link">{{ trans('common.view_all') }}</a>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/home/parts/sidebar.blade.php b/resources/views/home/parts/sidebar.blade.php
deleted file mode 100644
index 78f7e7a8085..00000000000
--- a/resources/views/home/parts/sidebar.blade.php
+++ /dev/null
@@ -1,43 +0,0 @@
-@if(count($draftPages) > 0)
-    <div id="recent-drafts" class="mb-xl">
-        <h5>{{ trans('entities.my_recent_drafts') }}</h5>
-        @include('entities.list', ['entities' => $draftPages, 'style' => 'compact'])
-    </div>
-@endif
-
-@if(count($favourites) > 0)
-    <div id="top-favourites" class="mb-xl">
-        <h5>{{ trans('entities.my_most_viewed_favourites') }}</h5>
-        @include('entities.list', [
-            'entities' => $favourites,
-            'style' => 'compact',
-        ])
-        <a href="{{ url('/favourites')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
-    </div>
-@endif
-
-<div class="mb-xl">
-    <h5>{{ trans('entities.' . (auth()->check() ? 'my_recently_viewed' : 'books_recent')) }}</h5>
-    @include('entities.list', [
-        'entities' => $recents,
-        'style' => 'compact',
-        'emptyText' => auth()->check() ? trans('entities.no_pages_viewed') : trans('entities.books_empty')
-        ])
-</div>
-
-<div class="mb-xl">
-    <h5>{{ trans('entities.recently_updated_pages') }}</h5>
-    <div id="recently-updated-pages">
-        @include('entities.list', [
-        'entities' => $recentlyUpdatedPages,
-        'style' => 'compact',
-        'emptyText' => trans('entities.no_pages_recently_updated')
-        ])
-    </div>
-    <a href="{{ url('/pages/recently-updated')  }}" class="text-muted block py-xs">{{ trans('common.view_all') }}</a>
-</div>
-
-<div id="recent-activity" class="mb-xl">
-    <h5>{{ trans('entities.recent_activity') }}</h5>
-    @include('common.activity-list', ['activity' => $activity])
-</div>
\ No newline at end of file
diff --git a/resources/views/home/shelves.blade.php b/resources/views/home/shelves.blade.php
index 7a4d002a0ac..64795154315 100644
--- a/resources/views/home/shelves.blade.php
+++ b/resources/views/home/shelves.blade.php
@@ -5,26 +5,9 @@
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
-                <a href="{{ url("/create-shelf") }}" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.shelves_new_action') }}</span>
-                </a>
-            @endif
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
diff --git a/resources/views/home/specific-page.blade.php b/resources/views/home/specific-page.blade.php
index 10ffe9629b6..329c4a6c244 100644
--- a/resources/views/home/specific-page.blade.php
+++ b/resources/views/home/specific-page.blade.php
@@ -13,15 +13,9 @@ class="page-content">
 @stop
 
 @section('left')
-    @include('home.parts.sidebar')
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @include('home.parts.expand-toggle', ['classes' => 'text-link', 'target' => '.entity-list.compact .entity-item-snippet', 'key' => 'home-details'])
-            @include('common.dark-mode-toggle', ['classes' => 'icon-list-item text-link'])
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'home-non-default', 'position' => 'right'])
 @stop
\ No newline at end of file
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index b868cb88804..90d987ccb56 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -61,12 +61,7 @@ class="@stack('body-class')">
     </div>
 
     @include('layouts.parts.footer')
-
-    <div component="back-to-top" class="back-to-top print-hidden">
-        <div class="inner">
-            @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
-        </div>
-    </div>
+    @include('layouts.parts.back-to-top')
 
     @if($cspNonce ?? false)
         <script src="{{ versioned_asset('dist/app.js') }}" type="module" nonce="{{ $cspNonce }}"></script>
diff --git a/resources/views/layouts/parts/back-to-top.blade.php b/resources/views/layouts/parts/back-to-top.blade.php
new file mode 100644
index 00000000000..b6efc97497b
--- /dev/null
+++ b/resources/views/layouts/parts/back-to-top.blade.php
@@ -0,0 +1,15 @@
+<div component="back-to-top" class="back-to-top-container">
+    <svg refs="back-to-top@progress" class="back-to-top-progress" width="100%" height="100%">
+        <path
+            refs="back-to-top@progress-path"
+            d=""
+            pathLength="100"
+            stroke-dasharray="0 100"
+        />
+    </svg>
+    <button refs="back-to-top@button" class="back-to-top print-hidden">
+        <div class="inner">
+            @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
+        </div>
+    </button>
+</div>
diff --git a/resources/views/layouts/parts/custom-head.blade.php b/resources/views/layouts/parts/custom-head.blade.php
index a13215cf813..caa177030fa 100644
--- a/resources/views/layouts/parts/custom-head.blade.php
+++ b/resources/views/layouts/parts/custom-head.blade.php
@@ -1,6 +1,6 @@
 @inject('headContent', 'BookStack\Theming\CustomHtmlHeadContentProvider')
 
-@if(setting('app-custom-head') && !request()->routeIs('settings.category'))
+@if(!request()->routeIs('settings.category'))
 <!-- Start: custom user content -->
 {!! $headContent->forWeb() !!}
 <!-- End: custom user content -->
diff --git a/resources/views/layouts/parts/custom-styles.blade.php b/resources/views/layouts/parts/custom-styles.blade.php
index bfdcc851289..b31334e7331 100644
--- a/resources/views/layouts/parts/custom-styles.blade.php
+++ b/resources/views/layouts/parts/custom-styles.blade.php
@@ -1,15 +1,22 @@
-@php
-    $settingSuffix = setting()->getForCurrentUser('dark-mode-enabled') ? '-dark' : '';
-@endphp
 <style>
     :root {
-        --color-primary: {{ setting('app-color' . $settingSuffix) }};
-        --color-primary-light: {{ setting('app-color-light' . $settingSuffix) }};
-        --color-link: {{ setting('link-color' . $settingSuffix) }};
-        --color-bookshelf: {{ setting('bookshelf-color' . $settingSuffix)}};
-        --color-book: {{ setting('book-color' . $settingSuffix)}};
-        --color-chapter: {{ setting('chapter-color' . $settingSuffix)}};
-        --color-page: {{ setting('page-color' . $settingSuffix)}};
-        --color-page-draft: {{ setting('page-draft-color' . $settingSuffix)}};
+        --color-primary: {{ setting('app-color') }};
+        --color-primary-light: {{ setting('app-color-light') }};
+        --color-link: {{ setting('link-color') }};
+        --color-bookshelf: {{ setting('bookshelf-color') }};
+        --color-book: {{ setting('book-color') }};
+        --color-chapter: {{ setting('chapter-color') }};
+        --color-page: {{ setting('page-color') }};
+        --color-page-draft: {{ setting('page-draft-color') }};
+    }
+    :root.dark-mode {
+        --color-primary: {{ setting('app-color-dark') }};
+        --color-primary-light: {{ setting('app-color-light-dark') }};
+        --color-link: {{ setting('link-color-dark') }};
+        --color-bookshelf: {{ setting('bookshelf-color-dark') }};
+        --color-book: {{ setting('book-color-dark') }};
+        --color-chapter: {{ setting('chapter-color-dark') }};
+        --color-page: {{ setting('page-color-dark') }};
+        --color-page-draft: {{ setting('page-draft-color-dark') }};
     }
 </style>
diff --git a/resources/views/layouts/parts/header-logo.blade.php b/resources/views/layouts/parts/header-logo.blade.php
index c1bbd7849bc..4c2dfb74ea8 100644
--- a/resources/views/layouts/parts/header-logo.blade.php
+++ b/resources/views/layouts/parts/header-logo.blade.php
@@ -1,6 +1,8 @@
 <a href="{{ url('/') }}" data-shortcut="home_view" class="logo">
     @if(setting('app-logo', '') !== 'none')
-        <img class="logo-image" src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}" alt="Logo">
+        <img class="logo-image"
+             src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}"
+             alt="{{ setting('app-name-header') ? '' : setting('app-name') }}">
     @endif
     @if (setting('app-name-header'))
         <span class="logo-text">{{ setting('app-name') }}</span>
diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index 303b3b0bee3..8fa43373859 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -23,7 +23,7 @@ class="popup-background code-editor">
                     <div refs="code-editor@language-options-container" class="lang-options">
                         @php
                             $languages = [
-                                'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI',
+                                'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Groovy', 'Haskell', 'HTML', 'INI',
                                 'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'MSSQL', 'MySQL',
                                 'Nginx', 'OCaml', 'Octave', 'Pascal', 'Perl', 'PHP', 'PL/SQL', 'PostgreSQL', 'Powershell', 'Python',
                                 'R', 'Ruby', 'Rust', 'SAS', 'Scala', 'Scheme', 'Shell', 'Smarty', 'SQL', 'SQLite', 'Swift',
diff --git a/resources/views/pages/parts/editor-toolbar.blade.php b/resources/views/pages/parts/editor-toolbar.blade.php
index a3ea58374d9..42abbaf6b99 100644
--- a/resources/views/pages/parts/editor-toolbar.blade.php
+++ b/resources/views/pages/parts/editor-toolbar.blade.php
@@ -9,7 +9,7 @@ class="icon-list-item text-link"><span>@icon('back')</span><span class="hide-und
 
     <div class="text-center">
         <div component="dropdown"
-             option:dropdown:move-menu="true"
+             option:dropdown:fixed-position-menu="true"
              class="dropdown-container  draft-display text {{ $draftsEnabled ? '' : 'hidden' }}">
             <div class="flex-container-row items-center justify-center">
                 <button type="button"
@@ -97,7 +97,7 @@ class="text-link icon-list-item">
 
     <div class="flex-container-row justify-flex-end gap-x-m items-center">
         <div component="dropdown"
-             option:dropdown:move-menu="true"
+             option:dropdown:fixed-position-menu="true"
              class="dropdown-container">
             <button refs="dropdown@toggle" type="button" aria-haspopup="true" aria-expanded="false" class="icon-list-item text-link">
                 <span>@icon('edit')</span>
@@ -108,13 +108,13 @@ class="dropdown-container">
                     <p class="text-muted pb-s">{{ trans('entities.pages_edit_enter_changelog_desc') }}</p>
                     <textarea
                         refs="page-editor@changelogInput"
-                        name="summary"
+                        name="changelog"
                         id="summary-input"
                         rows="2"
                         maxlength="180"
                         title="{{ trans('entities.pages_edit_enter_changelog') }}"
                         placeholder="{{ trans('entities.pages_edit_enter_changelog') }}"
-                    ></textarea>
+                    >{{ $model->summary ?? '' }}</textarea>
                     <small refs="page-editor@changelogCounter" class="text-muted mt-xs">0 / 180</small>
                 </li>
             </ul>
diff --git a/resources/views/pages/parts/editor-toolbox.blade.php b/resources/views/pages/parts/editor-toolbox.blade.php
index 8b7a68a9aa7..8ef259b91e4 100644
--- a/resources/views/pages/parts/editor-toolbox.blade.php
+++ b/resources/views/pages/parts/editor-toolbox.blade.php
@@ -11,6 +11,7 @@
             @if($comments->enabled())
                 <button type="button" refs="editor-toolbox@tab-button" data-tab="comments" title="{{ trans('entities.comments') }}">@icon('comment')</button>
             @endif
+            <button type="button" refs="editor-toolbox@tab-button" data-tab="contents" title="{{ trans('entities.page_contents') }}">@icon('contents')</button>
         </div>
     </div>
 
@@ -37,4 +38,6 @@
         @include('pages.parts.toolbox-comments')
     @endif
 
+    @include('pages.parts.toolbox-contents')
+
 </div>
diff --git a/resources/views/pages/parts/image-manager.blade.php b/resources/views/pages/parts/image-manager.blade.php
index 3050f5c5b34..2ee77f90ffd 100644
--- a/resources/views/pages/parts/image-manager.blade.php
+++ b/resources/views/pages/parts/image-manager.blade.php
@@ -1,4 +1,9 @@
-<div components="image-manager dropzone"
+@php
+    $canUploadImages = isset($page)
+        && userCan(\BookStack\Permissions\Permission::ImageCreateAll)
+        && userCan(\BookStack\Permissions\Permission::PageUpdate, $page);
+@endphp
+<div components="image-manager {{ $canUploadImages ? 'dropzone' : '' }}"
      option:dropzone:url="{{ url('/images/gallery?' . http_build_query(['uploaded_to' => $uploaded_to ?? 0])) }}"
      option:dropzone:success-message="{{ trans('components.image_upload_success') }}"
      option:dropzone:error-message="{{ trans('errors.image_upload_error') }}"
@@ -14,18 +19,21 @@ class="image-manager">
          refs="image-manager@popup"
          class="popup-background">
         <div class="popup-body" tabindex="-1">
-
             <div class="popup-header primary-background">
                 <div class="popup-title">{{ trans('components.image_select') }}</div>
-                <button refs="dropzone@selectButton image-manager@uploadButton" type="button">
-                    <span>@icon('upload')</span>
-                    <span>{{ trans('components.image_upload') }}</span>
-                </button>
+                @if($canUploadImages)
+                    <button refs="dropzone@selectButton image-manager@uploadButton" type="button">
+                        <span>@icon('upload')</span>
+                        <span>{{ trans('components.image_upload') }}</span>
+                    </button>
+                @endif
                 <button refs="popup@hide"
-                        type="button"
-                        title="{{ trans('common.close') }}"
-                        class="popup-header-close">@icon('close')</button>
+                   type="button"
+                   title="{{ trans('common.close') }}"
+                   class="popup-header-close">@icon('close')
+                </button>
             </div>
+  
 
             <div component="tabs"
                  option:tabs:active-under="880"
@@ -100,13 +108,19 @@ class="cancel">@icon('close')</button>
                          aria-labelledby="image-manager-info-tab"
                          class="image-manager-sidebar flex-container-column">
 
-                        <div refs="image-manager@dropzoneContainer">
-                            <div refs="dropzone@status-area"></div>
-                        </div>
+                        @if($canUploadImages)
+                            <div refs="image-manager@dropzoneContainer">
+                                <div refs="dropzone@status-area"></div>
+                            </div>
+                        @endif
 
                         <div refs="image-manager@form-container-placeholder" class="p-m text-small text-muted">
                             <p>{{ trans('components.image_intro') }}</p>
-                            <p refs="image-manager@upload-hint">{{ trans('components.image_intro_upload') }}</p>
+                            @if($canUploadImages)
+                                <p refs="image-manager@upload-hint">{{ trans('components.image_intro_upload') }}</p>
+                            @else
+                                <p refs="image-manager@upload-hint">{{ trans('components.image_no_upload_permission') }}</p>
+                            @endif
                         </div>
 
                         <div refs="image-manager@formContainer" class="inner flex">
diff --git a/resources/views/pages/parts/show-sidebar-section-actions.blade.php b/resources/views/pages/parts/show-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..94061ecb3a8
--- /dev/null
+++ b/resources/views/pages/parts/show-sidebar-section-actions.blade.php
@@ -0,0 +1,59 @@
+<div id="actions" class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+
+    <div class="icon-list text-link">
+
+        {{--User Actions--}}
+        @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
+            <a href="{{ $page->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
+                <span>@icon('edit')</span>
+                <span>{{ trans('common.edit') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Chapter::class))
+            <a href="{{ $page->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
+                <span>@icon('copy')</span>
+                <span>{{ trans('common.copy') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
+            @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
+                <a href="{{ $page->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
+                    <span>@icon('folder')</span>
+                    <span>{{ trans('common.move') }}</span>
+                </a>
+            @endif
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::RevisionViewAll))
+            <a href="{{ $page->getUrl('/revisions') }}" data-shortcut="revisions" class="icon-list-item">
+                <span>@icon('history')</span>
+                <span>{{ trans('entities.revisions') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
+            <a href="{{ $page->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
+                <span>@icon('lock')</span>
+                <span>{{ trans('entities.permissions') }}</span>
+            </a>
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
+            <a href="{{ $page->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
+                <span>@icon('delete')</span>
+                <span>{{ trans('common.delete') }}</span>
+            </a>
+        @endif
+
+        <hr class="primary-background"/>
+
+        @if($watchOptions->canWatch() && !$watchOptions->isWatching())
+            @include('entities.watch-action', ['entity' => $page])
+        @endif
+        @if(!user()->isGuest())
+            @include('entities.favourite-action', ['entity' => $page])
+        @endif
+        @if(userCan(\BookStack\Permissions\Permission::ContentExport))
+            @include('entities.export-menu', ['entity' => $page])
+        @endif
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/resources/views/pages/parts/show-sidebar-section-attachments.blade.php b/resources/views/pages/parts/show-sidebar-section-attachments.blade.php
new file mode 100644
index 00000000000..9757240159b
--- /dev/null
+++ b/resources/views/pages/parts/show-sidebar-section-attachments.blade.php
@@ -0,0 +1,8 @@
+@if($page->attachments->count() > 0)
+    <div id="page-attachments" class="mb-l">
+        <h5>{{ trans('entities.pages_attachments') }}</h5>
+        <div class="body">
+            @include('attachments.list', ['attachments' => $page->attachments])
+        </div>
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/pages/parts/show-sidebar-section-details.blade.php b/resources/views/pages/parts/show-sidebar-section-details.blade.php
new file mode 100644
index 00000000000..391f30ce4cc
--- /dev/null
+++ b/resources/views/pages/parts/show-sidebar-section-details.blade.php
@@ -0,0 +1,61 @@
+<div id="page-details" class="entity-details mb-xl">
+    <h5>{{ trans('common.details') }}</h5>
+    <div class="blended-links">
+        @include('entities.meta', ['entity' => $page, 'watchOptions' => $watchOptions])
+
+        @if($book->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
+                    <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.books_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+
+        @if($page->chapter && $page->chapter->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page->chapter))
+                    <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.chapters_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+
+        @if($page->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
+                    <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.pages_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.pages_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+
+        @if($page->template)
+            <div class="entity-meta-item">
+                @icon('template')
+                <div>{{ trans('entities.pages_is_template') }}</div>
+            </div>
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pages/parts/show-sidebar-section-page-nav.blade.php b/resources/views/pages/parts/show-sidebar-section-page-nav.blade.php
new file mode 100644
index 00000000000..d046a8ca141
--- /dev/null
+++ b/resources/views/pages/parts/show-sidebar-section-page-nav.blade.php
@@ -0,0 +1,15 @@
+@if(isset($pageNav) && count($pageNav))
+    <nav id="page-navigation" class="mb-xl" aria-label="{{ trans('entities.pages_navigation') }}">
+        <h5>{{ trans('entities.pages_navigation') }}</h5>
+        <div class="body">
+            <ul class="sidebar-page-nav menu">
+                @foreach($pageNav as $navItem)
+                    <li class="page-nav-item h{{ $navItem['level'] }}">
+                        <a href="{{ $navItem['link'] }}" class="text-limit-lines-1 block">{{ $navItem['text'] }}</a>
+                        <div class="link-background sidebar-page-nav-bullet"></div>
+                    </li>
+                @endforeach
+            </ul>
+        </div>
+    </nav>
+@endif
\ No newline at end of file
diff --git a/resources/views/pages/parts/show-sidebar-section-tags.blade.php b/resources/views/pages/parts/show-sidebar-section-tags.blade.php
new file mode 100644
index 00000000000..354da627c55
--- /dev/null
+++ b/resources/views/pages/parts/show-sidebar-section-tags.blade.php
@@ -0,0 +1,5 @@
+@if($page->tags->count() > 0)
+    <section>
+        @include('entities.tag-list', ['entity' => $page])
+    </section>
+@endif
\ No newline at end of file
diff --git a/resources/views/pages/parts/toolbox-contents.blade.php b/resources/views/pages/parts/toolbox-contents.blade.php
new file mode 100644
index 00000000000..6234cdf4392
--- /dev/null
+++ b/resources/views/pages/parts/toolbox-contents.blade.php
@@ -0,0 +1,9 @@
+<div refs="editor-toolbox@tab-content" data-tab-content="contents" class="toolbox-tab-content">
+    <h4>{{ trans('entities.page_contents') }}</h4>
+
+    <div component="toolbox-contents" class="comment-container-compact px-l">
+        <p class="text-muted small mb-m">{{ trans('entities.page_contents_info') }}</p>
+        <p class="text-muted small mb-m" refs="toolbox-contents@none" hidden="hidden">{{ trans('entities.page_contents_none') }}</p>
+        <div refs="toolbox-contents@display"></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/pages/parts/wysiwyg-editor.blade.php b/resources/views/pages/parts/wysiwyg-editor.blade.php
index 73e6557527f..4344b234d60 100644
--- a/resources/views/pages/parts/wysiwyg-editor.blade.php
+++ b/resources/views/pages/parts/wysiwyg-editor.blade.php
@@ -11,7 +11,7 @@ class="flex-container-column flex-fill flex">
 
 {{--    <div id="lexical-debug" style="white-space: pre-wrap; font-size: 12px; height: 200px; overflow-y: scroll; background-color: #000; padding: 1rem; border-radius: 4px; color: #FFF;"></div>--}}
 
-    <textarea refs="wysiwyg-editor@input" id="html-editor" hidden="hidden"  name="html" rows="5">{{ old('html') ?? $model->html ?? '' }}</textarea>
+    <textarea refs="wysiwyg-editor@input" id="html-editor" hidden="hidden"  name="html" rows="5">{{ (old('html') ?? $model->html ?? '') ?: '<p></p>' }}</textarea>
 </div>
 
 @if($errors->has('html'))
diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index c0831ef595c..8160c0425db 100644
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -20,8 +20,8 @@
                 'text' => trans('entities.pages_revisions'),
                 'icon' => 'history',
             ],
-            $revision->getUrl('/changes') => $diff ? trans('entities.pages_revisions_numbered_changes', ['id' => $revision->id]) : null,
-            $revision->getUrl() => !$diff ? trans('entities.pages_revisions_numbered', ['id' => $revision->id]) : null,
+            $revision->getUrl('/changes') => $diff ? trans('entities.pages_revisions_numbered_changes', ['id' => $revision->revision_number]) : null,
+            $revision->getUrl() => !$diff ? trans('entities.pages_revisions_numbered', ['id' => $revision->revision_number]) : null,
         ]])
     </div>
 
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index e8eb8d68bf0..1258f92dab5 100644
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -39,7 +39,7 @@
                     @foreach($revisions as $index => $revision)
                         @include('pages.parts.revisions-index-row', [
                                 'revision' => $revision,
-                                'current' => $page->revision_count === $revision->revision_number,
+                                'current' => $youngestRevisionId === $revision->id,
                                 'oldest' => $oldestRevisionId === $revision->id,
                             ])
                     @endforeach
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index fcec901571b..eef559320d8 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -22,7 +22,7 @@
              class="page-content clearfix">
             @include('pages.parts.page-display')
         </div>
-        @include('pages.parts.pointer', ['page' => $page])
+        @include('pages.parts.pointer', ['page' => $page, 'commentTree' => $commentTree])
     </main>
 
     @include('entities.sibling-navigation', ['next' => $next, 'previous' => $previous])
@@ -36,159 +36,9 @@ class="page-content clearfix">
 @stop
 
 @section('left')
-
-    @if($page->tags->count() > 0)
-        <section>
-            @include('entities.tag-list', ['entity' => $page])
-        </section>
-    @endif
-
-    @if ($page->attachments->count() > 0)
-        <div id="page-attachments" class="mb-l">
-            <h5>{{ trans('entities.pages_attachments') }}</h5>
-            <div class="body">
-                @include('attachments.list', ['attachments' => $page->attachments])
-            </div>
-        </div>
-    @endif
-
-    @if (isset($pageNav) && count($pageNav))
-        <nav id="page-navigation" class="mb-xl" aria-label="{{ trans('entities.pages_navigation') }}">
-            <h5>{{ trans('entities.pages_navigation') }}</h5>
-            <div class="body">
-                <div class="sidebar-page-nav menu">
-                    @foreach($pageNav as $navItem)
-                        <li class="page-nav-item h{{ $navItem['level'] }}">
-                            <a href="{{ $navItem['link'] }}" class="text-limit-lines-1 block">{{ $navItem['text'] }}</a>
-                            <div class="link-background sidebar-page-nav-bullet"></div>
-                        </li>
-                    @endforeach
-                </div>
-            </div>
-        </nav>
-    @endif
-
-    @include('entities.book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('common.view-blocks', ['location' => 'pages-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div id="page-details" class="entity-details mb-xl">
-        <h5>{{ trans('common.details') }}</h5>
-        <div class="blended-links">
-            @include('entities.meta', ['entity' => $page, 'watchOptions' => $watchOptions])
-
-            @if($book->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $book))
-                        <a href="{{ $book->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.books_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-
-            @if($page->chapter && $page->chapter->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page->chapter))
-                        <a href="{{ $page->chapter->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.chapters_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-
-            @if($page->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
-                        <a href="{{ $page->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.pages_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.pages_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-
-            @if($page->template)
-                <div class="entity-meta-item">
-                    @icon('template')
-                    <div>{{ trans('entities.pages_is_template') }}</div>
-                </div>
-            @endif
-        </div>
-    </div>
-
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-
-        <div class="icon-list text-link">
-
-            {{--User Actions--}}
-            @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
-                <a href="{{ $page->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
-                    <span>@icon('edit')</span>
-                    <span>{{ trans('common.edit') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::PageCreateAll) || userCan(\BookStack\Permissions\Permission::PageCreateOwn) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Book::class) || userCanOnAny(\BookStack\Permissions\Permission::Create, \BookStack\Entities\Models\Chapter::class))
-                <a href="{{ $page->getUrl('/copy') }}" data-shortcut="copy" class="icon-list-item">
-                    <span>@icon('copy')</span>
-                    <span>{{ trans('common.copy') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::PageUpdate, $page))
-                @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
-	                <a href="{{ $page->getUrl('/move') }}" data-shortcut="move" class="icon-list-item">
-	                    <span>@icon('folder')</span>
-	                    <span>{{ trans('common.move') }}</span>
-	                </a>
-                @endif
-            @endif
-            <a href="{{ $page->getUrl('/revisions') }}" data-shortcut="revisions" class="icon-list-item">
-                <span>@icon('history')</span>
-                <span>{{ trans('entities.revisions') }}</span>
-            </a>
-            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $page))
-                <a href="{{ $page->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
-                    <span>@icon('lock')</span>
-                    <span>{{ trans('entities.permissions') }}</span>
-                </a>
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::PageDelete, $page))
-                <a href="{{ $page->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
-                    <span>@icon('delete')</span>
-                    <span>{{ trans('common.delete') }}</span>
-                </a>
-            @endif
-
-            <hr class="primary-background"/>
-
-            @if($watchOptions->canWatch() && !$watchOptions->isWatching())
-                @include('entities.watch-action', ['entity' => $page])
-            @endif
-            @if(!user()->isGuest())
-                @include('entities.favourite-action', ['entity' => $page])
-            @endif
-            @if(userCan(\BookStack\Permissions\Permission::ContentExport))
-                @include('entities.export-menu', ['entity' => $page])
-            @endif
-        </div>
-
-    </div>
+    @include('common.view-blocks', ['location' => 'pages-show', 'position' => 'right'])
 @stop
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index ad437604b1c..48250816fef 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -87,11 +87,7 @@
                         @include('entities.list', ['entities' => $entities, 'showPath' => true, 'showTags' => true])
                     </div>
 
-                    @if($hasNextPage)
-                        <div class="text-right mt-m">
-                            <a href="{{ $nextPageLink }}" class="button outline">{{ trans('entities.search_more') }}</a>
-                        </div>
-                    @endif
+                    {{ $paginator->render() }}
                 </div>
             </div>
         </div>
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 8e477668040..ce6a0463427 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -88,7 +88,11 @@ class="text-item">{{ $type }}</a></li>
                 @foreach($activities as $activity)
                     <div class="item-list-row flex-container-row items-center wrap py-xxs">
                         <div class="flex-2 px-m py-xxs flex-container-row items-center min-width-m">
-                            @include('settings.parts.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id])
+                            @if($activity->user && $activity->user->created_at <= $activity->created_at)
+                                @include('settings.parts.table-user', ['user' => $activity->user])
+                            @else
+                                [ID: {{ $activity->user_id }}] {{ trans('common.deleted_user') }}
+                            @endif
                         </div>
                         <div class="flex-2 px-m py-xxs min-width-m"><strong
                                     class="mr-xs hide-over-m">{{ trans('settings.audit_table_event') }}
@@ -111,7 +115,7 @@ class="mr-xs hide-over-m">{{ trans('settings.audit_table_ip') }}
                                     :<br></strong> {{ $activity->ip }}</div>
                             <div class="flex-3 px-m py-xxs text-m-right min-width-xs"><strong
                                         class="mr-xs hide-over-m">{{ trans('settings.audit_table_date') }}
-                                    :<br></strong> {{ $activity->created_at }}</div>
+                                    :<br></strong> {{ $dates->absolute($activity->created_at) }}</div>
                         </div>
                     </div>
                 @endforeach
diff --git a/resources/views/settings/categories/sorting.blade.php b/resources/views/settings/categories/sorting.blade.php
index 9d1d9814b96..5678434e0a5 100644
--- a/resources/views/settings/categories/sorting.blade.php
+++ b/resources/views/settings/categories/sorting.blade.php
@@ -11,13 +11,36 @@
         <input type="hidden" name="section" value="sorting">
 
         <div class="setting-list">
+            <div>
+                <div class="mb-m">
+                    <label class="setting-list-label">{{ trans('settings.sorting_page_limits') }}</label>
+                    <p class="small">{{ trans('settings.sorting_page_limits_desc') }}</p>
+                </div>
+                <div class="flex-container-row wrap gap-m small-inputs">
+                    @php
+                        $labelByKey = ['shelves' => trans('entities.shelves'), 'books' => trans('entities.books'), 'search' => trans('entities.search_results')];
+                    @endphp
+                    @foreach($labelByKey as $key => $label)
+                        <div>
+                            <label for="setting-lists-page-count-{{ $key }}">{{ $label }}</label>
+                            @include('form.number', [
+                                'name' => 'setting-lists-page-count-' . $key,
+                                'value' => setting()->getInteger('lists-page-count-' . $key, 18, 1, 1000),
+                                'min' => 1,
+                                'step' => 1,
+                            ])
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+
             <div class="grid half gap-xl items-center">
                 <div>
                     <label for="setting-sorting-book-default"
                            class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
-                    <p class="small">{{ trans('settings.sorting_book_default_desc') }}</p>
+                    <p class="small mb-s">{{ trans('settings.sorting_book_default_desc') }}</p>
                 </div>
-                <div>
+                <div class="pt-s">
                     <select id="setting-sorting-book-default" name="setting-sorting-book-default"
                             @if($errors->has('setting-sorting-book-default')) class="neg" @endif>
                         <option value="0" @if(intval(setting('sorting-book-default', '0')) === 0) selected @endif>
@@ -31,6 +54,9 @@ class="setting-list-label">{{ trans('settings.sorting_book_default') }}</label>
                             </option>
                         @endforeach
                     </select>
+                    <p class="small">
+                        <a href="{{ url('/settings/sorting/rules/new') }}" class="text-button" target="_blank">{{ trans('settings.sort_rule_create') }}</a>
+                    </p>
                 </div>
             </div>
 
diff --git a/resources/views/settings/layout.blade.php b/resources/views/settings/layout.blade.php
index 930d407a508..2ca06b86ac0 100644
--- a/resources/views/settings/layout.blade.php
+++ b/resources/views/settings/layout.blade.php
@@ -18,7 +18,7 @@
 
                 <h5 class="mt-xl">{{ trans('settings.system_version') }}</h5>
                 <div class="py-xs">
-                    <a target="_blank" rel="noopener noreferrer" href="https://github.com/BookStackApp/BookStack/releases">
+                    <a target="_blank" rel="noopener noreferrer" href="https://codeberg.org/bookstack/bookstack/releases">
                         BookStack @if(!str_starts_with($version, 'v')) version @endif {{ $version }}
                     </a>
                     <br>
diff --git a/resources/views/settings/layouts/edit.blade.php b/resources/views/settings/layouts/edit.blade.php
new file mode 100644
index 00000000000..007eca66633
--- /dev/null
+++ b/resources/views/settings/layouts/edit.blade.php
@@ -0,0 +1,71 @@
+@extends('layouts.simple')
+
+@section('body')
+
+    <div class="container medium my-xl">
+
+        <div class="grid gap-xxl right-focus">
+
+            <div>
+                <div class="mb-l">
+                    <a href="{{ url('/my-account/interface') }}" class="text-link">@icon('back') {{ trans('preferences.layout_edit_back_to_preferences') }}</a>
+                </div>
+                <h5>{{ trans('preferences.layout_edit_layouts') }}</h5>
+                <nav class="active-link-list in-sidebar">
+                    @foreach($namedLocations as $locationOptKey => $locationOptName)
+                        <a href="{{ url('/layouts/' . $locationOptKey) }}" class="{{ $locationOptKey === $location ? 'active' : '' }}">{{ $locationOptName }}</a>
+                    @endforeach
+                </nav>
+            </div>
+
+            <div>
+                <div class="card content-wrap auto-height">
+                    <div class="flex-container-row justify-space-between items-center">
+                        <h1 class="list-heading">{{ trans('preferences.layout_edit') }}</h1>
+                        <span class="text-muted text-bigger">{{ $locationName }}</span>
+                    </div>
+
+                    <p class="small text-muted">{{ trans('preferences.layout_edit_desc') }}</p>
+                    @if(!isset($blocks['center']))
+                        <p class="small text-muted">
+                            {{ trans('preferences.layout_edit_column_hint') }}
+                        </p>
+                    @endif
+
+                    <form component="layout-editor" action="{{ url('layouts/' . $location) }}" method="POST">
+                        {{ method_field('PUT') }}
+                        {{ csrf_field() }}
+
+                        <input refs="layout-editor@input" type="hidden" name="layout" value="">
+
+                        <div class="flex-container-row gap-m mb-m wrap">
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['left'] ?? [], 'label' => trans('preferences.layout_edit_left'), 'id' => 'left'])
+                            @if(isset($blocks['center']))
+                                @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['center'] ?? [], 'label' => trans('preferences.layout_edit_center'), 'id' => 'center'])
+                            @endif
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['right'] ?? [], 'label' => trans('preferences.layout_edit_right'), 'id' => 'right'])
+                        </div>
+
+                        <div class="mb-l">
+                            @include('settings.layouts.parts.block-column', ['columnBlocks' => $blocks['unused'] ?? [], 'label' => trans('preferences.layout_edit_unused'), 'id' => 'unused'])
+                        </div>
+
+                        <div class="form-group text-right">
+                            <a href="{{ url('/my-account/interface') }}" class="button outline">{{ trans('common.cancel') }}</a>
+                            <button type="submit" form="layout-reset-form" class="button outline">{{ trans('preferences.layout_edit_reset_to_defaults') }}</button>
+                            <button type="submit" class="button">{{ trans('preferences.layout_edit_save') }}</button>
+                        </div>
+                    </form>
+
+                    <form id="layout-reset-form" action="{{ url('/layouts/' . $location . '/reset') }}" method="POST">
+                        {{ csrf_field() }}
+                        {{ method_field('PUT') }}
+                    </form>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+@stop
diff --git a/resources/views/settings/layouts/parts/block-column.blade.php b/resources/views/settings/layouts/parts/block-column.blade.php
new file mode 100644
index 00000000000..20da8dff72f
--- /dev/null
+++ b/resources/views/settings/layouts/parts/block-column.blade.php
@@ -0,0 +1,17 @@
+{{--
+$columnBlocks - array - Blocks to list
+$label - string - Section title
+$id - string - identifier for location/column
+--}}
+<div class="form-group flex min-width-m">
+    <label id="layout-blocks-{{ $id }}">{{ $label }}</label>
+    <ul refs="layout-editor@column"
+        data-column="{{ $id }}"
+        aria-labelledby="layout-blocks-{{ $id }}"
+        class="scroll-box layout-editor-column-{{ $id }}">
+        <li class="text-muted empty-state px-m py-s italic text-small">{{ trans('preferences.layout_edit_empty') }}</li>
+        @foreach($columnBlocks as $block)
+            @include('settings.layouts.parts.block', ['block' => $block])
+        @endforeach
+    </ul>
+</div>
\ No newline at end of file
diff --git a/resources/views/settings/layouts/parts/block.blade.php b/resources/views/settings/layouts/parts/block.blade.php
new file mode 100644
index 00000000000..1885c4254cf
--- /dev/null
+++ b/resources/views/settings/layouts/parts/block.blade.php
@@ -0,0 +1,23 @@
+@php /** @var $block class-string<\BookStack\View\ViewBlockInterface> */ @endphp
+<li data-block-id="{{ $block::getId() }}"
+    class="scroll-box-item items-center">
+    <div class="handle px-s">@icon('grip')</div>
+    <div class="text-small">{{ $block::getLabel() }}</div>
+    <div component="dropdown"
+         option:dropdown:fixed-position-menu="true"
+         class="dropdown-container ml-auto">
+        <button type="button"
+                refs="dropdown@toggle"
+                aria-haspopup="menu"
+                aria-expanded="false"
+                class="icon-button p-xxs">@icon('more')</button>
+        <ul refs="dropdown@menu layout-editor@action-menu" role="menu" aria-label="{{ trans('common.actions') }}" class="dropdown-menu">
+            <li><button type="button" data-action="move_left" class="icon-item">@icon('chevron-left') {{ trans('common.move_left') }}</button></li>
+            <li><button type="button" data-action="move_up" class="icon-item">@icon('chevron-up') {{ trans('entities.books_sort_move_up') }}</button></li>
+            <li><button type="button" data-action="move_down" class="icon-item">@icon('chevron-down') {{ trans('entities.books_sort_move_down') }}</button></li>
+            <li><button type="button" data-action="move_right" class="icon-item">@icon('chevron-right') {{ trans('common.move_right') }}</button></li>
+            <li><button type="button" data-action="add" class="icon-item">@icon('add-small') {{ trans('common.add') }}</button></li>
+            <li><button type="button" data-action="remove" class="icon-item">@icon('remove') {{ trans('common.remove') }}</button></li>
+        </ul>
+    </div>
+</li>
\ No newline at end of file
diff --git a/resources/views/settings/parts/table-user.blade.php b/resources/views/settings/parts/table-user.blade.php
index d29ad1979a0..affc7b6c4c4 100644
--- a/resources/views/settings/parts/table-user.blade.php
+++ b/resources/views/settings/parts/table-user.blade.php
@@ -1,12 +1,7 @@
 {{--
-$user - User mode to display, Can be null.
-$user_id - Id of user to show. Must be provided.
+$user - User to display.
 --}}
-@if($user)
-    <a href="{{ $user->getEditUrl() }}" class="flex-container-row inline gap-s items-center">
-        <div class="flex-none"><img width="40" height="40" class="avatar block" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}"></div>
-        <div class="flex">{{ $user->name }}</div>
-    </a>
-@else
-    [ID: {{ $user_id }}] {{ trans('common.deleted_user') }}
-@endif
\ No newline at end of file
+<a href="{{ $user->getEditUrl() }}" class="flex-container-row inline gap-s items-center">
+    <div class="flex-none"><img width="40" height="40" class="avatar block" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}"></div>
+    <div class="flex">{{ $user->name }}</div>
+</a>
\ No newline at end of file
diff --git a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
index b18f9cbe08c..2dad617dcad 100644
--- a/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
+++ b/resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
@@ -33,7 +33,14 @@
         @endif
     </div>
     <div class="flex-2 px-m py-xs flex-container-row items-center min-width-m">
-        <div><strong class="hide-over-l">{{ trans('settings.recycle_bin_deleted_by') }}:<br></strong>@include('settings.parts.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])</div>
+        <div>
+            <strong class="hide-over-l">{{ trans('settings.recycle_bin_deleted_by') }}:<br></strong>
+            @if($deletion->deleter)
+                @include('settings.parts.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])
+            @else
+                {{ trans('common.deleted_user') }}
+            @endif
+        </div>
     </div>
     <div class="flex px-m py-xs min-width-s"><strong class="hide-over-l">{{ trans('settings.recycle_bin_deleted_at') }}:<br></strong>{{ $deletion->created_at }}</div>
     <div class="flex px-m py-xs text-m-right min-width-s">
diff --git a/resources/views/settings/roles/parts/asset-permissions-row.blade.php b/resources/views/settings/roles/parts/asset-permissions-row.blade.php
index 8bff570cb85..200153b1b71 100644
--- a/resources/views/settings/roles/parts/asset-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/asset-permissions-row.blade.php
@@ -6,27 +6,35 @@
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.create') }}<br></small>
         @if($permissionPrefix === 'page' || $permissionPrefix === 'chapter')
-            @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-own', 'label' => trans('settings.role_own')])
+            @php $createOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+            @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $createOwnAria])
             <br>
         @endif
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => trans('settings.role_all')])
+        @php $createAllAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $createAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.view') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-own', 'label' => trans('settings.role_own')])
+        @php $viewOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $viewOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all')])
+        @php $viewAllAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $viewAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own')])
+        @php $editOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $editOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all')])
+        @php $editAllAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $editAllAria])
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own')])
+        @php $deleteOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $deleteOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all')])
+        @php $deleteAllAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $deleteAllAria])
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/settings/roles/parts/checkbox.blade.php b/resources/views/settings/roles/parts/checkbox.blade.php
index 44cdd22bdf6..5818888d723 100644
--- a/resources/views/settings/roles/parts/checkbox.blade.php
+++ b/resources/views/settings/roles/parts/checkbox.blade.php
@@ -3,5 +3,6 @@
        'name' => 'permissions[' . $permission . ']',
        'value' => 'true',
        'checked' => old('permissions'.$permission, false)|| (!old('display_name', false) && (isset($role) && $role->hasPermission($permission))),
-       'label' => $label
+       'label' => $label,
+       'ariaLabel' => $ariaLabel ?? null
 ])
\ No newline at end of file
diff --git a/resources/views/settings/roles/parts/form.blade.php b/resources/views/settings/roles/parts/form.blade.php
index a77b80e4c69..dec8d574e7d 100644
--- a/resources/views/settings/roles/parts/form.blade.php
+++ b/resources/views/settings/roles/parts/form.blade.php
@@ -30,10 +30,10 @@
         <label class="setting-list-label">{{ trans('settings.role_system') }}</label>
         <a href="#" refs="permissions-table@toggle-all" class="text-small text-link">{{ trans('common.toggle_all') }}</a>
 
-        <div class="toggle-switch-list grid half mt-m">
+        <div class="custom-checkbox-list grid half my-m">
             <div>
-                <div>@include('settings.roles.parts.checkbox', ['permission' => 'restrictions-manage-all', 'label' => trans('settings.role_manage_entity_permissions')])</div>
-                <div>@include('settings.roles.parts.checkbox', ['permission' => 'restrictions-manage-own', 'label' => trans('settings.role_manage_own_entity_permissions')])</div>
+                <div>@include('settings.roles.parts.checkbox', ['permission' => 'restrictions-manage-all', 'label' => trans('settings.role_manage_entity_permissions')]) <sup>1</sup></div>
+                <div>@include('settings.roles.parts.checkbox', ['permission' => 'restrictions-manage-own', 'label' => trans('settings.role_manage_own_entity_permissions')]) <sup>1</sup></div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'templates-manage', 'label' => trans('settings.role_manage_page_templates')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'access-api', 'label' => trans('settings.role_access_api')])</div>
                 <div>@include('settings.roles.parts.checkbox', ['permission' => 'content-export', 'label' => trans('settings.role_export_content')])</div>
@@ -48,6 +48,10 @@
                 <p class="text-warn text-small mt-s mb-none">{{ trans('settings.roles_system_warning') }}</p>
             </div>
         </div>
+
+        <p class="mb-none text-small text-muted">
+            <sup>1</sup> {{ trans('settings.role_permission_note_users_and_roles') }}
+        </p>
     </div>
 
     <div>
@@ -61,7 +65,7 @@
         <div component="permissions-table"
              option:permissions-table:cell-selector=".item-list-row > div"
              option:permissions-table:row-selector=".item-list-row"
-             class="item-list toggle-switch-list">
+             class="item-list custom-checkbox-list">
             <div class="item-list-row flex-container-row items-center hide-under-m bold">
                 <div class="flex py-s px-m min-width-s">
                     <a href="#" refs="permissions-table@toggle-all" class="text-small text-link">{{ trans('common.toggle_all') }}</a>
@@ -75,7 +79,8 @@ class="item-list toggle-switch-list">
             @include('settings.roles.parts.asset-permissions-row', ['title' => trans('entities.books'), 'permissionPrefix' => 'book'])
             @include('settings.roles.parts.asset-permissions-row', ['title' => trans('entities.chapters'), 'permissionPrefix' => 'chapter'])
             @include('settings.roles.parts.asset-permissions-row', ['title' => trans('entities.pages'), 'permissionPrefix' => 'page'])
-            @include('settings.roles.parts.related-asset-permissions-row', ['title' => trans('entities.images'), 'permissionPrefix' => 'image', 'refMark' => '1'])
+            @include('settings.roles.parts.revisions-permissions-row', ['title' => trans('entities.revisions'), 'permissionPrefix' => 'revision'])
+            @include('settings.roles.parts.related-asset-permissions-row', ['title' => trans('entities.images'), 'permissionPrefix' => 'image'])
             @include('settings.roles.parts.related-asset-permissions-row', ['title' => trans('entities.attachments'), 'permissionPrefix' => 'attachment'])
             @include('settings.roles.parts.related-asset-permissions-row', ['title' => trans('entities.comments'), 'permissionPrefix' => 'comment'])
         </div>
@@ -83,6 +88,8 @@ class="item-list toggle-switch-list">
         <div>
             <p class="text-muted text-small p-m">
                 <sup>1</sup> {{ trans('settings.role_asset_image_view_note') }}
+                <br>
+                <sup>2</sup> {{ trans('settings.role_asset_users_note') }}
             </p>
         </div>
     </div>
diff --git a/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php b/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
index 62fdd6b744a..ac8e7422e43 100644
--- a/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
@@ -5,22 +5,30 @@
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.create') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => ''])
+        @php $createAllAria = trans('settings.role_permission_aria', ['action' => trans('common.create'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-create-all', 'label' => '', 'ariaLabel' => $createAllAria])
+        @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.view') }}<br></small>
-        <small class="faded">{{ trans('settings.role_controlled_by_asset') }}@if($refMark ?? false)<sup>{{ $refMark }}</sup>@endif</small>
+        <small class="faded">{{ trans('settings.role_controlled_by_asset') }}@if($permissionPrefix === 'image')<sup class="text-muted">1</sup>@endif</small>
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own')])
+        @php $editOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $editOwnAria])
+        @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all')])
+        @php $editAllAria = trans('settings.role_permission_aria', ['action' => trans('common.edit'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-update-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $editAllAria])
+        @if($permissionPrefix === 'comment')<sup class="text-muted">2</sup>@endif
     </div>
     <div class="flex py-s px-m min-width-xxs">
         <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own')])
+        @php $deleteOwnAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_own')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-own', 'label' => trans('settings.role_own'), 'ariaLabel' => $deleteOwnAria])
         <br>
-        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all')])
+        @php $deleteAllAria = trans('settings.role_permission_aria', ['action' => trans('common.delete'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-delete-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $deleteAllAria])
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/settings/roles/parts/revisions-permissions-row.blade.php b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
new file mode 100644
index 00000000000..50b714de468
--- /dev/null
+++ b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
@@ -0,0 +1,23 @@
+<div class="item-list-row flex-container-row items-center wrap">
+    <div class="flex py-s px-m min-width-s">
+        <strong>{{ $title }}</strong> <br>
+        <a href="#" refs="permissions-table@toggle-row" class="text-small text-link">{{ trans('common.toggle_all') }}</a>
+    </div>
+    <div class="flex py-s px-m min-width-xxs">
+        <small class="hide-over-m bold">{{ trans('common.create') }}<br></small>
+        <strong class="text-muted opacity-70 text-large">-</strong>
+    </div>
+    <div class="flex py-s px-m min-width-xxs">
+        <small class="hide-over-m bold">{{ trans('common.view') }}<br></small>
+        @php $viewAllAria = trans('settings.role_permission_aria', ['action' => trans('common.view'), 'resource' => strtolower($title), 'value' => trans('settings.role_all')]); @endphp
+        @include('settings.roles.parts.checkbox', ['permission' => $permissionPrefix . '-view-all', 'label' => trans('settings.role_all'), 'ariaLabel' => $viewAllAria])
+    </div>
+    <div class="flex py-s px-m min-width-xxs">
+        <small class="hide-over-m bold">{{ trans('common.edit') }}<br></small>
+        <strong class="text-muted opacity-70 text-large">-</strong>
+    </div>
+    <div class="flex py-s px-m min-width-xxs">
+        <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
+        <small>{{ trans('settings.role_controlled_by_page_delete') }}</small>
+    </div>
+</div>
diff --git a/resources/views/settings/webhooks/parts/form.blade.php b/resources/views/settings/webhooks/parts/form.blade.php
index 56929e3cee7..fede1afbad3 100644
--- a/resources/views/settings/webhooks/parts/form.blade.php
+++ b/resources/views/settings/webhooks/parts/form.blade.php
@@ -36,9 +36,9 @@
         <p class="small">{{ trans('settings.webhooks_events_desc') }}</p>
         <p class="text-warn small">{{ trans('settings.webhooks_events_warning') }}</p>
 
-        <div class="toggle-switch-list">
+        <div class="custom-checkbox-list">
             @include('form.custom-checkbox', [
-                'name' => 'events[]',
+                'name' => 'events[all]',
                 'value' => 'all',
                 'label' => trans('settings.webhooks_events_all'),
                 'checked' => old('events') ? in_array('all', old('events')) : (isset($webhook) ? $webhook->tracksEvent('all') : false),
@@ -47,11 +47,11 @@
 
         <hr class="my-s">
 
-        <div class="dual-column-content toggle-switch-list">
+        <div class="dual-column-content custom-checkbox-list">
             @foreach(\BookStack\Activity\ActivityType::all() as $activityType)
                 <div>
                     @include('form.custom-checkbox', [
-                       'name' => 'events[]',
+                       'name' => 'events[' . $activityType . ']',
                        'value' => $activityType,
                        'label' => $activityType,
                        'checked' => old('events') ? in_array($activityType, old('events')) : (isset($webhook) ? $webhook->tracksEvent($activityType) : false),
diff --git a/resources/views/settings/webhooks/parts/format-example.blade.php b/resources/views/settings/webhooks/parts/format-example.blade.php
index e10a6c69e28..476fca661e6 100644
--- a/resources/views/settings/webhooks/parts/format-example.blade.php
+++ b/resources/views/settings/webhooks/parts/format-example.blade.php
@@ -50,7 +50,6 @@
             "updated_at": "2021-12-11T21:53:24.000000Z",
             "slug": "my-wonderful-updated-page",
             "book_slug": "my-awesome-book",
-            "type": "version",
             "summary": "Updated the title and fixed some spelling",
             "revision_number": 2
         }
diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php
index bb7c57e0fde..87c6392983f 100644
--- a/resources/views/shelves/index.blade.php
+++ b/resources/views/shelves/index.blade.php
@@ -4,52 +4,10 @@
     @include('shelves.parts.list', ['shelves' => $shelves, 'view' => $view, 'listOptions' => $listOptions])
 @stop
 
-@section('right')
-
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-            @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
-                <a href="{{ url("/create-shelf") }}" data-shortcut="new" class="icon-list-item">
-                    <span>@icon('add')</span>
-                    <span>{{ trans('entities.shelves_new_action') }}</span>
-                </a>
-            @endif
-
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
-
-            <a href="{{ url('/tags') }}" class="icon-list-item">
-                <span>@icon('tag')</span>
-                <span>{{ trans('entities.tags_view_tags') }}</span>
-            </a>
-        </div>
-    </div>
-
-@stop
-
 @section('left')
-    @if($recents)
-        <div id="recents" class="mb-xl">
-            <h5>{{ trans('entities.recently_viewed') }}</h5>
-            @include('entities.list', ['entities' => $recents, 'style' => 'compact'])
-        </div>
-    @endif
-
-    <div id="popular" class="mb-xl">
-        <h5>{{ trans('entities.shelves_popular') }}</h5>
-        @if(count($popular) > 0)
-            @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
-        @else
-            <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_popular_empty') }}</p>
-        @endif
-    </div>
+    @include('common.view-blocks', ['location' => 'shelves-index', 'position' => 'left'])
+@stop
 
-    <div id="new" class="mb-xl">
-        <h5>{{ trans('entities.shelves_new') }}</h5>
-        @if(count($new) > 0)
-            @include('entities.list', ['entities' => $new, 'style' => 'compact'])
-        @else
-            <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_new_empty') }}</p>
-        @endif
-    </div>
-@stop
\ No newline at end of file
+@section('right')
+    @include('common.view-blocks', ['location' => 'shelves-index', 'position' => 'right'])
+@stop
diff --git a/resources/views/shelves/parts/form.blade.php b/resources/views/shelves/parts/form.blade.php
index 0207d72780b..0a5343b16eb 100644
--- a/resources/views/shelves/parts/form.blade.php
+++ b/resources/views/shelves/parts/form.blade.php
@@ -26,9 +26,12 @@ class="icon-button px-xs py-xxs mx-xs text-bigger"
                     @icon('more')
                 </button>
                 <div refs="dropdown@menu shelf-sort@sort-button-container" class="dropdown-menu" role="menu">
-                    <button type="button" class="text-item" data-sort="name">{{ trans('entities.books_sort_name') }}</button>
-                    <button type="button" class="text-item" data-sort="created">{{ trans('entities.books_sort_created') }}</button>
-                    <button type="button" class="text-item" data-sort="updated">{{ trans('entities.books_sort_updated') }}</button>
+                    <button type="button" class="text-item"
+                            data-sort="name">{{ trans('entities.books_sort_name') }}</button>
+                    <button type="button" class="text-item"
+                            data-sort="created">{{ trans('entities.books_sort_created') }}</button>
+                    <button type="button" class="text-item"
+                            data-sort="updated">{{ trans('entities.books_sort_updated') }}</button>
                 </div>
             </div>
         </div>
@@ -42,7 +45,8 @@ class="scroll-box configured-option-list">
     </div>
     <div class="form-group">
         <label for="books" id="shelf-sort-all-books-label">{{ trans('entities.shelves_add_books') }}</label>
-        <input type="text" refs="shelf-sort@book-search" class="scroll-box-search" placeholder="{{ trans('common.search') }}">
+        <input type="text" refs="shelf-sort@book-search" class="scroll-box-search"
+               placeholder="{{ trans('common.search') }}">
         <ul refs="shelf-sort@all-book-list"
             aria-labelledby="shelf-sort-all-books-label"
             class="scroll-box available-option-list">
@@ -54,7 +58,6 @@ class="scroll-box available-option-list">
 </div>
 
 
-
 <div class="form-group collapsible" component="collapsible" id="logo-control">
     <button refs="collapsible@trigger" type="button" class="collapse-title text-link" aria-expanded="false">
         <label>{{ trans('common.cover_image') }}</label>
@@ -64,7 +67,7 @@ class="scroll-box available-option-list">
 
         @include('form.image-picker', [
             'defaultImage' => url('/book_default_cover.png'),
-            'currentImage' => (isset($shelf) && $shelf->cover) ? $shelf->getBookCover() : url('/book_default_cover.png') ,
+            'currentImage' => (($shelf ?? null)?->coverInfo()->getUrl(440, 250, null) ?? url('/book_default_cover.png')),
             'name' => 'image',
             'imageClass' => 'cover'
         ])
@@ -81,7 +84,8 @@ class="scroll-box available-option-list">
 </div>
 
 <div class="form-group text-right">
-    <a href="{{ isset($shelf) ? $shelf->getUrl() : url('/shelves') }}" class="button outline">{{ trans('common.cancel') }}</a>
+    <a href="{{ isset($shelf) ? $shelf->getUrl() : url('/shelves') }}"
+       class="button outline">{{ trans('common.cancel') }}</a>
     <button type="submit" class="button">{{ trans('entities.shelves_save') }}</button>
 </div>
 
diff --git a/resources/views/shelves/parts/index-sidebar-section-actions.blade.php b/resources/views/shelves/parts/index-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..d5cdb4056a4
--- /dev/null
+++ b/resources/views/shelves/parts/index-sidebar-section-actions.blade.php
@@ -0,0 +1,18 @@
+<div id="actions" class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+        @if(userCan(\BookStack\Permissions\Permission::BookshelfCreateAll))
+            <a href="{{ url("/create-shelf") }}" data-shortcut="new" class="icon-list-item">
+                <span>@icon('add')</span>
+                <span>{{ trans('entities.shelves_new_action') }}</span>
+            </a>
+        @endif
+
+        @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelves'])
+
+        <a href="{{ url('/tags') }}" class="icon-list-item">
+            <span>@icon('tag')</span>
+            <span>{{ trans('entities.tags_view_tags') }}</span>
+        </a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/index-sidebar-section-new.blade.php b/resources/views/shelves/parts/index-sidebar-section-new.blade.php
new file mode 100644
index 00000000000..602f60ebeaa
--- /dev/null
+++ b/resources/views/shelves/parts/index-sidebar-section-new.blade.php
@@ -0,0 +1,8 @@
+<div id="new" class="mb-xl">
+    <h5>{{ trans('entities.shelves_new') }}</h5>
+    @if(count($new) > 0)
+        @include('entities.list', ['entities' => $new, 'style' => 'compact'])
+    @else
+        <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_new_empty') }}</p>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/index-sidebar-section-popular.blade.php b/resources/views/shelves/parts/index-sidebar-section-popular.blade.php
new file mode 100644
index 00000000000..956321c5e01
--- /dev/null
+++ b/resources/views/shelves/parts/index-sidebar-section-popular.blade.php
@@ -0,0 +1,8 @@
+<div id="popular" class="mb-xl">
+    <h5>{{ trans('entities.shelves_popular') }}</h5>
+    @if(count($popular) > 0)
+        @include('entities.list', ['entities' => $popular, 'style' => 'compact'])
+    @else
+        <p class="text-muted pb-l mb-none">{{ trans('entities.shelves_popular_empty') }}</p>
+    @endif
+</div>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/index-sidebar-section-recents.blade.php b/resources/views/shelves/parts/index-sidebar-section-recents.blade.php
new file mode 100644
index 00000000000..f1a68ba4f99
--- /dev/null
+++ b/resources/views/shelves/parts/index-sidebar-section-recents.blade.php
@@ -0,0 +1,6 @@
+@if($recents)
+    <div id="recents" class="mb-xl">
+        <h5>{{ trans('entities.recently_viewed') }}</h5>
+        @include('entities.list', ['entities' => $recents, 'style' => 'compact'])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/shelves/parts/list-item.blade.php b/resources/views/shelves/parts/list-item.blade.php
index 00cacfa707c..5fc8a362b32 100644
--- a/resources/views/shelves/parts/list-item.blade.php
+++ b/resources/views/shelves/parts/list-item.blade.php
@@ -1,5 +1,5 @@
 <a href="{{ $shelf->getUrl() }}" class="shelf entity-list-item" data-entity-type="bookshelf" data-entity-id="{{$shelf->id}}">
-    <div class="entity-list-item-image bg-bookshelf @if($shelf->image_id) has-image @endif" style="background-image: url('{{ $shelf->getBookCover() }}')">
+    <div class="entity-list-item-image bg-bookshelf @if($shelf->coverInfo()->exists()) has-image @endif" style="background-image: url('{{ $shelf->coverInfo()->getUrl() }}')">
         @icon('bookshelf')
     </div>
     <div class="content py-xs">
diff --git a/resources/views/shelves/parts/show-sidebar-section-actions.blade.php b/resources/views/shelves/parts/show-sidebar-section-actions.blade.php
new file mode 100644
index 00000000000..ba92e5f703b
--- /dev/null
+++ b/resources/views/shelves/parts/show-sidebar-section-actions.blade.php
@@ -0,0 +1,43 @@
+<div id="actions" class="actions mb-xl">
+    <h5>{{ trans('common.actions') }}</h5>
+    <div class="icon-list text-link">
+
+        @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
+            <a href="{{ $shelf->getUrl('/create-book') }}" data-shortcut="new" class="icon-list-item">
+                <span class="icon">@icon('add')</span>
+                <span>{{ trans('entities.books_new_action') }}</span>
+            </a>
+        @endif
+
+        @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelf'])
+
+        <hr class="primary-background">
+
+        @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
+            <a href="{{ $shelf->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
+                <span>@icon('edit')</span>
+                <span>{{ trans('common.edit') }}</span>
+            </a>
+        @endif
+
+        @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
+            <a href="{{ $shelf->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
+                <span>@icon('lock')</span>
+                <span>{{ trans('entities.permissions') }}</span>
+            </a>
+        @endif
+
+        @if(userCan(\BookStack\Permissions\Permission::BookshelfDelete, $shelf))
+            <a href="{{ $shelf->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
+                <span>@icon('delete')</span>
+                <span>{{ trans('common.delete') }}</span>
+            </a>
+        @endif
+
+        @if(!user()->isGuest())
+            <hr class="primary-background">
+            @include('entities.favourite-action', ['entity' => $shelf])
+        @endif
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/show-sidebar-section-activity.blade.php b/resources/views/shelves/parts/show-sidebar-section-activity.blade.php
new file mode 100644
index 00000000000..c1c5c1d3ecf
--- /dev/null
+++ b/resources/views/shelves/parts/show-sidebar-section-activity.blade.php
@@ -0,0 +1,6 @@
+@if(count($activity) > 0)
+    <div id="recent-activity" class="mb-xl">
+        <h5>{{ trans('entities.recent_activity') }}</h5>
+        @include('common.activity-list', ['activity' => $activity])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/shelves/parts/show-sidebar-section-details.blade.php b/resources/views/shelves/parts/show-sidebar-section-details.blade.php
new file mode 100644
index 00000000000..8933cc41973
--- /dev/null
+++ b/resources/views/shelves/parts/show-sidebar-section-details.blade.php
@@ -0,0 +1,21 @@
+<div id="details" class="mb-xl">
+    <h5>{{ trans('common.details') }}</h5>
+    <div class="blended-links">
+        @include('entities.meta', ['entity' => $shelf, 'watchOptions' => null])
+        @if($shelf->hasPermissions())
+            <div class="active-restriction">
+                @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
+                    <a href="{{ $shelf->getUrl('/permissions') }}" class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.shelves_permissions_active') }}</div>
+                    </a>
+                @else
+                    <div class="entity-meta-item">
+                        @icon('lock')
+                        <div>{{ trans('entities.shelves_permissions_active') }}</div>
+                    </div>
+                @endif
+            </div>
+        @endif
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/shelves/parts/show-sidebar-section-tags.blade.php b/resources/views/shelves/parts/show-sidebar-section-tags.blade.php
new file mode 100644
index 00000000000..265d61cd0d3
--- /dev/null
+++ b/resources/views/shelves/parts/show-sidebar-section-tags.blade.php
@@ -0,0 +1,5 @@
+@if($shelf->tags->count() > 0)
+    <div id="tags" class="mb-xl">
+        @include('entities.tag-list', ['entity' => $shelf])
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/shelves/show.blade.php b/resources/views/shelves/show.blade.php
index 633f959f3c9..b942f35ff7a 100644
--- a/resources/views/shelves/show.blade.php
+++ b/resources/views/shelves/show.blade.php
@@ -2,8 +2,8 @@
 
 @push('social-meta')
     <meta property="og:description" content="{{ Str::limit($shelf->description, 100, '...') }}">
-    @if($shelf->cover)
-        <meta property="og:image" content="{{ $shelf->getBookCover() }}">
+    @if($shelf->coverInfo()->exists())
+        <meta property="og:image" content="{{ $shelf->coverInfo()->getUrl() }}">
     @endif
 @endpush
 
@@ -28,7 +28,7 @@
         </div>
 
         <div class="book-content">
-            <div class="text-muted break-text">{!! $shelf->descriptionHtml() !!}</div>
+            <div class="text-muted break-text">{!! $shelf->descriptionInfo()->getHtml() !!}</div>
             @if(count($sortedVisibleShelfBooks) > 0)
                 @if($view === 'list')
                     <div class="entity-list">
@@ -69,89 +69,9 @@
 @stop
 
 @section('left')
-
-    @if($shelf->tags->count() > 0)
-        <div id="tags" class="mb-xl">
-            @include('entities.tag-list', ['entity' => $shelf])
-        </div>
-    @endif
-
-    <div id="details" class="mb-xl">
-        <h5>{{ trans('common.details') }}</h5>
-        <div class="blended-links">
-            @include('entities.meta', ['entity' => $shelf, 'watchOptions' => null])
-            @if($shelf->hasPermissions())
-                <div class="active-restriction">
-                    @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
-                        <a href="{{ $shelf->getUrl('/permissions') }}" class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.shelves_permissions_active') }}</div>
-                        </a>
-                    @else
-                        <div class="entity-meta-item">
-                            @icon('lock')
-                            <div>{{ trans('entities.shelves_permissions_active') }}</div>
-                        </div>
-                    @endif
-                </div>
-            @endif
-        </div>
-    </div>
-
-    @if(count($activity) > 0)
-        <div id="recent-activity" class="mb-xl">
-            <h5>{{ trans('entities.recent_activity') }}</h5>
-            @include('common.activity-list', ['activity' => $activity])
-        </div>
-    @endif
+    @include('common.view-blocks', ['location' => 'shelves-show', 'position' => 'left'])
 @stop
 
 @section('right')
-    <div class="actions mb-xl">
-        <h5>{{ trans('common.actions') }}</h5>
-        <div class="icon-list text-link">
-
-            @if(userCan(\BookStack\Permissions\Permission::BookCreateAll) && userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
-                <a href="{{ $shelf->getUrl('/create-book') }}" data-shortcut="new" class="icon-list-item">
-                    <span class="icon">@icon('add')</span>
-                    <span>{{ trans('entities.books_new_action') }}</span>
-                </a>
-            @endif
-
-            @include('entities.view-toggle', ['view' => $view, 'type' => 'bookshelf'])
-
-            <hr class="primary-background">
-
-            @if(userCan(\BookStack\Permissions\Permission::BookshelfUpdate, $shelf))
-                <a href="{{ $shelf->getUrl('/edit') }}" data-shortcut="edit" class="icon-list-item">
-                    <span>@icon('edit')</span>
-                    <span>{{ trans('common.edit') }}</span>
-                </a>
-            @endif
-
-            @if(userCan(\BookStack\Permissions\Permission::RestrictionsManage, $shelf))
-                <a href="{{ $shelf->getUrl('/permissions') }}" data-shortcut="permissions" class="icon-list-item">
-                    <span>@icon('lock')</span>
-                    <span>{{ trans('entities.permissions') }}</span>
-                </a>
-            @endif
-
-            @if(userCan(\BookStack\Permissions\Permission::BookshelfDelete, $shelf))
-                <a href="{{ $shelf->getUrl('/delete') }}" data-shortcut="delete" class="icon-list-item">
-                    <span>@icon('delete')</span>
-                    <span>{{ trans('common.delete') }}</span>
-                </a>
-            @endif
-
-            @if(!user()->isGuest())
-                <hr class="primary-background">
-                @include('entities.favourite-action', ['entity' => $shelf])
-            @endif
-
-        </div>
-    </div>
+    @include('common.view-blocks', ['location' => 'shelves-show', 'position' => 'right'])
 @stop
-
-
-
-
diff --git a/resources/views/users/account/auth.blade.php b/resources/views/users/account/auth.blade.php
index 57e6c1f9cb3..1dadded3d7b 100644
--- a/resources/views/users/account/auth.blade.php
+++ b/resources/views/users/account/auth.blade.php
@@ -14,17 +14,22 @@
                     {{ trans('preferences.auth_change_password_desc') }}
                 </p>
 
-                <div class="grid half mt-m gap-xl wrap stretch-inputs mb-m">
+                <div class="grid half mt-m gap-xl wrap stretch-inputs mb-s">
                     <div>
-                        <label for="password">{{ trans('auth.password') }}</label>
+                        <label for="password">{{ trans('auth.password_new') }}</label>
                         @include('form.password', ['name' => 'password', 'autocomplete' => 'new-password'])
                     </div>
                     <div>
-                        <label for="password-confirm">{{ trans('auth.password_confirm') }}</label>
+                        <label for="password-confirm">{{ trans('auth.password_new_confirm') }}</label>
                         @include('form.password', ['name' => 'password-confirm'])
                     </div>
                 </div>
 
+                <div class="stretch-inputs mb-m">
+                    <label for="password-current">{{ trans('auth.password_current') }}</label>
+                    @include('form.password', ['name' => 'password-current'])
+                </div>
+
                 <div class="form-group text-right">
                     <button class="button">{{ trans('common.update') }}</button>
                 </div>
diff --git a/resources/views/users/account/interface.blade.php b/resources/views/users/account/interface.blade.php
new file mode 100644
index 00000000000..7d78f08c81b
--- /dev/null
+++ b/resources/views/users/account/interface.blade.php
@@ -0,0 +1,54 @@
+@extends('users.account.layout')
+
+@section('main')
+    <section class="card content-wrap auto-height">
+        <form action="{{ url('/my-account/interface') }}" method="post">
+            {{ method_field('put') }}
+            {{ csrf_field() }}
+
+            <h1 class="list-heading">{{ trans('preferences.interface') }}</h1>
+            <p class="text-small text-muted mb-none">{{ trans('preferences.interface_desc') }}</p>
+
+            <div class="setting-list">
+                @include('users.parts.language-option-row', ['value' => old('language') ?? user()->getLocale()->appLocale()])
+                @include('users.account.parts.display-mode-option-row')
+            </div>
+
+            <div class="form-group text-right">
+                <button class="button">{{ trans('common.save') }}</button>
+            </div>
+
+        </form>
+    </section>
+
+    <section class="card content-wrap auto-height">
+        <h2 class="list-heading">{{ trans('preferences.layouts') }}</h2>
+        <p class="text-small text-muted">{{ trans('preferences.layouts_desc') }}</p>
+
+        <div class="item-list mb-m">
+            @foreach($namedLocations as $locationKey => $locationName)
+                <div class="flex-container-row justify-space-between item-list-row items-center wrap px-xs">
+                    <div class="py-xs px-s min-width-m">
+                        <a href="{{ url('/layouts/' . $locationKey) }}">{{ $locationName }}</a>
+                    </div>
+                    <div class="py-xs min-width-m text-m-right px-m">
+                        <a class="button outline small" href="{{ url('/layouts/' . $locationKey) }}">{{ trans('common.configure') }}</a>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+
+    </section>
+
+    <section class="card content-wrap auto-height">
+        <div class="flex-container-row gap-l items-center wrap">
+            <div class="flex">
+                <h2 class="list-heading">{{ trans('preferences.shortcuts_interface') }}</h2>
+                <p class="text-small text-muted">{{ trans('preferences.shortcuts_overview_desc') }}</p>
+            </div>
+            <div class="text-m-right">
+                <a class="button outline" href="{{ url('/my-account/shortcuts') }}">{{ trans('common.open') }}</a>
+            </div>
+        </div>
+    </section>
+@stop
diff --git a/resources/views/users/account/layout.blade.php b/resources/views/users/account/layout.blade.php
index df8ebc2d904..94f1f328de0 100644
--- a/resources/views/users/account/layout.blade.php
+++ b/resources/views/users/account/layout.blade.php
@@ -11,6 +11,7 @@
                     <nav class="active-link-list in-sidebar">
                         <a href="{{ url('/my-account/profile') }}" class="{{ $category === 'profile' ? 'active' : '' }}">@icon('user') {{ trans('preferences.profile') }}</a>
                         <a href="{{ url('/my-account/auth') }}" class="{{ $category === 'auth' ? 'active' : '' }}">@icon('security') {{ trans('preferences.auth') }}</a>
+                        <a href="{{ url('/my-account/interface') }}" class="{{ $category === 'interface' ? 'active' : '' }}">@icon('interface') {{ trans('preferences.interface') }}</a>
                         <a href="{{ url('/my-account/shortcuts') }}" class="{{ $category === 'shortcuts' ? 'active' : '' }}">@icon('shortcuts') {{ trans('preferences.shortcuts_interface') }}</a>
                         @if(userCan(\BookStack\Permissions\Permission::ReceiveNotifications))
                             <a href="{{ url('/my-account/notifications') }}" class="{{ $category === 'notifications' ? 'active' : '' }}">@icon('notifications') {{ trans('preferences.notifications') }}</a>
diff --git a/resources/views/users/account/notifications.blade.php b/resources/views/users/account/notifications.blade.php
index b3b082bd7e3..948682ac029 100644
--- a/resources/views/users/account/notifications.blade.php
+++ b/resources/views/users/account/notifications.blade.php
@@ -10,7 +10,7 @@
             <p class="text-small text-muted">{{ trans('preferences.notifications_desc') }}</p>
 
             <div class="flex-container-row wrap justify-space-between pb-m">
-                <div class="toggle-switch-list min-width-l">
+                <div class="custom-checkbox-list min-width-l">
                     <div>
                         @include('form.toggle-switch', [
                             'name' => 'preferences[own-page-changes]',
@@ -33,6 +33,13 @@
                                 'label' => trans('preferences.notifications_opt_comment_replies'),
                             ])
                         </div>
+                        <div>
+                            @include('form.toggle-switch', [
+                                'name' => 'preferences[comment-mentions]',
+                                'value' => $preferences->notifyOnCommentMentions(),
+                                'label' => trans('preferences.notifications_opt_comment_mentions'),
+                            ])
+                        </div>
                     @endif
                 </div>
 
diff --git a/resources/views/users/account/parts/display-mode-option-row.blade.php b/resources/views/users/account/parts/display-mode-option-row.blade.php
new file mode 100644
index 00000000000..a6e78c5aea3
--- /dev/null
+++ b/resources/views/users/account/parts/display-mode-option-row.blade.php
@@ -0,0 +1,18 @@
+<div class="grid half gap-xl v-center">
+    <div>
+        <label for="user-language" class="setting-list-label">{{ trans('preferences.interface_display_mode') }}</label>
+        <p class="small">
+            {{ trans('preferences.interface_display_mode_desc') }}
+        </p>
+    </div>
+    <div>
+        @php
+            $userOptions = setting()->getForCurrentUser('dark-mode-enabled') ? 'dark' : 'light';
+            $value = old('display_mode') ?? $userOptions;
+        @endphp
+        <select name="display_mode" id="display-mode">
+            <option @if($value === 'light') selected @endif value="light">{{ trans('common.light_mode') }}</option>
+            <option @if($value === 'dark') selected @endif value="dark">{{ trans('common.dark_mode') }}</option>
+        </select>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 611653d6a80..8a4a8bcce79 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -71,6 +71,40 @@ class="button outline">{{ trans('settings.users_mfa_configure') }}</a>
                 </div>
             </div>
 
+            @if($mfaMethods->count() > 0)
+                <div id="reset-mfa" component="collapsible" class="form-group collapsible mt-s">
+                    <button refs="collapsible@trigger" type="button" class="collapse-title text-link" aria-expanded="false">
+                        <label for="mfa-reset">{{ trans('settings.users_mfa_reset') }}</label>
+                    </button>
+                    <div refs="collapsible@content" class="collapse-content">
+                        <div class="flex-container-row justify-space-between gap-m wrap items-center">
+                            <p class="text-small text-muted mb-none flex-2 min-width-m">{{ trans('settings.users_mfa_reset_desc') }}</p>
+                            <form action="{{ url("/settings/users/{$user->id}/mfa") }}" method="POST" style="display: inline;">
+                                {{ csrf_field() }}
+                                {{ method_field('DELETE') }}
+                                <div class="dropdown-container" component="dropdown" option:dropdown:bubble-escapes="true">
+                                    <button class="button" refs="dropdown@toggle"
+                                            type="button"
+                                            aria-haspopup="listbox"
+                                            aria-expanded="{{ trans('settings.users_mfa_reset') }}">
+                                        {{ trans('common.reset') }}
+                                    </button>
+                                    <div refs="dropdown@menu" class="dropdown-menu" role="menu" aria-label="{{ trans('settings.users_mfa_reset') }}">
+                                        <p class="text-neg small px-m mb-xs">
+                                            {{ trans('settings.users_mfa_reset_confirm') }}
+                                        </p>
+                                        <div class="text-link small delete text-item">
+                                            <button type="submit" class="text-button neg">
+                                                {{ trans('common.reset') }}
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            @endif
         </section>
 
         @if(count($activeSocialDrivers) > 0)
diff --git a/routes/api.php b/routes/api.php
index 99df24aed0a..561437c9032 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -2,11 +2,12 @@
 
 /**
  * Routes for the BookStack API.
- * Routes have a uri prefix of /api/.
+ * Routes have a URI prefix of /api/.
  * Controllers all end with "ApiController"
  */
 
-use BookStack\Activity\Controllers\AuditLogApiController;
+use BookStack\Activity\Controllers as ActivityControllers;
+use BookStack\Activity\Controllers\TagApiController;
 use BookStack\Api\ApiDocsController;
 use BookStack\App\SystemApiController;
 use BookStack\Entities\Controllers as EntityControllers;
@@ -19,56 +20,40 @@
 use BookStack\Users\Controllers\UserApiController;
 use Illuminate\Support\Facades\Route;
 
-Route::get('docs.json', [ApiDocsController::class, 'json']);
-
-Route::get('attachments', [AttachmentApiController::class, 'list']);
-Route::post('attachments', [AttachmentApiController::class, 'create']);
-Route::get('attachments/{id}', [AttachmentApiController::class, 'read']);
-Route::put('attachments/{id}', [AttachmentApiController::class, 'update']);
-Route::delete('attachments/{id}', [AttachmentApiController::class, 'delete']);
-
-Route::get('books', [EntityControllers\BookApiController::class, 'list']);
-Route::post('books', [EntityControllers\BookApiController::class, 'create']);
-Route::get('books/{id}', [EntityControllers\BookApiController::class, 'read']);
-Route::put('books/{id}', [EntityControllers\BookApiController::class, 'update']);
-Route::delete('books/{id}', [EntityControllers\BookApiController::class, 'delete']);
-
-Route::get('books/{id}/export/html', [ExportControllers\BookExportApiController::class, 'exportHtml']);
-Route::get('books/{id}/export/pdf', [ExportControllers\BookExportApiController::class, 'exportPdf']);
-Route::get('books/{id}/export/plaintext', [ExportControllers\BookExportApiController::class, 'exportPlainText']);
-Route::get('books/{id}/export/markdown', [ExportControllers\BookExportApiController::class, 'exportMarkdown']);
-Route::get('books/{id}/export/zip', [ExportControllers\BookExportApiController::class, 'exportZip']);
-
-Route::get('chapters', [EntityControllers\ChapterApiController::class, 'list']);
-Route::post('chapters', [EntityControllers\ChapterApiController::class, 'create']);
-Route::get('chapters/{id}', [EntityControllers\ChapterApiController::class, 'read']);
-Route::put('chapters/{id}', [EntityControllers\ChapterApiController::class, 'update']);
-Route::delete('chapters/{id}', [EntityControllers\ChapterApiController::class, 'delete']);
-Route::get('chapters/{id}/export/html', [ExportControllers\ChapterExportApiController::class, 'exportHtml']);
-Route::get('chapters/{id}/export/pdf', [ExportControllers\ChapterExportApiController::class, 'exportPdf']);
-Route::get('chapters/{id}/export/plaintext', [ExportControllers\ChapterExportApiController::class, 'exportPlainText']);
-Route::get('chapters/{id}/export/markdown', [ExportControllers\ChapterExportApiController::class, 'exportMarkdown']);
-Route::get('chapters/{id}/export/zip', [ExportControllers\ChapterExportApiController::class, 'exportZip']);
+// Main Entity Routes
 
 Route::get('pages', [EntityControllers\PageApiController::class, 'list']);
 Route::post('pages', [EntityControllers\PageApiController::class, 'create']);
 Route::get('pages/{id}', [EntityControllers\PageApiController::class, 'read']);
 Route::put('pages/{id}', [EntityControllers\PageApiController::class, 'update']);
 Route::delete('pages/{id}', [EntityControllers\PageApiController::class, 'delete']);
-
 Route::get('pages/{id}/export/html', [ExportControllers\PageExportApiController::class, 'exportHtml']);
 Route::get('pages/{id}/export/pdf', [ExportControllers\PageExportApiController::class, 'exportPdf']);
 Route::get('pages/{id}/export/plaintext', [ExportControllers\PageExportApiController::class, 'exportPlainText']);
 Route::get('pages/{id}/export/markdown', [ExportControllers\PageExportApiController::class, 'exportMarkdown']);
 Route::get('pages/{id}/export/zip', [ExportControllers\PageExportApiController::class, 'exportZip']);
 
-Route::get('image-gallery', [ImageGalleryApiController::class, 'list']);
-Route::post('image-gallery', [ImageGalleryApiController::class, 'create']);
-Route::get('image-gallery/{id}', [ImageGalleryApiController::class, 'read']);
-Route::put('image-gallery/{id}', [ImageGalleryApiController::class, 'update']);
-Route::delete('image-gallery/{id}', [ImageGalleryApiController::class, 'delete']);
+Route::get('chapters', [EntityControllers\ChapterApiController::class, 'list']);
+Route::post('chapters', [EntityControllers\ChapterApiController::class, 'create']);
+Route::get('chapters/{id}', [EntityControllers\ChapterApiController::class, 'read']);
+Route::put('chapters/{id}', [EntityControllers\ChapterApiController::class, 'update']);
+Route::delete('chapters/{id}', [EntityControllers\ChapterApiController::class, 'delete']);
+Route::get('chapters/{id}/export/html', [ExportControllers\ChapterExportApiController::class, 'exportHtml']);
+Route::get('chapters/{id}/export/pdf', [ExportControllers\ChapterExportApiController::class, 'exportPdf']);
+Route::get('chapters/{id}/export/plaintext', [ExportControllers\ChapterExportApiController::class, 'exportPlainText']);
+Route::get('chapters/{id}/export/markdown', [ExportControllers\ChapterExportApiController::class, 'exportMarkdown']);
+Route::get('chapters/{id}/export/zip', [ExportControllers\ChapterExportApiController::class, 'exportZip']);
 
-Route::get('search', [SearchApiController::class, 'all']);
+Route::get('books', [EntityControllers\BookApiController::class, 'list']);
+Route::post('books', [EntityControllers\BookApiController::class, 'create']);
+Route::get('books/{id}', [EntityControllers\BookApiController::class, 'read']);
+Route::put('books/{id}', [EntityControllers\BookApiController::class, 'update']);
+Route::delete('books/{id}', [EntityControllers\BookApiController::class, 'delete']);
+Route::get('books/{id}/export/html', [ExportControllers\BookExportApiController::class, 'exportHtml']);
+Route::get('books/{id}/export/pdf', [ExportControllers\BookExportApiController::class, 'exportPdf']);
+Route::get('books/{id}/export/plaintext', [ExportControllers\BookExportApiController::class, 'exportPlainText']);
+Route::get('books/{id}/export/markdown', [ExportControllers\BookExportApiController::class, 'exportMarkdown']);
+Route::get('books/{id}/export/zip', [ExportControllers\BookExportApiController::class, 'exportZip']);
 
 Route::get('shelves', [EntityControllers\BookshelfApiController::class, 'list']);
 Route::post('shelves', [EntityControllers\BookshelfApiController::class, 'create']);
@@ -76,17 +61,34 @@
 Route::put('shelves/{id}', [EntityControllers\BookshelfApiController::class, 'update']);
 Route::delete('shelves/{id}', [EntityControllers\BookshelfApiController::class, 'delete']);
 
-Route::get('users', [UserApiController::class, 'list']);
-Route::post('users', [UserApiController::class, 'create']);
-Route::get('users/{id}', [UserApiController::class, 'read']);
-Route::put('users/{id}', [UserApiController::class, 'update']);
-Route::delete('users/{id}', [UserApiController::class, 'delete']);
+// Additional Model Routes, in alphabetical order
 
-Route::get('roles', [RoleApiController::class, 'list']);
-Route::post('roles', [RoleApiController::class, 'create']);
-Route::get('roles/{id}', [RoleApiController::class, 'read']);
-Route::put('roles/{id}', [RoleApiController::class, 'update']);
-Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
+Route::get('attachments', [AttachmentApiController::class, 'list']);
+Route::post('attachments', [AttachmentApiController::class, 'create']);
+Route::get('attachments/{id}', [AttachmentApiController::class, 'read']);
+Route::put('attachments/{id}', [AttachmentApiController::class, 'update']);
+Route::delete('attachments/{id}', [AttachmentApiController::class, 'delete']);
+
+Route::get('audit-log', [ActivityControllers\AuditLogApiController::class, 'list']);
+
+Route::get('comments', [ActivityControllers\CommentApiController::class, 'list']);
+Route::post('comments', [ActivityControllers\CommentApiController::class, 'create']);
+Route::get('comments/{id}', [ActivityControllers\CommentApiController::class, 'read']);
+Route::put('comments/{id}', [ActivityControllers\CommentApiController::class, 'update']);
+Route::delete('comments/{id}', [ActivityControllers\CommentApiController::class, 'delete']);
+
+Route::get('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'read']);
+Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
+
+Route::get('docs.json', [ApiDocsController::class, 'json']);
+
+Route::get('image-gallery', [ImageGalleryApiController::class, 'list']);
+Route::post('image-gallery', [ImageGalleryApiController::class, 'create']);
+Route::get('image-gallery/url/data', [ImageGalleryApiController::class, 'readDataForUrl']);
+Route::get('image-gallery/{id}', [ImageGalleryApiController::class, 'read']);
+Route::get('image-gallery/{id}/data', [ImageGalleryApiController::class, 'readData']);
+Route::put('image-gallery/{id}', [ImageGalleryApiController::class, 'update']);
+Route::delete('image-gallery/{id}', [ImageGalleryApiController::class, 'delete']);
 
 Route::get('imports', [ExportControllers\ImportApiController::class, 'list']);
 Route::post('imports', [ExportControllers\ImportApiController::class, 'create']);
@@ -98,9 +100,23 @@
 Route::put('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'restore']);
 Route::delete('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'destroy']);
 
-Route::get('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'read']);
-Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
+Route::get('roles', [RoleApiController::class, 'list']);
+Route::post('roles', [RoleApiController::class, 'create']);
+Route::get('roles/{id}', [RoleApiController::class, 'read']);
+Route::put('roles/{id}', [RoleApiController::class, 'update']);
+Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
 
-Route::get('audit-log', [AuditLogApiController::class, 'list']);
+Route::get('search', [SearchApiController::class, 'all']);
+Route::get('search/book/{id}', [SearchApiController::class, 'book']);
+Route::get('search/chapter/{id}', [SearchApiController::class, 'chapter']);
 
 Route::get('system', [SystemApiController::class, 'read']);
+
+Route::get('tags/names', [TagApiController::class, 'listNames']);
+Route::get('tags/values-for-name', [TagApiController::class, 'listValues']);
+
+Route::get('users', [UserApiController::class, 'list']);
+Route::post('users', [UserApiController::class, 'create']);
+Route::get('users/{id}', [UserApiController::class, 'read']);
+Route::put('users/{id}', [UserApiController::class, 'update']);
+Route::delete('users/{id}', [UserApiController::class, 'delete']);
diff --git a/routes/web.php b/routes/web.php
index ea3efe1ac77..c0c961144a9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -8,7 +8,7 @@
 use BookStack\App\MetaController;
 use BookStack\Entities\Controllers as EntityControllers;
 use BookStack\Exports\Controllers as ExportControllers;
-use BookStack\Http\Middleware\VerifyCsrfToken;
+use BookStack\Http\Middleware\PreventRequestForgery;
 use BookStack\Permissions\PermissionsController;
 use BookStack\References\ReferenceController;
 use BookStack\Search\SearchController;
@@ -17,6 +17,7 @@
 use BookStack\Theming\ThemeController;
 use BookStack\Uploads\Controllers as UploadControllers;
 use BookStack\Users\Controllers as UserControllers;
+use BookStack\View\LayoutController;
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
@@ -39,6 +40,7 @@
     // API docs routes
     Route::get('/api', [ApiDocsController::class, 'redirect']);
     Route::get('/api/docs', [ApiDocsController::class, 'display']);
+    Route::get('/api/docs/download', [ApiDocsController::class, 'download']);
 
     Route::get('/pages/recently-updated', [EntityControllers\PageController::class, 'showRecentlyUpdated']);
 
@@ -108,14 +110,17 @@
     Route::put('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'update']);
     Route::delete('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'destroy']);
     Route::delete('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'destroyDraft']);
+    Route::delete('/page-user-drafts/{pageId}', [EntityControllers\PageUpdateDraftController::class, 'destroy']);
 
     // Revisions
     Route::get('/books/{bookSlug}/page/{pageSlug}/revisions', [EntityControllers\PageRevisionController::class, 'index']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}', [EntityControllers\PageRevisionController::class, 'show']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/changes', [EntityControllers\PageRevisionController::class, 'changes']);
-    Route::put('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', [EntityControllers\PageRevisionController::class, 'restore']);
-    Route::delete('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/delete', [EntityControllers\PageRevisionController::class, 'destroy']);
-    Route::delete('/page-revisions/user-drafts/{pageId}', [EntityControllers\PageRevisionController::class, 'destroyUserDraft']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revision/{revisionNum}', [EntityControllers\PageRevisionController::class, 'showByNumber']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revision/{revisionNum}/changes', [EntityControllers\PageRevisionController::class, 'changesByNumber']);
+    Route::put('/books/{bookSlug}/page/{pageSlug}/revision/{revisionNum}/restore', [EntityControllers\PageRevisionController::class, 'restore']);
+    Route::delete('/books/{bookSlug}/page/{pageSlug}/revision/{revisionNum}/delete', [EntityControllers\PageRevisionController::class, 'destroy']);
+    // Old show/changes routes using revision-ids for for backwards compatibility
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revisionId}', [EntityControllers\PageRevisionController::class, 'showById']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revisionId}/changes', [EntityControllers\PageRevisionController::class, 'changesById']);
 
     // Chapters
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/create-page', [EntityControllers\PageController::class, 'create']);
@@ -198,6 +203,7 @@
 
     // User Search
     Route::get('/search/users/select', [UserControllers\UserSearchController::class, 'forSelect']);
+    Route::get('/search/users/mention', [UserControllers\UserSearchController::class, 'forMentions']);
 
     // Template System
     Route::get('/templates', [EntityControllers\PageTemplateController::class, 'list']);
@@ -250,6 +256,7 @@
     Route::get('/settings/users/{id}', [UserControllers\UserController::class, 'edit']);
     Route::put('/settings/users/{id}', [UserControllers\UserController::class, 'update']);
     Route::delete('/settings/users/{id}', [UserControllers\UserController::class, 'destroy']);
+    Route::delete('/settings/users/{id}/mfa', [UserControllers\UserController::class, 'resetMfa']);
 
     // User Account
     Route::get('/my-account', [UserControllers\UserAccountController::class, 'redirect']);
@@ -259,6 +266,8 @@
     Route::put('/my-account/shortcuts', [UserControllers\UserAccountController::class, 'updateShortcuts']);
     Route::get('/my-account/notifications', [UserControllers\UserAccountController::class, 'showNotifications']);
     Route::put('/my-account/notifications', [UserControllers\UserAccountController::class, 'updateNotifications']);
+    Route::get('/my-account/interface', [UserControllers\UserAccountController::class, 'showInterface']);
+    Route::put('/my-account/interface', [UserControllers\UserAccountController::class, 'updateInterface']);
     Route::get('/my-account/auth', [UserControllers\UserAccountController::class, 'showAuth']);
     Route::put('/my-account/auth/password', [UserControllers\UserAccountController::class, 'updatePassword']);
     Route::get('/my-account/delete', [UserControllers\UserAccountController::class, 'delete']);
@@ -271,6 +280,11 @@
     Route::patch('/preferences/toggle-dark-mode', [UserControllers\UserPreferencesController::class, 'toggleDarkMode']);
     Route::patch('/preferences/update-code-language-favourite', [UserControllers\UserPreferencesController::class, 'updateCodeLanguageFavourite']);
 
+    // Layout endpoints
+    Route::get('/layouts/{location}', [LayoutController::class, 'edit']);
+    Route::put('/layouts/{location}', [LayoutController::class, 'update']);
+    Route::put('/layouts/{location}/reset', [LayoutController::class, 'reset']);
+
     // User API Tokens
     Route::get('/api-tokens/{userId}/create', [UserApiTokenController::class, 'create']);
     Route::post('/api-tokens/{userId}/create', [UserApiTokenController::class, 'store']);
@@ -351,7 +365,7 @@
 Route::post('/saml2/acs', [AccessControllers\Saml2Controller::class, 'startAcs'])->withoutMiddleware([
     StartSession::class,
     ShareErrorsFromSession::class,
-    VerifyCsrfToken::class,
+    PreventRequestForgery::class,
 ]);
 Route::get('/saml2/acs', [AccessControllers\Saml2Controller::class, 'processAcs']);
 
diff --git a/storage/fonts/.gitignore b/storage/fonts/.gitignore
index c96a04f008e..cb0b47dace2 100755
--- a/storage/fonts/.gitignore
+++ b/storage/fonts/.gitignore
@@ -1,2 +1,6 @@
+# Font cache files have once been stored directly in this folder
+# therefore its important the contents non-ignored by git
+# are chosen selectively
 *
-!.gitignore
\ No newline at end of file
+!.gitignore
+!dompdf/
\ No newline at end of file
diff --git a/storage/fonts/dompdf/.gitignore b/storage/fonts/dompdf/.gitignore
new file mode 100644
index 00000000000..23ef65311b4
--- /dev/null
+++ b/storage/fonts/dompdf/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!cache/
\ No newline at end of file
diff --git a/storage/fonts/dompdf/cache/.gitignore b/storage/fonts/dompdf/cache/.gitignore
new file mode 100644
index 00000000000..c96a04f008e
--- /dev/null
+++ b/storage/fonts/dompdf/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
index 05c4471f2b5..a8f2c23fda9 100755
--- a/storage/framework/.gitignore
+++ b/storage/framework/.gitignore
@@ -2,8 +2,10 @@ compiled.php
 config.php
 down
 events.scanned.php
+lsp-*.php
 maintenance.php
 routes.php
 routes.scanned.php
 schedule-*
 services.json
+purifier/
diff --git a/tests/Activity/AuditLogTest.php b/tests/Activity/AuditLogTest.php
index 6b435544df7..a6ba6be9f62 100644
--- a/tests/Activity/AuditLogTest.php
+++ b/tests/Activity/AuditLogTest.php
@@ -83,6 +83,22 @@ public function test_shows_activity_for_deleted_users()
         $resp->assertSeeText("[ID: {$viewer->id}] Deleted User");
     }
 
+    public function test_deleted_user_shows_if_user_created_date_is_later_than_activity()
+    {
+        $viewer = $this->users->viewer();
+        $this->actingAs($viewer);
+        $page = $this->entities->page();
+        $this->activityService->add(ActivityType::PAGE_CREATE, $page);
+        $viewer->created_at = Carbon::now()->addDay();
+        $viewer->save();
+
+        $this->actingAs($this->users->admin());
+
+        $resp = $this->get('settings/audit');
+        $resp->assertSeeText("[ID: {$viewer->id}] Deleted User");
+        $resp->assertDontSee($viewer->name);
+    }
+
     public function test_filters_by_key()
     {
         $this->actingAs($this->users->admin());
diff --git a/tests/Entity/CommentDisplayTest.php b/tests/Activity/CommentDisplayTest.php
similarity index 94%
rename from tests/Entity/CommentDisplayTest.php
rename to tests/Activity/CommentDisplayTest.php
index bffe29fa95b..798ea16eef4 100644
--- a/tests/Entity/CommentDisplayTest.php
+++ b/tests/Activity/CommentDisplayTest.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace Tests\Entity;
+namespace Tests\Activity;
 
-use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Comment;
-use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class CommentDisplayTest extends TestCase
@@ -72,8 +70,8 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
 
         Comment::factory()->create([
             'created_by'  => $editor->id,
-            'entity_type' => 'page',
-            'entity_id'   => $page->id,
+            'commentable_type' => 'page',
+            'commentable_id'   => $page->id,
         ]);
 
         $resp = $this->actingAs($editor)->get($page->getUrl());
@@ -84,7 +82,7 @@ public function test_comment_editor_js_loaded_with_create_or_edit_permissions()
     public function test_comment_displays_relative_times()
     {
         $page = $this->entities->page();
-        $comment = Comment::factory()->create(['entity_id' => $page->id, 'entity_type' => $page->getMorphClass()]);
+        $comment = Comment::factory()->create(['commentable_id' => $page->id, 'commentable_type' => $page->getMorphClass()]);
         $comment->created_at = now()->subWeek();
         $comment->updated_at = now()->subDay();
         $comment->save();
diff --git a/tests/Activity/CommentMentionTest.php b/tests/Activity/CommentMentionTest.php
new file mode 100644
index 00000000000..b9701b11577
--- /dev/null
+++ b/tests/Activity/CommentMentionTest.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace Tests\Activity;
+
+use BookStack\Activity\Notifications\Messages\CommentMentionNotification;
+use BookStack\Permissions\Permission;
+use Illuminate\Support\Facades\Notification;
+use Tests\TestCase;
+
+class CommentMentionTest extends TestCase
+{
+    public function test_mentions_are_notified()
+    {
+        $userToMention = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($userToMention, [Permission::ReceiveNotifications]);
+        $editor = $this->users->editor();
+        $page = $this->entities->pageWithinChapter();
+        $notifications = Notification::fake();
+
+        $this->actingAs($editor)->post("/comment/{$page->id}", [
+            'html' => '<p>Hello <a data-mention-user-id="' . $userToMention->id . '">@user</a></p>'
+        ])->assertOk();
+
+        $notifications->assertSentTo($userToMention, function (CommentMentionNotification $notification) use ($userToMention, $editor, $page) {
+            $mail = $notification->toMail($userToMention);
+            $mailContent = html_entity_decode(strip_tags($mail->render()), ENT_QUOTES);
+            $subjectPrefix = 'You have been mentioned in a comment on page: ' . mb_substr($page->name, 0, 20);
+            return str_starts_with($mail->subject, $subjectPrefix)
+                && str_contains($mailContent, 'View Comment')
+                && str_contains($mailContent, 'Page Name: ' . $page->name)
+                && str_contains($mailContent, 'Page Path: ' . $page->book->getShortName(24) . ' > ' . $page->chapter->getShortName(24))
+                && str_contains($mailContent, 'Commenter: ' . $editor->name)
+                && str_contains($mailContent, 'Comment: Hello @user');
+        });
+    }
+
+    public function test_mentions_are_not_notified_if_mentioned_by_same_user()
+    {
+        $editor = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($editor, [Permission::ReceiveNotifications]);
+        $page = $this->entities->page();
+        $notifications = Notification::fake();
+
+        $this->actingAs($editor)->post("/comment/{$page->id}", [
+            'html' => '<p>Hello <a data-mention-user-id="' . $editor->id . '"></a></p>'
+        ])->assertOk();
+
+        $notifications->assertNothingSent();
+    }
+
+    public function test_mentions_are_logged_to_the_database_even_if_not_notified()
+    {
+        $editor = $this->users->editor();
+        $otherUser = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($editor, [Permission::ReceiveNotifications]);
+        $page = $this->entities->page();
+        $notifications = Notification::fake();
+
+        $this->actingAs($editor)->post("/comment/{$page->id}", [
+            'html' => '<p>Hello <a data-mention-user-id="' . $editor->id . '"></a> and <a data-mention-user-id="' . $otherUser->id . '"></a></p>'
+        ])->assertOk();
+
+        $notifications->assertNothingSent();
+
+        $comment = $page->comments()->latest()->first();
+        $this->assertDatabaseHas('mention_history', [
+            'mentionable_id' => $comment->id,
+            'mentionable_type' => 'comment',
+            'from_user_id' => $editor->id,
+            'to_user_id' => $otherUser->id,
+        ]);
+        $this->assertDatabaseHas('mention_history', [
+            'mentionable_id' => $comment->id,
+            'mentionable_type' => 'comment',
+            'from_user_id' => $editor->id,
+            'to_user_id' => $editor->id,
+        ]);
+    }
+
+    public function test_comment_updates_will_send_notifications_only_if_mention_is_new()
+    {
+        $userToMention = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($userToMention, [Permission::ReceiveNotifications]);
+        $editor = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($editor, [Permission::CommentUpdateOwn]);
+        $page = $this->entities->page();
+        $notifications = Notification::fake();
+
+        $this->actingAs($editor)->post("/comment/{$page->id}", [
+            'html' => '<p>Hello there</p>'
+        ])->assertOk();
+        $comment = $page->comments()->latest()->first();
+
+        $notifications->assertNothingSent();
+
+        $this->put("/comment/{$comment->id}", [
+            'html' => '<p>Hello <a data-mention-user-id="' . $userToMention->id . '"></a></p>'
+        ])->assertOk();
+
+        $notifications->assertSentTo($userToMention, CommentMentionNotification::class);
+        $notifications->assertCount(1);
+
+        $this->put("/comment/{$comment->id}", [
+            'html' => '<p>Hello again<a data-mention-user-id="' . $userToMention->id . '"></a></p>'
+        ])->assertOk();
+
+        $notifications->assertCount(1);
+    }
+
+    public function test_notification_limited_to_those_with_view_permissions()
+    {
+        $userA = $this->users->newUser();
+        $userB = $this->users->newUser();
+        $this->permissions->grantUserRolePermissions($userA, [Permission::ReceiveNotifications]);
+        $this->permissions->grantUserRolePermissions($userB, [Permission::ReceiveNotifications]);
+        $notifications = Notification::fake();
+        $page = $this->entities->page();
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $userA->roles()->first());
+
+        $this->asAdmin()->post("/comment/{$page->id}", [
+            'html' => '<p>Hello <a data-mention-user-id="' . $userA->id . '"></a> and <a data-mention-user-id="' . $userB->id . '"></a></p>'
+        ])->assertOk();
+
+        $notifications->assertCount(1);
+        $notifications->assertSentTo($userA, CommentMentionNotification::class);
+    }
+}
diff --git a/tests/Entity/CommentSettingTest.php b/tests/Activity/CommentSettingTest.php
similarity index 96%
rename from tests/Entity/CommentSettingTest.php
rename to tests/Activity/CommentSettingTest.php
index 7de4574414f..f8210114c46 100644
--- a/tests/Entity/CommentSettingTest.php
+++ b/tests/Activity/CommentSettingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Entity;
+namespace Tests\Activity;
 
 use Tests\TestCase;
 
diff --git a/tests/Entity/CommentStoreTest.php b/tests/Activity/CommentStoreTest.php
similarity index 85%
rename from tests/Entity/CommentStoreTest.php
rename to tests/Activity/CommentStoreTest.php
index de093a3a6e9..04624e4d5f9 100644
--- a/tests/Entity/CommentStoreTest.php
+++ b/tests/Activity/CommentStoreTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Entity;
+namespace Tests\Activity;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Comment;
-use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class CommentStoreTest extends TestCase
@@ -14,6 +13,7 @@ public function test_add_comment()
         $this->asAdmin();
         $page = $this->entities->page();
 
+        Comment::factory()->create(['commentable_id' => $page->id, 'commentable_type' => 'page', 'local_id' => 2]);
         $comment = Comment::factory()->make(['parent_id' => 2]);
         $resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
 
@@ -24,9 +24,9 @@ public function test_add_comment()
         $pageResp->assertSee($comment->html, false);
 
         $this->assertDatabaseHas('comments', [
-            'local_id'    => 1,
-            'entity_id'   => $page->id,
-            'entity_type' => Page::newModelInstance()->getMorphClass(),
+            'local_id'    => 3,
+            'commentable_id'   => $page->id,
+            'commentable_type' => 'page',
             'parent_id'   => 2,
         ]);
 
@@ -52,9 +52,9 @@ public function test_add_comment_stores_content_reference_only_if_format_valid()
             ]);
 
             if ($valid) {
-                $this->assertDatabaseHas('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+                $this->assertDatabaseHas('comments', ['commentable_id' => $page->id, 'content_ref' => $ref]);
             } else {
-                $this->assertDatabaseMissing('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+                $this->assertDatabaseMissing('comments', ['commentable_id' => $page->id, 'content_ref' => $ref]);
             }
         }
     }
@@ -79,7 +79,7 @@ public function test_comment_edit()
 
         $this->assertDatabaseHas('comments', [
             'html'      => $newHtml,
-            'entity_id' => $page->id,
+            'commentable_id' => $page->id,
         ]);
 
         $this->assertActivityExists(ActivityType::COMMENT_UPDATE);
@@ -105,6 +105,23 @@ public function test_comment_delete()
         $this->assertActivityExists(ActivityType::COMMENT_DELETE);
     }
 
+    public function test_comment_delete_requires_view_permission_to_page()
+    {
+        $editor = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($editor, ['comment-delete-all']);
+        $page = $this->entities->page();
+        $this->actingAs($editor);
+
+        $commentData = Comment::factory()->make();
+        $this->postJson("/comment/$page->id", $commentData->getAttributes());
+        $comment = $page->comments()->first();
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $resp = $this->deleteJson("/comment/$comment->id");
+        $resp->assertStatus(404);
+        $this->assertDatabaseHas('comments', ['id' => $comment->id]);
+    }
+
     public function test_comment_archive_and_unarchive()
     {
         $this->asAdmin();
@@ -218,7 +235,7 @@ public function test_scripts_are_removed_even_if_already_in_db()
         $page = $this->entities->page();
         Comment::factory()->create([
             'html' => '<script>superbadscript</script><script>superbadscript</script><p onclick="superbadonclick">scriptincommentest</p>',
-            'entity_type' => 'page', 'entity_id' => $page
+            'commentable_type' => 'page', 'commentable_id' => $page
         ]);
 
         $resp = $this->asAdmin()->get($page->getUrl());
@@ -236,8 +253,8 @@ public function test_comment_html_is_limited()
         $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
         $resp->assertOk();
         $this->assertDatabaseHas('comments', [
-           'entity_type' => 'page',
-           'entity_id' => $page->id,
+           'commentable_type' => 'page',
+           'commentable_id' => $page->id,
            'html' => $expected,
         ]);
 
@@ -259,8 +276,8 @@ public function test_comment_html_spans_are_cleaned()
         $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
         $resp->assertOk();
         $this->assertDatabaseHas('comments', [
-            'entity_type' => 'page',
-            'entity_id' => $page->id,
+            'commentable_type' => 'page',
+            'commentable_id' => $page->id,
             'html' => $expected,
         ]);
 
diff --git a/tests/Activity/CommentsApiTest.php b/tests/Activity/CommentsApiTest.php
new file mode 100644
index 00000000000..51009da3952
--- /dev/null
+++ b/tests/Activity/CommentsApiTest.php
@@ -0,0 +1,250 @@
+<?php
+
+namespace Tests\Activity;
+
+use BookStack\Activity\Models\Comment;
+use BookStack\Permissions\Permission;
+use Tests\Api\TestsApi;
+use Tests\TestCase;
+
+class CommentsApiTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_endpoint_permission_controls()
+    {
+        $user = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($user, [Permission::CommentDeleteAll, Permission::CommentUpdateAll]);
+
+        $page = $this->entities->page();
+        $comment = Comment::factory()->make();
+        $page->comments()->save($comment);
+        $this->actingAsForApi($user);
+
+        $actions = [
+            ['GET', '/api/comments'],
+            ['GET', "/api/comments/{$comment->id}"],
+            ['POST', "/api/comments"],
+            ['PUT', "/api/comments/{$comment->id}"],
+            ['DELETE', "/api/comments/{$comment->id}"],
+        ];
+
+        foreach ($actions as [$method, $endpoint]) {
+            $resp = $this->call($method, $endpoint);
+            $this->assertNotPermissionError($resp);
+        }
+
+        $comment = Comment::factory()->make();
+        $page->comments()->save($comment);
+        $this->getJson("/api/comments")->assertSee(['id' => $comment->id]);
+
+        $this->permissions->removeUserRolePermissions($user, [
+            Permission::CommentDeleteAll, Permission::CommentDeleteOwn,
+            Permission::CommentUpdateAll, Permission::CommentUpdateOwn,
+            Permission::CommentCreateAll
+        ]);
+
+        $this->assertPermissionError($this->json('delete', "/api/comments/{$comment->id}"));
+        $this->assertPermissionError($this->json('put', "/api/comments/{$comment->id}"));
+        $this->assertPermissionError($this->json('post', "/api/comments"));
+        $this->assertNotPermissionError($this->json('get', "/api/comments/{$comment->id}"));
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->json('get', "/api/comments/{$comment->id}")->assertStatus(404);
+        $this->getJson("/api/comments")->assertDontSee(['id' => $comment->id]);
+    }
+
+    public function test_index()
+    {
+        $page = $this->entities->page();
+        Comment::query()->delete();
+
+        $comments = Comment::factory()->count(10)->make();
+        $page->comments()->saveMany($comments);
+
+        $firstComment = $comments->first();
+        $resp = $this->actingAsApiEditor()->getJson('/api/comments');
+        $resp->assertJson([
+            'data' => [
+                [
+                    'id' => $firstComment->id,
+                    'commentable_id' => $page->id,
+                    'commentable_type' => 'page',
+                    'parent_id' => null,
+                    'local_id' => $firstComment->local_id,
+                ],
+            ],
+        ]);
+        $resp->assertJsonCount(10, 'data');
+        $resp->assertJson(['total' => 10]);
+
+        $filtered = $this->getJson("/api/comments?filter[id]={$firstComment->id}");
+        $filtered->assertJsonCount(1, 'data');
+        $filtered->assertJson(['total' => 1]);
+    }
+
+    public function test_create()
+    {
+        $page = $this->entities->page();
+
+        $resp = $this->actingAsApiEditor()->postJson('/api/comments', [
+            'page_id' => $page->id,
+            'html' => '<p>My wonderful comment</p>',
+            'content_ref' => 'test-content-ref',
+        ]);
+        $resp->assertOk();
+        $id = $resp->json('id');
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $id,
+            'commentable_id' => $page->id,
+            'commentable_type' => 'page',
+            'html' => '<p>My wonderful comment</p>',
+        ]);
+
+        $comment = Comment::query()->findOrFail($id);
+        $this->assertIsInt($comment->local_id);
+
+        $reply = $this->actingAsApiEditor()->postJson('/api/comments', [
+            'page_id' => $page->id,
+            'html' => '<p>My wonderful reply</p>',
+            'content_ref' => 'test-content-ref',
+            'reply_to' => $comment->local_id,
+        ]);
+        $reply->assertOk();
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $reply->json('id'),
+            'commentable_id' => $page->id,
+            'commentable_type' => 'page',
+            'html' => '<p>My wonderful reply</p>',
+            'parent_id' => $comment->local_id,
+        ]);
+    }
+
+    public function test_read()
+    {
+        $page = $this->entities->page();
+        $user = $this->users->viewer();
+        $comment = Comment::factory()->make([
+            'html' => '<p>A lovely comment <script>hello</script></p>',
+            'created_by' => $user->id,
+            'updated_by' => $user->id,
+        ]);
+        $page->comments()->save($comment);
+        $comment->refresh();
+        $reply = Comment::factory()->make([
+            'parent_id' => $comment->local_id,
+            'html' => '<p>A lovely<script>angry</script>reply</p>',
+        ]);
+        $page->comments()->save($reply);
+
+        $resp = $this->actingAsApiEditor()->getJson("/api/comments/{$comment->id}");
+        $resp->assertJson([
+            'id' => $comment->id,
+            'commentable_id' => $page->id,
+            'commentable_type' => 'page',
+            'html' => '<p>A lovely comment </p>',
+            'archived' => false,
+            'created_by' => [
+                'id' => $user->id,
+                'name' => $user->name,
+            ],
+            'updated_by' => [
+                'id' => $user->id,
+                'name' => $user->name,
+            ],
+            'replies' => [
+                [
+                    'id' => $reply->id,
+                    'html' => '<p>A lovelyreply</p>'
+                ]
+            ]
+        ]);
+    }
+
+    public function test_update()
+    {
+        $page = $this->entities->page();
+        $user = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($user, [Permission::CommentUpdateAll]);
+        $comment = Comment::factory()->make([
+            'html' => '<p>A lovely comment</p>',
+            'created_by' => $this->users->viewer()->id,
+            'updated_by' => $this->users->viewer()->id,
+            'parent_id' => null,
+        ]);
+        $page->comments()->save($comment);
+
+        $this->actingAsForApi($user)->putJson("/api/comments/{$comment->id}", [
+           'html' => '<p>A lovely updated comment</p>',
+        ])->assertOk();
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'html' => '<p>A lovely updated comment</p>',
+            'archived' => 0,
+        ]);
+
+        $this->putJson("/api/comments/{$comment->id}", [
+            'archived' => true,
+        ]);
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'html' => '<p>A lovely updated comment</p>',
+            'archived' => 1,
+        ]);
+
+        $this->putJson("/api/comments/{$comment->id}", [
+            'archived' => false,
+            'html' => '<p>A lovely updated again comment</p>',
+        ]);
+
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'html' => '<p>A lovely updated again comment</p>',
+            'archived' => 0,
+        ]);
+    }
+
+    public function test_update_cannot_archive_replies()
+    {
+        $page = $this->entities->page();
+        $user = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($user, [Permission::CommentUpdateAll]);
+        $comment = Comment::factory()->make([
+            'html' => '<p>A lovely comment</p>',
+            'created_by' => $this->users->viewer()->id,
+            'updated_by' => $this->users->viewer()->id,
+            'parent_id' => 90,
+        ]);
+        $page->comments()->save($comment);
+
+        $resp = $this->actingAsForApi($user)->putJson("/api/comments/{$comment->id}", [
+            'archived' => true,
+        ]);
+
+        $this->assertEquals($this->errorResponse('Only top-level comments can be archived.', 400), $resp->json());
+        $this->assertDatabaseHas('comments', [
+            'id' => $comment->id,
+            'archived' => 0,
+        ]);
+    }
+
+    public function test_destroy()
+    {
+        $page = $this->entities->page();
+        $user = $this->users->editor();
+        $this->permissions->grantUserRolePermissions($user, [Permission::CommentDeleteAll]);
+        $comment = Comment::factory()->make([
+            'html' => '<p>A lovely comment</p>',
+        ]);
+        $page->comments()->save($comment);
+
+        $this->actingAsForApi($user)->deleteJson("/api/comments/{$comment->id}")->assertStatus(204);
+        $this->assertDatabaseMissing('comments', [
+            'id' => $comment->id,
+        ]);
+    }
+}
diff --git a/tests/Activity/MentionParserTest.php b/tests/Activity/MentionParserTest.php
new file mode 100644
index 00000000000..08bfc10d2a8
--- /dev/null
+++ b/tests/Activity/MentionParserTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Activity;
+
+use BookStack\Activity\Tools\MentionParser;
+use Tests\TestCase;
+
+class MentionParserTest extends TestCase
+{
+    public function test_it_extracts_mentions()
+    {
+        $parser = new MentionParser();
+
+        // Test basic mention extraction
+        $html = '<p>Hello <a href="/user/5" data-mention-user-id="5">@User</a></p>';
+        $result = $parser->parseUserIdsFromHtml($html);
+        $this->assertEquals([5], $result);
+
+        // Test multiple mentions
+        $html = '<p><a data-mention-user-id="1">@Alice</a> and <a data-mention-user-id="2">@Bob</a></p>';
+        $result = $parser->parseUserIdsFromHtml($html);
+        $this->assertEquals([1, 2], $result);
+
+        // Test filtering out invalid IDs (zero and negative)
+        $html = '<p><a data-mention-user-id="0">@Invalid</a> <a data-mention-user-id="-5">@Negative</a> <a data-mention-user-id="3">@Valid</a></p>';
+        $result = $parser->parseUserIdsFromHtml($html);
+        $this->assertEquals([3], $result);
+
+        // Test non-mention links are ignored
+        $html = '<p><a href="/page/1">Normal Link</a> <a data-mention-user-id="7">@User</a></p>';
+        $result = $parser->parseUserIdsFromHtml($html);
+        $this->assertEquals([7], $result);
+
+        // Test empty HTML
+        $result = $parser->parseUserIdsFromHtml('');
+        $this->assertEquals([], $result);
+
+        // Test duplicate user IDs
+        $html = '<p><a data-mention-user-id="4">@User</a> mentioned <a data-mention-user-id="4">@User</a> again</p>';
+        $result = $parser->parseUserIdsFromHtml($html);
+        $this->assertEquals([4], $result);
+    }
+}
diff --git a/tests/Activity/WatchTest.php b/tests/Activity/WatchTest.php
index c405b07aed7..dc78e894253 100644
--- a/tests/Activity/WatchTest.php
+++ b/tests/Activity/WatchTest.php
@@ -218,10 +218,10 @@ public function test_notify_comment_replies()
 
         $notifications = Notification::fake();
 
-        $this->actingAs($editor)->post("/comment/{$entities['page']->id}", [
+        $resp = $this->actingAs($editor)->post("/comment/{$entities['page']->id}", [
             'html' => '<p>My new comment</p>'
         ]);
-        $comment = $entities['page']->comments()->orderBy('id', 'desc')->first();
+        $comment = $entities['page']->comments()->reorder('id', 'desc')->first();
 
         $this->asAdmin()->post("/comment/{$entities['page']->id}", [
             'html' => '<p>My new comment response</p>',
@@ -327,6 +327,24 @@ public function test_notify_watch_parent_book_new()
         });
     }
 
+    public function test_notify_watch_page_ignore_when_no_page_owner()
+    {
+        $editor = $this->users->editor();
+        $entities = $this->entities->createChainBelongingToUser($editor);
+        $entities['page']->owned_by = null;
+        $entities['page']->save();
+
+        $watches = new UserEntityWatchOptions($editor, $entities['page']);
+        $watches->updateLevelByValue(WatchLevels::IGNORE);
+
+        $notifications = Notification::fake();
+        $this->asAdmin();
+
+        $this->entities->updatePage($entities['page'], ['name' => 'My updated page', 'html' => 'Hello']);
+
+        $notifications->assertNothingSent();
+    }
+
     public function test_notifications_sent_in_right_language()
     {
         $editor = $this->users->editor();
@@ -340,8 +358,8 @@ public function test_notifications_sent_in_right_language()
             ActivityType::PAGE_CREATE => $entities['page'],
             ActivityType::PAGE_UPDATE => $entities['page'],
             ActivityType::COMMENT_CREATE => Comment::factory()->make([
-                'entity_id' => $entities['page']->id,
-                'entity_type' => $entities['page']->getMorphClass(),
+                'commentable_id' => $entities['page']->id,
+                'commentable_type' => $entities['page']->getMorphClass(),
             ]),
         ];
 
diff --git a/tests/Activity/WebhookFormatTesting.php b/tests/Activity/WebhookFormatTesting.php
index f04f95b667e..614e794e438 100644
--- a/tests/Activity/WebhookFormatTesting.php
+++ b/tests/Activity/WebhookFormatTesting.php
@@ -30,11 +30,10 @@ public function test_entity_events_show_related_user_info()
     public function test_page_create_and_update_events_show_revision_info()
     {
         $page = $this->entities->page();
-        $this->asEditor()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html', 'summary' => 'Update a']);
+        $this->asEditor()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html', 'changelog' => 'Update a']);
 
         $data = $this->getWebhookData(ActivityType::PAGE_UPDATE, $page);
         $this->assertEquals($page->currentRevision->id, Arr::get($data, 'related_item.current_revision.id'));
-        $this->assertEquals($page->currentRevision->type, Arr::get($data, 'related_item.current_revision.type'));
         $this->assertEquals('Update a', Arr::get($data, 'related_item.current_revision.summary'));
     }
 
diff --git a/tests/Activity/WebhookManagementTest.php b/tests/Activity/WebhookManagementTest.php
index b55b5480d27..d669893f75a 100644
--- a/tests/Activity/WebhookManagementTest.php
+++ b/tests/Activity/WebhookManagementTest.php
@@ -72,7 +72,7 @@ public function test_edit_view()
         $resp->assertSee('Edit Webhook');
         $this->withHtml($resp)->assertElementContains('form[action="' . $webhook->getUrl() . '"] button', 'Save Webhook');
         $this->withHtml($resp)->assertElementContains('a[href="' . $webhook->getUrl('/delete') . '"]', 'Delete Webhook');
-        $this->withHtml($resp)->assertElementExists('input[type="checkbox"][value="all"][name="events[]"]');
+        $this->withHtml($resp)->assertElementExists('input[type="checkbox"][name="events[all]"][value="all"]');
     }
 
     public function test_update()
diff --git a/tests/Api/ApiAuthTest.php b/tests/Api/ApiAuthTest.php
index 93e4b02e423..76c2c9ce932 100644
--- a/tests/Api/ApiAuthTest.php
+++ b/tests/Api/ApiAuthTest.php
@@ -12,7 +12,7 @@ class ApiAuthTest extends TestCase
 {
     use TestsApi;
 
-    protected $endpoint = '/api/books';
+    protected string $endpoint = '/api/books';
 
     public function test_requests_succeed_with_default_auth()
     {
@@ -24,7 +24,8 @@ public function test_requests_succeed_with_default_auth()
 
         $this->actingAs($viewer, 'standard');
 
-        $resp = $this->get($this->endpoint);
+        $this->startSession();
+        $resp = $this->withCredentials()->get($this->endpoint);
         $resp->assertStatus(200);
     }
 
@@ -75,6 +76,7 @@ public function test_api_access_permission_required_to_access_api_with_session_a
     {
         $editor = $this->users->editor();
         $this->actingAs($editor, 'standard');
+        $this->startSession();
 
         $resp = $this->get($this->endpoint);
         $resp->assertStatus(200);
@@ -112,6 +114,28 @@ public function test_access_prevented_for_guest_users_with_api_permission_while_
         $resp->assertStatus(200);
     }
 
+    public function test_only_get_requests_are_supported_with_session_auth()
+    {
+        $user = $this->users->admin();
+        $this->actingAs($user, 'standard');
+        $this->startSession();
+
+        $uriByMethods = [
+            'POST' => '/books',
+            'PUT' => '/books/1',
+            'DELETE' => '/books/1',
+            'HEAD' => '/books',
+        ];
+
+        foreach ($uriByMethods as $method => $uri) {
+            $resp = $this->withCredentials()->json($method, "/api{$uri}");
+            $resp->assertStatus(403);
+            if ($method !== 'HEAD') {
+                $resp->assertJson($this->errorResponse('Only GET requests are allowed when using the API with cookie-based authentication', 403));
+            }
+        }
+    }
+
     public function test_token_expiry_checked()
     {
         $editor = $this->users->editor();
diff --git a/tests/Api/ApiDocsTest.php b/tests/Api/ApiDocsTest.php
index a1603e0ef82..2b218bcce1a 100644
--- a/tests/Api/ApiDocsTest.php
+++ b/tests/Api/ApiDocsTest.php
@@ -22,7 +22,7 @@ public function test_docs_page_returns_view_with_docs_content()
         $resp->assertStatus(200);
         $resp->assertSee(url('/api/docs.json'));
         $resp->assertSee('Show a JSON view of the API docs data.');
-        $resp->assertHeader('Content-Type', 'text/html; charset=UTF-8');
+        $resp->assertHeader('Content-Type', 'text/html; charset=utf-8');
     }
 
     public function test_docs_json_endpoint_returns_json()
@@ -37,4 +37,40 @@ public function test_docs_json_endpoint_returns_json()
             ]],
         ]);
     }
+
+    public function test_download_endpoint_returns_html_by_default()
+    {
+        $resp = $this->actingAsApiEditor()->get($this->endpoint . '/download');
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'application/octet-stream');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'bookstack-api-docs.html');
+
+        $resp->assertSee('BookStack API Documentation');
+        $resp->assertSee('Getting Started');
+        $resp->assertSee('content-permissions-update');
+        $resp->assertDontSee('Jump To Section');
+    }
+
+    public function test_download_endpoint_returns_json_when_requested()
+    {
+        $resp = $this->actingAsApiEditor()->get($this->endpoint . '/download?format=json');
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'application/octet-stream');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'bookstack-api-docs.json');
+
+        $resp->assertSee('Getting Started');
+        $resp->assertSee('content-permissions-update');
+        $resp->assertDontSee('Jump To Section');
+
+        $content = $resp->json('getting-started-guide');
+        $this->assertIsString($content);
+        $this->assertGreaterThan(100, strlen($content));
+
+        $resp->assertJson([
+            'docs' => [[
+                'name' => 'docs-display',
+                'uri'  => 'api/docs',
+            ]],
+        ]);
+    }
 }
diff --git a/tests/Api/ApiErrorTest.php b/tests/Api/ApiErrorTest.php
new file mode 100644
index 00000000000..d24d8fa12cf
--- /dev/null
+++ b/tests/Api/ApiErrorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Api;
+
+use BookStack\App\SystemApiController;
+use BookStack\Exceptions\PrettyException;
+use Tests\TestCase;
+
+class ApiErrorTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_exception_detail_only_shown_in_debug_mode()
+    {
+        $mockController = $this->partialMock(SystemApiController::class);
+        $mockController->shouldReceive('read')->andThrow(\InvalidArgumentException::class, 'Potentially sensitive data', 500);
+
+        $resp = $this->actingAsApiEditor()->get('/api/system');
+        $resp->assertStatus(500);
+        $resp->assertDontSee('Potentially sensitive data', false);
+        $resp->assertJsonPath('error.message', 'An error occurred');
+
+        config(['app.debug' => true]);
+
+        $resp = $this->actingAsApiEditor()->get('/api/system');
+        $resp->assertStatus(500);
+        $resp->assertJsonPath('error.message', 'Potentially sensitive data');
+    }
+
+    public function test_exception_message_when_model_not_found()
+    {
+        $resp = $this->actingAsApiEditor()->get('/api/books/123456789');
+        $resp->assertStatus(404);
+        $resp->assertSee('The requested resource could not be found.', false);
+    }
+
+    public function test_pretty_exception_messages_are_provided_in_non_debug_mode()
+    {
+        $mockController = $this->partialMock(SystemApiController::class);
+        $exception = new PrettyException('Mr Error is here!');
+        $exception->setSubtitle('Oh no!');
+        $exception->setDetails('Something has really gone wrong');
+        $mockController->shouldReceive('read')->andThrow($exception);
+
+        $resp = $this->actingAsApiEditor()->get('/api/system');
+        $resp->assertStatus(500);
+        $resp->assertJson([
+            'error' => [
+                'message' => 'Mr Error is here!. Oh no!. Something has really gone wrong.'
+            ]
+        ]);
+    }
+}
diff --git a/tests/Api/AttachmentsApiTest.php b/tests/Api/AttachmentsApiTest.php
index b2346587924..5cafd4c4f87 100644
--- a/tests/Api/AttachmentsApiTest.php
+++ b/tests/Api/AttachmentsApiTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Api;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Testing\AssertableJsonString;
@@ -60,6 +61,22 @@ public function test_attachments_listing_based_upon_page_visibility()
         ]]);
     }
 
+    public function test_index_does_not_show_attachments_for_pages_in_recycle_bin()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+        $attachment = $this->createAttachmentForPage($page, [
+            'name'     => 'My test attachment',
+            'external' => true,
+        ]);
+        $this->entities->sendToRecycleBin($page);
+
+        $resp = $this->getJson("{$this->baseEndpoint}?filter[id]={$attachment->id}");
+
+        $resp->assertJsonCount(0, 'data');
+        $resp->assertJsonPath('total', 0);
+    }
+
     public function test_create_endpoint_for_link_attachment()
     {
         $this->actingAsApiAdmin();
@@ -345,6 +362,31 @@ public function test_update_does_not_require_name()
         $this->assertEquals('', $attachment->extension);
     }
 
+    public function test_update_uploaded_to_change_requires_edit_permission_to_old_page()
+    {
+        $editor = $this->users->editor();
+        $this->actingAsForApi($editor);
+
+        $originalPage = $this->entities->page();
+        $attachment = $this->createAttachmentForPage($originalPage);
+        $newPage = $this->entities->page();
+
+        $details = [
+            'name' => 'My updated API attachment',
+            'uploaded_to' => $newPage->id,
+        ];
+
+        $this->permissions->setEntityPermissions($originalPage, ['view'], [$editor->roles->first()]);
+        $this->permissions->grantUserRolePermissions($editor, [Permission::AttachmentUpdateAll]);
+
+        $resp = $this->putJson("{$this->baseEndpoint}/{$attachment->id}", $details);
+        $attachment->refresh();
+
+        $this->assertPermissionError($resp);
+        $this->assertNotEquals($newPage->id, $attachment->uploaded_to);
+        $this->assertEquals($originalPage->id, $attachment->uploaded_to);
+    }
+
     public function test_delete_endpoint()
     {
         $this->actingAsApiAdmin();
diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php
index 22ccfb482c9..97a5c954d94 100644
--- a/tests/Api/BooksApiTest.php
+++ b/tests/Api/BooksApiTest.php
@@ -5,7 +5,6 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\BaseRepo;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class BooksApiTest extends TestCase
@@ -39,7 +38,7 @@ public function test_index_endpoint_includes_cover_if_set()
         $book = $this->entities->book();
 
         $baseRepo = $this->app->make(BaseRepo::class);
-        $image = $this->files->uploadedImage('book_cover');
+        $image = $this->files->uploadedImage('book_cover.png');
         $baseRepo->updateCoverImage($book, $image);
 
         $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $book->id);
@@ -47,8 +46,8 @@ public function test_index_endpoint_includes_cover_if_set()
             [
                 'id'   => $book->id,
                 'cover' => [
-                    'id' => $book->cover->id,
-                    'url' => $book->cover->url,
+                    'id' => $book->coverInfo()->getImage()->id,
+                    'url' => $book->coverInfo()->getImage()->url,
                 ],
             ],
         ]]);
@@ -94,7 +93,7 @@ public function test_create_endpoint_with_html()
         ]);
 
         $resp->assertJson($expectedDetails);
-        $this->assertDatabaseHas('books', $expectedDetails);
+        $this->assertDatabaseHasEntityData('book', $expectedDetails);
     }
 
     public function test_book_name_needed_to_create()
@@ -153,23 +152,23 @@ public function test_read_endpoint_includes_chapter_and_page_contents()
         $directChildCount = $book->directPages()->count() + $book->chapters()->count();
         $resp->assertStatus(200);
         $resp->assertJsonCount($directChildCount, 'contents');
-        $resp->assertJson([
-            'contents' => [
-                [
-                    'type' => 'chapter',
-                    'id' => $chapter->id,
-                    'name' => $chapter->name,
-                    'slug' => $chapter->slug,
-                    'pages' => [
-                        [
-                            'id' => $chapterPage->id,
-                            'name' => $chapterPage->name,
-                            'slug' => $chapterPage->slug,
-                        ]
-                    ]
-                ]
-            ]
-        ]);
+
+        $contents = $resp->json('contents');
+        $respChapter = array_values(array_filter($contents, fn ($item) =>  ($item['id'] === $chapter->id && $item['type'] === 'chapter')))[0];
+        $this->assertArrayMapIncludes([
+            'id' => $chapter->id,
+            'type' => 'chapter',
+            'name' => $chapter->name,
+            'slug' => $chapter->slug,
+        ], $respChapter);
+
+        $respPage = array_values(array_filter($respChapter['pages'], fn ($item) =>  ($item['id'] === $chapterPage->id)))[0];
+
+        $this->assertArrayMapIncludes([
+            'id' => $chapterPage->id,
+            'name' => $chapterPage->name,
+            'slug' => $chapterPage->slug,
+        ], $respPage);
     }
 
     public function test_read_endpoint_contents_nested_pages_has_permissions_applied()
@@ -189,6 +188,37 @@ public function test_read_endpoint_contents_nested_pages_has_permissions_applied
         $resp->assertJsonMissing(['name' => $customName]);
     }
 
+    public function test_read_endpoint_lists_visible_shelves_the_book_is_assigned_to()
+    {
+        $this->actingAsApiEditor();
+        $shelf = $this->entities->shelf();
+        $otherShelf = $this->entities->shelf();
+        $book = $this->entities->book();
+        $book->shelves()->detach();
+
+        $book->shelves()->attach($shelf);
+        $book->shelves()->attach($otherShelf);
+
+        $this->assertEquals(2, $book->shelves()->count());
+
+        $this->permissions->disableEntityInheritedPermissions($otherShelf);
+
+        $resp = $this->getJson("{$this->baseEndpoint}/{$book->id}");
+        $resp->assertOk();
+        $resp->assertJsonCount(1, 'shelves');
+        $resp->assertJson([
+            'shelves' => [
+                [
+                    'id' => $shelf->id,
+                    'name' => $shelf->name,
+                    'slug' => $shelf->slug,
+                ]
+            ]
+        ]);
+        $resp->assertJsonMissingPath('shelves.0.description');
+        $resp->assertJsonMissingPath('shelves.0.pivot');
+    }
+
     public function test_update_endpoint()
     {
         $this->actingAsApiEditor();
@@ -224,14 +254,14 @@ public function test_update_endpoint_with_html()
         $resp = $this->putJson($this->baseEndpoint . "/{$book->id}", $details);
         $resp->assertStatus(200);
 
-        $this->assertDatabaseHas('books', array_merge($details, ['id' => $book->id, 'description' => 'A book updated via the API']));
+        $this->assertDatabaseHasEntityData('book', array_merge($details, ['id' => $book->id, 'description' => 'A book updated via the API']));
     }
 
     public function test_update_increments_updated_date_if_only_tags_are_sent()
     {
         $this->actingAsApiEditor();
         $book = $this->entities->book();
-        DB::table('books')->where('id', '=', $book->id)->update(['updated_at' => Carbon::now()->subWeek()]);
+        Book::query()->where('id', '=', $book->id)->update(['updated_at' => Carbon::now()->subWeek()]);
 
         $details = [
             'tags' => [['name' => 'Category', 'value' => 'Testing']],
@@ -247,7 +277,7 @@ public function test_update_cover_image_control()
         $this->actingAsApiEditor();
         /** @var Book $book */
         $book = $this->entities->book();
-        $this->assertNull($book->cover);
+        $this->assertNull($book->coverInfo()->getImage());
         $file = $this->files->uploadedImage('image.png');
 
         // Ensure cover image can be set via API
@@ -257,7 +287,7 @@ public function test_update_cover_image_control()
         $book->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNotNull($book->cover);
+        $this->assertNotNull($book->coverInfo()->getImage());
 
         // Ensure further updates without image do not clear cover image
         $resp = $this->put($this->baseEndpoint . "/{$book->id}", [
@@ -266,7 +296,7 @@ public function test_update_cover_image_control()
         $book->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNotNull($book->cover);
+        $this->assertNotNull($book->coverInfo()->getImage());
 
         // Ensure update with null image property clears image
         $resp = $this->put($this->baseEndpoint . "/{$book->id}", [
@@ -275,7 +305,7 @@ public function test_update_cover_image_control()
         $book->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNull($book->cover);
+        $this->assertNull($book->coverInfo()->getImage());
     }
 
     public function test_delete_endpoint()
diff --git a/tests/Api/ChaptersApiTest.php b/tests/Api/ChaptersApiTest.php
index 5d7b0530891..953b3a0f5b4 100644
--- a/tests/Api/ChaptersApiTest.php
+++ b/tests/Api/ChaptersApiTest.php
@@ -91,7 +91,7 @@ public function test_create_endpoint_with_html()
             'description' => 'A chapter created via the API',
         ]);
         $resp->assertJson($expectedDetails);
-        $this->assertDatabaseHas('chapters', $expectedDetails);
+        $this->assertDatabaseHasEntityData('chapter', $expectedDetails);
     }
 
     public function test_chapter_name_needed_to_create()
@@ -155,7 +155,7 @@ public function test_read_endpoint()
                     'owned_by' => $page->owned_by,
                     'created_by' => $page->created_by,
                     'updated_by' => $page->updated_by,
-                    'book_id' => $page->id,
+                    'book_id' => $page->book->id,
                     'chapter_id' => $chapter->id,
                     'priority' => $page->priority,
                     'book_slug' => $chapter->book->slug,
@@ -213,7 +213,7 @@ public function test_update_endpoint_with_html()
         $resp = $this->putJson($this->baseEndpoint . "/{$chapter->id}", $details);
         $resp->assertStatus(200);
 
-        $this->assertDatabaseHas('chapters', array_merge($details, [
+        $this->assertDatabaseHasEntityData('chapter', array_merge($details, [
             'id' => $chapter->id, 'description' => 'A chapter updated via the API'
         ]));
     }
@@ -222,7 +222,7 @@ public function test_update_increments_updated_date_if_only_tags_are_sent()
     {
         $this->actingAsApiEditor();
         $chapter = $this->entities->chapter();
-        DB::table('chapters')->where('id', '=', $chapter->id)->update(['updated_at' => Carbon::now()->subWeek()]);
+        $chapter->newQuery()->where('id', '=', $chapter->id)->update(['updated_at' => Carbon::now()->subWeek()]);
 
         $details = [
             'tags' => [['name' => 'Category', 'value' => 'Testing']],
@@ -244,15 +244,15 @@ public function test_update_with_book_id_moves_chapter()
         $resp->assertOk();
         $chapter->refresh();
 
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'book_id' => $newBook->id]);
-        $this->assertDatabaseHas('pages', ['id' => $page->id, 'book_id' => $newBook->id, 'chapter_id' => $chapter->id]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'book_id' => $newBook->id]);
+        $this->assertDatabaseHasEntityData('page', ['id' => $page->id, 'book_id' => $newBook->id, 'chapter_id' => $chapter->id]);
     }
 
     public function test_update_with_new_book_id_requires_delete_permission()
     {
         $editor = $this->users->editor();
         $this->permissions->removeUserRolePermissions($editor, ['chapter-delete-all', 'chapter-delete-own']);
-        $this->actingAs($editor);
+        $this->actingAsForApi($editor);
         $chapter = $this->entities->chapterHasPages();
         $newBook = Book::query()->where('id', '!=', $chapter->book_id)->first();
 
diff --git a/tests/Api/ContentPermissionsApiTest.php b/tests/Api/ContentPermissionsApiTest.php
index a62abacc75e..6a26b403245 100644
--- a/tests/Api/ContentPermissionsApiTest.php
+++ b/tests/Api/ContentPermissionsApiTest.php
@@ -39,7 +39,7 @@ public function test_read_endpoint_shows_expected_detail()
         $page = $this->entities->page();
         $owner = $this->users->newUser();
         $role = $this->users->createRole();
-        $this->permissions->addEntityPermission($page, ['view', 'delete'], $role);
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'delete'], $role);
         $this->permissions->changeEntityOwner($page, $owner);
         $this->permissions->setFallbackPermissions($page, ['update', 'create']);
 
@@ -209,7 +209,7 @@ public function test_update_can_set_fallback_permissions()
     public function test_update_can_clear_roles_permissions()
     {
         $page = $this->entities->page();
-        $this->permissions->addEntityPermission($page, ['view'], $this->users->createRole());
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $this->users->createRole());
         $page->owned_by = null;
         $page->save();
 
@@ -280,7 +280,7 @@ public function test_update_can_both_provide_owner_and_fallback_permissions()
         ]);
 
         $resp->assertOk();
-        $this->assertDatabaseHas('pages', ['id' => $page->id, 'owned_by' => $user->id]);
+        $this->assertDatabaseHasEntityData('page', ['id' => $page->id, 'owned_by' => $user->id]);
         $this->assertDatabaseHas('entity_permissions', [
             'entity_id' => $page->id,
             'entity_type' => 'page',
diff --git a/tests/Api/ExportsApiTest.php b/tests/Api/ExportsApiTest.php
index e1ac698d0a4..7951e04d272 100644
--- a/tests/Api/ExportsApiTest.php
+++ b/tests/Api/ExportsApiTest.php
@@ -19,7 +19,7 @@ public function test_book_html_endpoint()
         $resp = $this->get("/api/books/{$book->id}/export/html");
         $resp->assertStatus(200);
         $resp->assertSee($book->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.html');
     }
 
     public function test_book_plain_text_endpoint()
@@ -30,7 +30,7 @@ public function test_book_plain_text_endpoint()
         $resp = $this->get("/api/books/{$book->id}/export/plaintext");
         $resp->assertStatus(200);
         $resp->assertSee($book->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.txt');
     }
 
     public function test_book_pdf_endpoint()
@@ -40,7 +40,7 @@ public function test_book_pdf_endpoint()
 
         $resp = $this->get("/api/books/{$book->id}/export/pdf");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.pdf');
     }
 
     public function test_book_markdown_endpoint()
@@ -50,7 +50,7 @@ public function test_book_markdown_endpoint()
 
         $resp = $this->get("/api/books/{$book->id}/export/markdown");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.md"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.md');
         $resp->assertSee('# ' . $book->name);
         $resp->assertSee('# ' . $book->pages()->first()->name);
         $resp->assertSee('# ' . $book->chapters()->first()->name);
@@ -63,7 +63,7 @@ public function test_book_zip_endpoint()
 
         $resp = $this->get("/api/books/{$book->id}/export/zip");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.zip"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.zip');
 
         $zip = ZipTestHelper::extractFromZipResponse($resp);
         $this->assertArrayHasKey('book', $zip->data);
@@ -77,7 +77,7 @@ public function test_chapter_html_endpoint()
         $resp = $this->get("/api/chapters/{$chapter->id}/export/html");
         $resp->assertStatus(200);
         $resp->assertSee($chapter->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.html');
     }
 
     public function test_chapter_plain_text_endpoint()
@@ -88,7 +88,7 @@ public function test_chapter_plain_text_endpoint()
         $resp = $this->get("/api/chapters/{$chapter->id}/export/plaintext");
         $resp->assertStatus(200);
         $resp->assertSee($chapter->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.txt');
     }
 
     public function test_chapter_pdf_endpoint()
@@ -98,7 +98,7 @@ public function test_chapter_pdf_endpoint()
 
         $resp = $this->get("/api/chapters/{$chapter->id}/export/pdf");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.pdf');
     }
 
     public function test_chapter_markdown_endpoint()
@@ -108,7 +108,7 @@ public function test_chapter_markdown_endpoint()
 
         $resp = $this->get("/api/chapters/{$chapter->id}/export/markdown");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.md"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.md');
         $resp->assertSee('# ' . $chapter->name);
         $resp->assertSee('# ' . $chapter->pages()->first()->name);
     }
@@ -120,7 +120,7 @@ public function test_chapter_zip_endpoint()
 
         $resp = $this->get("/api/chapters/{$chapter->id}/export/zip");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.zip"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.zip');
 
         $zip = ZipTestHelper::extractFromZipResponse($resp);
         $this->assertArrayHasKey('chapter', $zip->data);
@@ -134,7 +134,7 @@ public function test_page_html_endpoint()
         $resp = $this->get("/api/pages/{$page->id}/export/html");
         $resp->assertStatus(200);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.html');
     }
 
     public function test_page_plain_text_endpoint()
@@ -145,7 +145,7 @@ public function test_page_plain_text_endpoint()
         $resp = $this->get("/api/pages/{$page->id}/export/plaintext");
         $resp->assertStatus(200);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.txt');
     }
 
     public function test_page_pdf_endpoint()
@@ -155,7 +155,7 @@ public function test_page_pdf_endpoint()
 
         $resp = $this->get("/api/pages/{$page->id}/export/pdf");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.pdf');
     }
 
     public function test_page_markdown_endpoint()
@@ -166,7 +166,7 @@ public function test_page_markdown_endpoint()
         $resp = $this->get("/api/pages/{$page->id}/export/markdown");
         $resp->assertStatus(200);
         $resp->assertSee('# ' . $page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.md');
     }
 
     public function test_page_zip_endpoint()
@@ -176,7 +176,7 @@ public function test_page_zip_endpoint()
 
         $resp = $this->get("/api/pages/{$page->id}/export/zip");
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.zip"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.zip');
 
         $zip = ZipTestHelper::extractFromZipResponse($resp);
         $this->assertArrayHasKey('page', $zip->data);
diff --git a/tests/Api/ImageGalleryApiTest.php b/tests/Api/ImageGalleryApiTest.php
index 6670931074e..624d5b9e9b1 100644
--- a/tests/Api/ImageGalleryApiTest.php
+++ b/tests/Api/ImageGalleryApiTest.php
@@ -154,6 +154,34 @@ public function test_create_fails_if_uploaded_to_not_visible_or_not_exists()
         $resp->assertStatus(404);
     }
 
+    public function test_create_requires_update_permission_for_the_target_page()
+    {
+        $editor = $this->users->editor();
+        $this->actingAsForApi($editor);
+
+        $makeRequest = function (int $uploadedTo) {
+            return $this->call('POST', $this->baseEndpoint, [
+                'type' => 'gallery',
+                'uploaded_to' => $uploadedTo,
+                'name' => 'My awesome image!',
+            ], [], [
+                'image' => $this->files->uploadedImage('my-cool-image.png'),
+            ]);
+        };
+
+        $page = $this->entities->page();
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $editor->roles()->first());
+
+        $resp = $makeRequest($page->id);
+        $resp->assertStatus(403);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $editor->roles()->first());
+
+        $resp = $makeRequest($page->id);
+        $resp->assertStatus(200);
+    }
+
     public function test_create_has_restricted_types()
     {
         $this->actingAsApiEditor();
@@ -275,6 +303,85 @@ public function test_read_endpoint_does_not_show_if_no_permissions_for_related_p
         $resp->assertStatus(404);
     }
 
+    public function test_read_data_endpoint()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+        $image = Image::findOrFail($data['response']->id);
+
+        $resp = $this->get("{$this->baseEndpoint}/{$image->id}/data");
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'image/png');
+
+        $respData = $resp->streamedContent();
+        $this->assertEquals(file_get_contents($this->files->testFilePath('test-image.png')), $respData);
+    }
+
+    public function test_read_data_endpoint_permission_controlled()
+    {
+        $this->actingAsApiEditor();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+        $image = Image::findOrFail($data['response']->id);
+
+        $this->get("{$this->baseEndpoint}/{$image->id}/data")->assertOk();
+
+        $this->permissions->disableEntityInheritedPermissions($imagePage);
+
+        $resp = $this->get("{$this->baseEndpoint}/{$image->id}/data");
+        $resp->assertStatus(404);
+    }
+
+    public function test_read_data_endpoint_does_not_serve_non_image_files()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+
+        $image = Image::findOrFail($data['response']->id);
+        $storagePath = public_path($image->path);
+        file_put_contents($storagePath, '<html><body><p>This is totally not an image file!</p></body></html>');
+
+        $resp = $this->get("{$this->baseEndpoint}/{$image->id}/data");
+        $resp->assertStatus(415);
+
+        $resp->assertJson($this->errorResponse('Invalid non-image file type when streaming from storage.', 415));
+    }
+
+    public function test_read_url_data_endpoint()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+
+        $url = url($data['response']->path);
+        $resp = $this->get("{$this->baseEndpoint}/url/data?url=" . urlencode($url));
+        $resp->assertStatus(200);
+        $resp->assertHeader('Content-Type', 'image/png');
+
+        $respData = $resp->streamedContent();
+        $this->assertEquals(file_get_contents($this->files->testFilePath('test-image.png')), $respData);
+    }
+
+    public function test_read_url_data_endpoint_permission_controlled_when_local_secure_restricted_storage_is_used()
+    {
+        config()->set('filesystems.images', 'local_secure_restricted');
+
+        $this->actingAsApiEditor();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage, 'test-image.png');
+
+        $url = url($data['response']->path);
+        $resp = $this->get("{$this->baseEndpoint}/url/data?url=" . urlencode($url));
+        $resp->assertStatus(200);
+
+        $this->permissions->disableEntityInheritedPermissions($imagePage);
+
+        $resp = $this->get("{$this->baseEndpoint}/url/data?url=" . urlencode($url));
+        $resp->assertStatus(404);
+    }
+
     public function test_update_endpoint()
     {
         $this->actingAsApiAdmin();
@@ -332,6 +439,32 @@ public function test_update_endpoint_requires_image_update_permission()
         $resp->assertStatus(200);
     }
 
+    public function test_update_endpoint_only_works_on_gallery_and_drawio_images()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage);
+        $image = Image::findOrFail($data['response']->id);
+
+        $statusByImageType = [
+            'gallery' => 200,
+            'drawio' => 200,
+            'cover_book' => 404,
+            'user' => 404,
+            'system' => 404,
+        ];
+
+        foreach ($statusByImageType as $type => $status) {
+            $image->type = $type;
+            $image->save();
+
+            $resp = $this->putJson($this->baseEndpoint . "/{$image->id}", [
+                'name' => "My updated {$type} image!",
+            ]);
+            $resp->assertStatus($status);
+        }
+    }
+
     public function test_delete_endpoint()
     {
         $this->actingAsApiAdmin();
@@ -363,4 +496,19 @@ public function test_delete_endpoint_requires_image_delete_permission()
         $resp = $this->deleteJson($this->baseEndpoint . "/{$image->id}");
         $resp->assertStatus(204);
     }
+
+    public function test_delete_limited_to_visible_images()
+    {
+        $this->actingAsApiAdmin();
+        $imagePage = $this->entities->page();
+        $data = $this->files->uploadGalleryImageToPage($this, $imagePage);
+
+        $image = Image::query()->findOrFail($data['response']->id);
+
+        $this->entities->destroy($imagePage);
+
+        $resp = $this->deleteJson($this->baseEndpoint . "/{$image->id}");
+
+        $resp->assertStatus(404);
+    }
 }
diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php
index ced8954eb11..d43c057ac98 100644
--- a/tests/Api/PagesApiTest.php
+++ b/tests/Api/PagesApiTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Api;
 
+use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use Carbon\Carbon;
@@ -127,6 +128,27 @@ public function test_markdown_can_be_provided_for_create()
         $this->assertStringContainsString('href="https://example.com"', $respHtml);
     }
 
+    public function test_create_can_accept_a_changelog_message()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+        $details = [
+            'name' => 'My updated API page',
+            'html' => '<p>A page updated via the API</p>',
+            'changelog' => 'This is a create changelog message via the API',
+            'book_id' => $book->id,
+        ];
+
+        $resp = $this->postJson($this->baseEndpoint, $details);
+        $resp->assertOk();
+
+        $pageId = $resp->json('id');
+        $page = Page::query()->findOrFail($pageId);
+
+        $latestRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $this->assertEquals('This is a create changelog message via the API', $latestRevision->summary);
+    }
+
     public function test_read_endpoint()
     {
         $this->actingAsApiEditor();
@@ -199,6 +221,44 @@ public function test_read_endpoint_returns_not_found()
         $this->assertSame(404, $resp->json('error')['code']);
     }
 
+    public function test_read_with_invalid_id_returns_not_found()
+    {
+        $this->actingAsApiEditor();
+        $resp = $this->getJson($this->baseEndpoint . '/invalid-id');
+        $resp->assertNotFound();
+        $resp->assertJsonStructure([
+            'error' => [
+                'code',
+                'message',
+            ],
+        ]);
+    }
+
+    public function test_read_endpoint_includes_page_comments_tree_structure()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+        $relation = ['commentable_type' => 'page', 'commentable_id' => $page->id];
+        $active = Comment::factory()->create([...$relation, 'html' => '<p>My active<script>cat</script> comment</p>']);
+        Comment::factory()->count(5)->create([...$relation, 'parent_id' => $active->local_id]);
+        $archived = Comment::factory()->create([...$relation, 'archived' => true]);
+        Comment::factory()->count(2)->create([...$relation, 'parent_id' => $archived->local_id]);
+
+        $resp = $this->getJson("{$this->baseEndpoint}/{$page->id}");
+        $resp->assertOk();
+
+        $resp->assertJsonCount(1, 'comments.active');
+        $resp->assertJsonCount(1, 'comments.archived');
+        $resp->assertJsonCount(5, 'comments.active.0.children');
+        $resp->assertJsonCount(2, 'comments.archived.0.children');
+
+        $resp->assertJsonFragment([
+            'id' => $active->id,
+            'local_id' => $active->local_id,
+            'html' => '<p>My active comment</p>',
+        ]);
+    }
+
     public function test_update_endpoint()
     {
         $this->actingAsApiEditor();
@@ -286,7 +346,7 @@ public function test_update_increments_updated_date_if_only_tags_are_sent()
     {
         $this->actingAsApiEditor();
         $page = $this->entities->page();
-        DB::table('pages')->where('id', '=', $page->id)->update(['updated_at' => Carbon::now()->subWeek()]);
+        $page->newQuery()->where('id', '=', $page->id)->update(['updated_at' => Carbon::now()->subWeek()]);
 
         $details = [
             'tags' => [['name' => 'Category', 'value' => 'Testing']],
@@ -299,6 +359,23 @@ public function test_update_increments_updated_date_if_only_tags_are_sent()
         $this->assertGreaterThan(Carbon::now()->subDay()->unix(), $page->updated_at->unix());
     }
 
+    public function test_update_can_accept_a_changelog_message()
+    {
+        $this->actingAsApiEditor();
+        $page = $this->entities->page();
+        $details = [
+            'name' => 'My updated API page',
+            'html' => '<p>A page updated via the API</p>',
+            'changelog' => 'This is a changelog message via the API',
+        ];
+
+        $resp = $this->putJson($this->baseEndpoint . "/{$page->id}", $details);
+        $resp->assertOk();
+
+        $latestRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $this->assertEquals('This is a changelog message via the API', $latestRevision->summary);
+    }
+
     public function test_delete_endpoint()
     {
         $this->actingAsApiEditor();
diff --git a/tests/Api/RecycleBinApiTest.php b/tests/Api/RecycleBinApiTest.php
index d174838c27d..9e645fe215b 100644
--- a/tests/Api/RecycleBinApiTest.php
+++ b/tests/Api/RecycleBinApiTest.php
@@ -23,7 +23,7 @@ public function test_settings_manage_permission_needed_for_all_endpoints()
     {
         $editor = $this->users->editor();
         $this->permissions->grantUserRolePermissions($editor, ['settings-manage']);
-        $this->actingAs($editor);
+        $this->actingAsForApi($editor);
 
         foreach ($this->endpointMap as [$method, $uri]) {
             $resp = $this->json($method, $uri);
@@ -36,7 +36,7 @@ public function test_restrictions_manage_all_permission_needed_for_all_endpoints
     {
         $editor = $this->users->editor();
         $this->permissions->grantUserRolePermissions($editor, ['restrictions-manage-all']);
-        $this->actingAs($editor);
+        $this->actingAsForApi($editor);
 
         foreach ($this->endpointMap as [$method, $uri]) {
             $resp = $this->json($method, $uri);
@@ -53,6 +53,7 @@ public function test_index_endpoint_returns_expected_page()
         $book = $this->entities->book();
         $this->actingAs($admin)->delete($page->getUrl());
         $this->delete($book->getUrl());
+        $this->actingAsForApi($admin);
 
         $deletions = Deletion::query()->orderBy('id')->get();
 
@@ -89,7 +90,7 @@ public function test_index_endpoint_returns_children_count()
 
         $deletion = Deletion::query()->orderBy('id')->first();
 
-        $resp = $this->getJson($this->baseEndpoint);
+        $resp = $this->actingAsForApi($admin)->getJson($this->baseEndpoint);
 
         $expectedData = [
             [
@@ -115,6 +116,7 @@ public function test_index_endpoint_returns_parent()
         $this->actingAs($admin)->delete($page->getUrl());
         $deletion = Deletion::query()->orderBy('id')->first();
 
+        $this->actingAsForApi($admin);
         $resp = $this->getJson($this->baseEndpoint);
 
         $expectedData = [
@@ -141,10 +143,11 @@ public function test_restore_endpoint()
         $page = $this->entities->page();
         $this->asAdmin()->delete($page->getUrl());
         $page->refresh();
+        $this->actingAsApiAdmin();
 
         $deletion = Deletion::query()->orderBy('id')->first();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'            => $page->id,
             'deleted_at'    => $page->deleted_at,
         ]);
@@ -154,7 +157,7 @@ public function test_restore_endpoint()
             'restore_count' => 1,
         ]);
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'            => $page->id,
             'deleted_at'    => null,
         ]);
@@ -165,10 +168,11 @@ public function test_destroy_endpoint()
         $page = $this->entities->page();
         $this->asAdmin()->delete($page->getUrl());
         $page->refresh();
+        $this->actingAsApiAdmin();
 
         $deletion = Deletion::query()->orderBy('id')->first();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'            => $page->id,
             'deleted_at'    => $page->deleted_at,
         ]);
@@ -178,6 +182,6 @@ public function test_destroy_endpoint()
             'delete_count' => 1,
         ]);
 
-        $this->assertDatabaseMissing('pages', ['id' => $page->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $page->id, 'type' => 'page']);
     }
 }
diff --git a/tests/Api/SearchApiTest.php b/tests/Api/SearchApiTest.php
index 9da7900ca9a..0870e41cec7 100644
--- a/tests/Api/SearchApiTest.php
+++ b/tests/Api/SearchApiTest.php
@@ -36,6 +36,101 @@ public function test_all_endpoint_returns_search_filtered_results_with_query()
         $resp->assertJsonFragment(['name' => $uniqueTerm, 'type' => 'bookshelf']);
     }
 
+    public function test_book_endpoint_limits_results_to_that_book()
+    {
+        $this->actingAsApiEditor();
+        $uniqueTerm = 'MyUniqueBookScopedApiTerm';
+
+        $bookA = $this->entities->book();
+        $bookB = $this->entities->book();
+
+        $pageA = $bookA->pages->first();
+        $pageA->update(['name' => $uniqueTerm . ' in book a']);
+        $pageA->indexForSearch();
+
+        $pageB = $bookB->pages->first();
+        $pageB->update(['name' => $uniqueTerm . ' in book b']);
+        $pageB->indexForSearch();
+
+        $resp = $this->getJson("/api/search/book/{$bookA->id}?query=" . urlencode($uniqueTerm));
+        $resp->assertOk();
+        $resp->assertJsonFragment(['name' => $pageA->name]);
+        $resp->assertJsonMissing(['name' => $pageB->name]);
+        $resp->assertJsonPath('total', 1);
+    }
+
+    public function test_book_endpoint_finds_chapters_as_well_as_pages()
+    {
+        $this->actingAsApiEditor();
+        $uniqueTerm = 'MyUniqueBookChapterApiTerm';
+
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters->first();
+        $chapter->update(['name' => $uniqueTerm . ' chapter']);
+        $chapter->indexForSearch();
+        $page = $book->pages->first();
+        $page->update(['name' => $uniqueTerm . ' page']);
+        $page->indexForSearch();
+
+        $resp = $this->getJson("/api/search/book/{$book->id}?query=" . urlencode($uniqueTerm));
+        $resp->assertJsonFragment(['name' => 'MyUniqueBookChapterApiTerm chapter', 'type' => 'chapter']);
+        $resp->assertJsonFragment(['name' => 'MyUniqueBookChapterApiTerm page', 'type' => 'page']);
+    }
+
+    public function test_book_endpoint_cannot_be_widened_to_other_types()
+    {
+        $this->actingAsApiEditor();
+        $uniqueTerm = 'MyUniqueBookTypeWideningTerm';
+
+        $book = $this->entities->book();
+        $book->update(['name' => $uniqueTerm . ' the book itself']);
+        $book->indexForSearch();
+
+        $page = $book->pages->first();
+        $page->update(['name' => $uniqueTerm . ' a page inside']);
+        $page->indexForSearch();
+
+        $otherBook = $this->entities->book();
+        $otherBook->update(['name' => $uniqueTerm . ' the other book']);
+        $otherBook->indexForSearch();
+
+        // A book cannot contain a book, so asking for one returns nothing rather than
+        // quietly falling back to searching everything.
+        $resp = $this->getJson("/api/search/book/{$book->id}?query=" . urlencode($uniqueTerm . ' {type:book}'));
+        $resp->assertOk();
+        $resp->assertJsonPath('total', 0);
+        $resp->assertDontSee($uniqueTerm);
+    }
+
+    public function test_chapter_endpoint_limits_results_to_that_chapter()
+    {
+        $this->actingAsApiEditor();
+        $uniqueTerm = 'MyUniqueChapterScopedApiTerm';
+
+        $chapter = $this->entities->chapterHasPages();
+        $inChapter = $chapter->pages->first();
+        $inChapter->update(['name' => $uniqueTerm . ' in chapter']);
+        $inChapter->indexForSearch();
+
+        $elsewhere = $this->entities->pageNotWithinChapter();
+        $elsewhere->update(['name' => $uniqueTerm . ' elsewhere']);
+        $elsewhere->indexForSearch();
+
+        $resp = $this->getJson("/api/search/chapter/{$chapter->id}?query=" . urlencode($uniqueTerm));
+        $resp->assertJsonFragment(['name' => $inChapter->name]);
+        $resp->assertJsonMissing(['name' => $elsewhere->name]);
+    }
+
+    public function test_scoped_endpoints_require_a_query()
+    {
+        $this->actingAsApiEditor();
+        $book = $this->entities->book();
+        $chapter = $this->entities->chapter();
+
+        $this->getJson("/api/search/book/{$book->id}")->assertStatus(422);
+        $this->getJson("/api/search/chapter/{$chapter->id}")->assertStatus(422);
+    }
+
     public function test_all_endpoint_returns_entity_url()
     {
         $page = $this->entities->page();
@@ -106,6 +201,7 @@ public function test_all_endpoint_includes_parent_details_where_visible()
         $this->permissions->setEntityPermissions($page, ['view'], [$editor->roles()->first()]);
 
         $resp = $this->getJson($this->baseEndpoint . '?query=superextrauniquevalue');
+        $resp->assertOk();
         $resp->assertJsonPath('data.0.id', $page->id);
         $resp->assertJsonPath('data.0.book.name', $book->name);
         $resp->assertJsonMissingPath('data.0.chapter');
@@ -113,6 +209,7 @@ public function test_all_endpoint_includes_parent_details_where_visible()
         $this->permissions->disableEntityInheritedPermissions($book);
 
         $resp = $this->getJson($this->baseEndpoint . '?query=superextrauniquevalue');
+        $resp->assertOk();
         $resp->assertJsonPath('data.0.id', $page->id);
         $resp->assertJsonMissingPath('data.0.book.name');
     }
diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php
index ba13c0153b1..8da81c68dbd 100644
--- a/tests/Api/ShelvesApiTest.php
+++ b/tests/Api/ShelvesApiTest.php
@@ -40,7 +40,7 @@ public function test_index_endpoint_includes_cover_if_set()
         $shelf = $this->entities->shelf();
 
         $baseRepo = $this->app->make(BaseRepo::class);
-        $image = $this->files->uploadedImage('shelf_cover');
+        $image = $this->files->uploadedImage('shelf_cover.png');
         $baseRepo->updateCoverImage($shelf, $image);
 
         $resp = $this->getJson($this->baseEndpoint . '?filter[id]=' . $shelf->id);
@@ -48,8 +48,8 @@ public function test_index_endpoint_includes_cover_if_set()
             [
                 'id'   => $shelf->id,
                 'cover' => [
-                    'id' => $shelf->cover->id,
-                    'url' => $shelf->cover->url,
+                    'id' => $shelf->coverInfo()->getImage()->id,
+                    'url' => $shelf->coverInfo()->getImage()->url,
                 ],
             ],
         ]]);
@@ -102,7 +102,7 @@ public function test_create_endpoint_with_html()
         ]);
 
         $resp->assertJson($expectedDetails);
-        $this->assertDatabaseHas('bookshelves', $expectedDetails);
+        $this->assertDatabaseHasEntityData('bookshelf', $expectedDetails);
     }
 
     public function test_shelf_name_needed_to_create()
@@ -181,14 +181,14 @@ public function test_update_endpoint_with_html()
         $resp = $this->putJson($this->baseEndpoint . "/{$shelf->id}", $details);
         $resp->assertStatus(200);
 
-        $this->assertDatabaseHas('bookshelves', array_merge($details, ['id' => $shelf->id, 'description' => 'A shelf updated via the API']));
+        $this->assertDatabaseHasEntityData('bookshelf', array_merge($details, ['id' => $shelf->id, 'description' => 'A shelf updated via the API']));
     }
 
     public function test_update_increments_updated_date_if_only_tags_are_sent()
     {
         $this->actingAsApiEditor();
         $shelf = Bookshelf::visible()->first();
-        DB::table('bookshelves')->where('id', '=', $shelf->id)->update(['updated_at' => Carbon::now()->subWeek()]);
+        $shelf->newQuery()->where('id', '=', $shelf->id)->update(['updated_at' => Carbon::now()->subWeek()]);
 
         $details = [
             'tags' => [['name' => 'Category', 'value' => 'Testing']],
@@ -222,7 +222,7 @@ public function test_update_cover_image_control()
         $this->actingAsApiEditor();
         /** @var Book $shelf */
         $shelf = Bookshelf::visible()->first();
-        $this->assertNull($shelf->cover);
+        $this->assertNull($shelf->coverInfo()->getImage());
         $file = $this->files->uploadedImage('image.png');
 
         // Ensure cover image can be set via API
@@ -232,7 +232,7 @@ public function test_update_cover_image_control()
         $shelf->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNotNull($shelf->cover);
+        $this->assertNotNull($shelf->coverInfo()->getImage());
 
         // Ensure further updates without image do not clear cover image
         $resp = $this->put($this->baseEndpoint . "/{$shelf->id}", [
@@ -241,7 +241,7 @@ public function test_update_cover_image_control()
         $shelf->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNotNull($shelf->cover);
+        $this->assertNotNull($shelf->coverInfo()->getImage());
 
         // Ensure update with null image property clears image
         $resp = $this->put($this->baseEndpoint . "/{$shelf->id}", [
@@ -250,7 +250,7 @@ public function test_update_cover_image_control()
         $shelf->refresh();
 
         $resp->assertStatus(200);
-        $this->assertNull($shelf->cover);
+        $this->assertNull($shelf->coverInfo()->getImage());
     }
 
     public function test_delete_endpoint()
diff --git a/tests/Api/TagsApiTest.php b/tests/Api/TagsApiTest.php
new file mode 100644
index 00000000000..e39d72ce10c
--- /dev/null
+++ b/tests/Api/TagsApiTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Api;
+
+use BookStack\Activity\Models\Tag;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use Tests\TestCase;
+
+class TagsApiTest extends TestCase
+{
+    use TestsApi;
+
+    public function test_list_names_provides_rolled_up_tag_info(): void
+    {
+        $tagInfo = ['name' => 'MyGreatApiTag', 'value' => 'cat'];
+        $pagesToTag = Page::query()->take(10)->get();
+        $booksToTag = Book::query()->take(3)->get();
+        $chaptersToTag = Chapter::query()->take(5)->get();
+        $pagesToTag->each(fn (Page $page) => $page->tags()->save(new Tag($tagInfo)));
+        $booksToTag->each(fn (Book $book) => $book->tags()->save(new Tag($tagInfo)));
+        $chaptersToTag->each(fn (Chapter $chapter) => $chapter->tags()->save(new Tag($tagInfo)));
+
+        $resp = $this->actingAsApiEditor()->getJson('api/tags/names?filter[name]=MyGreatApiTag');
+        $resp->assertStatus(200);
+        $resp->assertJson([
+            'data' => [
+                [
+                    'name' => 'MyGreatApiTag',
+                    'values' => 1,
+                    'usages' => 18,
+                    'page_count' => 10,
+                    'book_count' => 3,
+                    'chapter_count' => 5,
+                    'shelf_count' => 0,
+                ]
+            ],
+            'total' => 1,
+        ]);
+    }
+
+    public function test_list_names_is_limited_by_permission_visibility(): void
+    {
+        $pagesToTag = Page::query()->take(10)->get();
+        $pagesToTag->each(fn (Page $page) => $page->tags()->save(new Tag(['name' => 'MyGreatApiTag', 'value' => 'cat' . $page->id])));
+
+        $this->permissions->disableEntityInheritedPermissions($pagesToTag[3]);
+        $this->permissions->disableEntityInheritedPermissions($pagesToTag[6]);
+
+        $resp = $this->actingAsApiEditor()->getJson('api/tags/names?filter[name]=MyGreatApiTag');
+        $resp->assertStatus(200);
+        $resp->assertJson([
+            'data' => [
+                [
+                    'name' => 'MyGreatApiTag',
+                    'values' => 8,
+                    'usages' => 8,
+                    'page_count' => 8,
+                    'book_count' => 0,
+                    'chapter_count' => 0,
+                    'shelf_count' => 0,
+                ]
+            ],
+            'total' => 1,
+        ]);
+    }
+
+    public function test_list_values_returns_values_for_set_tag()
+    {
+        $pagesToTag = Page::query()->take(10)->get();
+        $booksToTag = Book::query()->take(3)->get();
+        $chaptersToTag = Chapter::query()->take(5)->get();
+        $pagesToTag->each(fn (Page $page) => $page->tags()->save(new Tag(['name' => 'MyValueApiTag', 'value' => 'tag-page' . $page->id])));
+        $booksToTag->each(fn (Book $book) => $book->tags()->save(new Tag(['name' => 'MyValueApiTag', 'value' => 'tag-book' . $book->id])));
+        $chaptersToTag->each(fn (Chapter $chapter) => $chapter->tags()->save(new Tag(['name' => 'MyValueApiTag', 'value' => 'tag-chapter' . $chapter->id])));
+
+        $resp = $this->actingAsApiEditor()->getJson('api/tags/values-for-name?name=MyValueApiTag');
+
+        $resp->assertStatus(200);
+        $resp->assertJson(['total' => 18]);
+        $resp->assertJsonFragment([
+            [
+                'name' => 'MyValueApiTag',
+                'value' => 'tag-page' . $pagesToTag[0]->id,
+                'usages' => 1,
+                'page_count' => 1,
+                'book_count' => 0,
+                'chapter_count' => 0,
+                'shelf_count' => 0,
+            ]
+        ]);
+    }
+
+    public function test_list_values_is_limited_by_permission_visibility(): void
+    {
+        $pagesToTag = Page::query()->take(10)->get();
+        $pagesToTag->each(fn (Page $page) => $page->tags()->save(new Tag(['name' => 'MyGreatApiTag', 'value' => 'cat' . $page->id])));
+
+        $this->permissions->disableEntityInheritedPermissions($pagesToTag[3]);
+        $this->permissions->disableEntityInheritedPermissions($pagesToTag[6]);
+
+        $resp = $this->actingAsApiEditor()->getJson('api/tags/values-for-name?name=MyGreatApiTag');
+        $resp->assertStatus(200);
+        $resp->assertJson(['total' => 8]);
+        $resp->assertJsonMissing(['value' => 'cat' . $pagesToTag[3]->id]);
+    }
+}
diff --git a/tests/Api/UsersApiTest.php b/tests/Api/UsersApiTest.php
index a0c67d0d281..e7b9df6aae9 100644
--- a/tests/Api/UsersApiTest.php
+++ b/tests/Api/UsersApiTest.php
@@ -80,7 +80,7 @@ public function test_index_endpoint_has_correct_created_and_last_activity_dates(
         /** @var ActivityModel $activity */
         $activity = ActivityModel::query()->where('user_id', '=', $user->id)->latest()->first();
 
-        $resp = $this->asAdmin()->getJson($this->baseEndpoint . '?filter[id]=3');
+        $resp = $this->actingAsApiAdmin()->getJson($this->baseEndpoint . '?filter[id]=3');
         $resp->assertJson(['data' => [
             [
                 'id'          => $user->id,
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index bffd8bbdbcb..e0af00c4cb7 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -3,8 +3,10 @@
 namespace Tests\Auth;
 
 use BookStack\Access\Mfa\MfaSession;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
 class AuthTest extends TestCase
@@ -70,10 +72,18 @@ public function test_login_intended_redirect_does_not_redirect_to_external_pages
         config()->set('app.url', 'http://localhost');
         $this->setSettings(['app-public' => true]);
 
-        $this->get('/login', ['referer' => 'https://example.com']);
-        $login = $this->post('/login', ['email' => 'admin@admin.com', 'password' => 'password']);
-
-        $login->assertRedirect('http://localhost');
+        $testCases = [
+            'https://example.com',
+            'http://localhost.example.com',
+            'http://localhost:ab@example.com',
+        ];
+
+        foreach ($testCases as $testCase) {
+            $this->get('/login', ['Referer' => $testCase]);
+            $login = $this->post('/login', ['email' => 'admin@admin.com', 'password' => 'password']);
+            $login->assertRedirect('http://localhost');
+            auth()->logout();
+        }
     }
 
     public function test_login_intended_redirect_does_not_factor_mfa_routes()
@@ -164,6 +174,43 @@ public function test_login_specifically_disabled_for_guest_account()
         $resp->assertSee('These credentials do not match our records.');
     }
 
+    #[Group('slow')]
+    public function test_failed_login_attempt_has_noise_added_and_have_similar_times_between_known_and_unknown_users()
+    {
+        $user = $this->users->editor();
+        $user->password = bcrypt('password');
+        $user->save();
+        // Warmup
+        $this->post('/login', ['email' => $user->email, 'password' => 'passwordtesting']);
+
+        // For known user attempts
+        $durations = [];
+        for ($i = 0; $i < 25; $i++) {
+            $knownStart = microtime(true);
+            $this->post('/login', ['email' => $user->email, 'password' => 'passwordtesting']);
+            $durations[] = (microtime(true) - $knownStart) * 1000;
+            Cache::clear(); // Clear the cache to avoid hitting rate limits
+        }
+        $range = max($durations) - min($durations);
+        $this->assertGreaterThan(125, $range);
+        $knownAvg = array_sum($durations) / count($durations);
+
+        // For unknown user attempts
+        $durations = [];
+        for ($i = 0; $i < 25; $i++) {
+            $unknownStart = microtime(true);
+            $this->post('/login', ['email' => 'unknown@example.com', 'password' => 'passwordtesting']);
+            $durations[] = (microtime(true) - $unknownStart) * 1000;
+            Cache::clear(); // Clear the cache to avoid hitting rate limits
+        }
+        $range = max($durations) - min($durations);
+        $this->assertGreaterThan(125, $range);
+        $unknownAvg = array_sum($durations) / count($durations);
+
+        $knownDiff = abs($knownAvg - $unknownAvg);
+        $this->assertLessThan(25, $knownDiff);
+    }
+
     /**
      * Perform a login.
      */
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index d1f128a50d9..0b1f1d8522f 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -8,6 +8,7 @@
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
 use Illuminate\Testing\TestResponse;
+use LDAP\Connection;
 use Mockery\MockInterface;
 use Tests\TestCase;
 
@@ -18,6 +19,8 @@ class LdapTest extends TestCase
     protected User $mockUser;
     protected string $resourceId = 'resource-test';
 
+    protected Connection $connection;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -43,7 +46,7 @@ protected function setUp(): void
         $this->mockUser = User::factory()->make();
     }
 
-    protected function runFailedAuthLogin()
+    protected function runFailedAuthLogin(): void
     {
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
@@ -51,14 +54,14 @@ protected function runFailedAuthLogin()
         $this->post('/login', ['username' => 'timmyjenkins', 'password' => 'cattreedog']);
     }
 
-    protected function mockEscapes($times = 1)
+    protected function mockEscapes($times = 1): void
     {
         $this->mockLdap->shouldReceive('escape')->times($times)->andReturnUsing(function ($val) {
             return ldap_escape($val);
         });
     }
 
-    protected function mockExplodes($times = 1)
+    protected function mockExplodes($times = 1): void
     {
         $this->mockLdap->shouldReceive('explodeDn')->times($times)->andReturnUsing(function ($dn, $withAttrib) {
             return ldap_explode_dn($dn, $withAttrib);
@@ -76,9 +79,10 @@ protected function mockUserLogin(?string $email = null): TestResponse
     /**
      * Set LDAP method mocks for things we commonly call without altering.
      */
-    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0, int $groups = 0)
+    protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $options = 2, int $binds = 4, int $escapes = 2, int $explodes = 0, int $groups = 0): void
     {
-        $this->mockLdap->shouldReceive('connect')->times($connects)->andReturn($this->resourceId);
+        $this->connection = ldap_connect('example.com');
+        $this->mockLdap->shouldReceive('connect')->times($connects)->andReturn($this->connection);
         $this->mockLdap->shouldReceive('setVersion')->times($versions);
         $this->mockLdap->shouldReceive('setOption')->times($options);
         $this->mockLdap->shouldReceive('bind')->times($binds)->andReturn(true);
@@ -89,15 +93,14 @@ protected function commonLdapMocks(int $connects = 1, int $versions = 1, int $op
 
     protected function mockGroupLookups(int $times = 1): void
     {
-        $this->mockLdap->shouldReceive('read')->times($times)->andReturn(['count' => 0]);
-        $this->mockLdap->shouldReceive('getEntries')->times($times)->andReturn(['count' => 0]);
+        $this->mockLdap->shouldReceive('readAndGetEntries')->times($times)->andReturn(['count' => 0]);
     }
 
     public function test_login()
     {
         $this->commonLdapMocks(1, 1, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
@@ -128,7 +131,7 @@ public function test_email_domain_restriction_active_on_new_ldap_login()
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
@@ -153,7 +156,7 @@ public function test_login_works_when_no_uid_provided_by_ldap_server()
 
         $this->commonLdapMocks(1, 1, 1, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'cn'   => [$this->mockUser->name],
                 'dn'   => $ldapDn,
@@ -172,7 +175,7 @@ public function test_login_works_when_ldap_server_does_not_provide_a_cn_value()
 
         $this->commonLdapMocks(1, 1, 1, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'dn'   => $ldapDn,
                 'mail' => [$this->mockUser->email],
@@ -193,7 +196,7 @@ public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properl
         $this->commonLdapMocks(1, 1, 1, 2, 1);
         $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'cn'           => [$this->mockUser->name],
                 'dn'           => $ldapDn,
@@ -207,6 +210,36 @@ public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properl
         $this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => 'cooluser456']);
     }
 
+    public function test_login_uses_exact_match_for_external_auth_id_values()
+    {
+        config()->set(['services.ldap.id_attribute' => 'my_custom_id']);
+        // External auth id the same as we expect below but different casing
+        User::query()->forceCreate([
+            'email'            => 'otheruser@example.com',
+            'external_auth_id' => 'CoolUser456',
+            'email_confirmed'  => true,
+            'name'             => 'Barry Scott',
+        ]);
+
+        $this->commonLdapMocks(1, 1, 1, 2, 1);
+        $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->andReturn(['count' => 1, 0 => [
+                'cn'           => [$this->mockUser->name],
+                'dn'           => $ldapDn,
+                'my_custom_id' => ['cooluser456'],
+                'mail'         => [$this->mockUser->email],
+            ]]);
+
+        $resp = $this->mockUserLogin();
+        $resp->assertRedirect('/');
+
+        $this->assertDatabaseHas('users', ['email' => $this->mockUser->email]);
+        $this->assertEquals($this->mockUser->email, user()->email);
+        $this->assertEquals('cooluser456', user()->external_auth_id);
+    }
+
     public function test_user_filter_default_placeholder_format()
     {
         config()->set('services.ldap.user_filter', '(&(uid={user}))');
@@ -216,7 +249,7 @@ public function test_user_filter_default_placeholder_format()
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')
             ->once()
-            ->with($this->resourceId, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
             ->andReturn(['count' => 0, 0 => []]);
 
         $resp = $this->mockUserLogin();
@@ -232,7 +265,7 @@ public function test_user_filter_old_placeholder_format()
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')
             ->once()
-            ->with($this->resourceId, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), $expectedFilter, \Mockery::type('array'))
             ->andReturn(['count' => 0, 0 => []]);
 
         $resp = $this->mockUserLogin();
@@ -243,7 +276,7 @@ public function test_initial_incorrect_credentials()
     {
         $this->commonLdapMocks(1, 1, 1, 0, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
@@ -261,7 +294,7 @@ public function test_login_not_found_username()
     {
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 0]);
 
         $resp = $this->mockUserLogin();
@@ -334,9 +367,9 @@ public function test_login_maps_roles_and_retains_existing_roles()
             'services.ldap.remove_from_groups' => false,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
                 'cn'       => [$this->mockUser->name],
@@ -379,9 +412,9 @@ public function test_login_maps_roles_and_removes_old_roles_if_set()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
                 'cn'       => [$this->mockUser->name],
@@ -421,9 +454,9 @@ public function test_dump_user_groups_shows_group_related_details_as_json()
             'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
             'mail'     => [$this->mockUser->email],
         ]];
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 0);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 0);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn($userResp, ['count' => 1,
                 0 => [
                     'dn' => 'dc=test,' . config('services.ldap.base_dn'),
@@ -434,8 +467,7 @@ public function test_dump_user_groups_shows_group_related_details_as_json()
                 ],
             ]);
 
-        $this->mockLdap->shouldReceive('read')->times(2);
-        $this->mockLdap->shouldReceive('getEntries')->times(2)
+        $this->mockLdap->shouldReceive('readAndGetEntries')->times(2)
             ->andReturn([
                 'count' => 1,
                 0 => [
@@ -493,18 +525,15 @@ public function test_recursive_group_search_queries_via_full_dn()
                       ],
         ];
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2);
 
         $escapedName = ldap_escape($this->mockUser->name);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->twice()
-            ->with($this->resourceId, config('services.ldap.base_dn'), "(&(uid={$escapedName}))", \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), "(&(uid={$escapedName}))", \Mockery::type('array'))
             ->andReturn($userResp, $groupResp);
 
-        $this->mockLdap->shouldReceive('read')->times(1)
-            ->with($this->resourceId, 'cn=ldaptester,ou=groups,dc=example,dc=com', '(objectClass=*)', ['memberof'])
-            ->andReturn(['count' => 0]);
-        $this->mockLdap->shouldReceive('getEntries')->times(1)
-            ->with($this->resourceId, ['count' => 0])
+        $this->mockLdap->shouldReceive('readAndGetEntries')->times(1)
+            ->with($this->connection, 'cn=ldaptester,ou=groups,dc=example,dc=com', '(objectClass=*)', ['memberof'])
             ->andReturn(['count' => 0]);
 
         $resp = $this->mockUserLogin();
@@ -529,9 +558,9 @@ public function test_login_maps_roles_using_external_auth_ids_if_set()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 3, 4, 2, 1, 1);
+        $this->commonLdapMocks(1, 1, 3, 4, 2, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
                 'cn'       => [$this->mockUser->name],
@@ -570,9 +599,9 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 4, 5, 2, 2, 2);
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'      => [$this->mockUser->name],
                 'cn'       => [$this->mockUser->name],
@@ -598,6 +627,44 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
         ]);
     }
 
+    public function test_login_group_mapping_gracefully_handles_utf8_and_invalid_group_dns()
+    {
+        $invalidRole = Role::factory()->create(['display_name' => 'LdapTester']);
+        $invalidRole2 = Role::factory()->create(['display_name' => 'beans']);
+        $roleToReceive2 = Role::factory()->create(['display_name' => 'ldapper']);
+        $this->mockUser->forceFill(['external_auth_id' => $this->mockUser->name])->save();
+
+        app('config')->set([
+            'services.ldap.user_to_groups'     => true,
+            'services.ldap.group_attribute'    => 'memberOf',
+            'services.ldap.remove_from_groups' => true,
+        ]);
+
+        $this->commonLdapMocks(1, 1, 4, 5, 2, 6, 2);
+        $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->andReturn(['count' => 1, 0 => [
+                'uid'      => [$this->mockUser->name],
+                'cn'       => [$this->mockUser->name],
+                'dn'       => 'dc=test' . config('services.ldap.base_dn'),
+                'mail'     => [$this->mockUser->email],
+                'memberof' => [
+                    'count' => 4,
+                    0       => 'cn=ldaptëstër,ou=groups,dc=ëxamplë,dc=com',
+                    1       => 'cn=ldapper,ou=groups,dc=example,dc=com',
+                    2       => 'bëans',
+                    3       => '',
+                ],
+            ]]);
+
+        $this->mockUserLogin()->assertRedirect('/');
+
+        $user = User::query()->where('email', $this->mockUser->email)->first();
+        $this->assertDatabaseMissing('role_user', ['user_id' => $user->id, 'role_id' => $invalidRole->id]);
+        $this->assertDatabaseMissing('role_user', ['user_id' => $user->id, 'role_id' => $invalidRole2->id]);
+        $this->assertDatabaseHas('role_user', ['user_id' => $user->id, 'role_id' => $roleToReceive2->id]);
+    }
+
     public function test_login_uses_specified_display_name_attribute()
     {
         app('config')->set([
@@ -606,7 +673,7 @@ public function test_login_uses_specified_display_name_attribute()
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'         => [$this->mockUser->name],
                 'cn'          => [$this->mockUser->name],
@@ -631,7 +698,7 @@ public function test_login_uses_multiple_display_properties_if_defined()
 
         $this->commonLdapMocks(1, 1, 1, 2, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'         => [$this->mockUser->name],
                 'cn'          => [$this->mockUser->name],
@@ -658,7 +725,7 @@ public function test_login_uses_default_display_name_attribute_if_specified_not_
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
@@ -747,7 +814,7 @@ public function test_dump_user_details_option_works()
 
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
@@ -788,7 +855,7 @@ public function test_ldap_attributes_can_be_binary_decoded_if_marked()
         $ldapService = app()->make(LdapService::class);
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), ['cn', 'dn', 'uid', 'mail', 'cn'])
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), ['cn', 'dn', 'uid', 'mail', 'cn'])
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [hex2bin('FFF8F7')],
                 'cn'  => [$this->mockUser->name],
@@ -803,7 +870,7 @@ public function test_new_ldap_user_login_with_already_used_email_address_shows_e
     {
         $this->commonLdapMocks(1, 1, 2, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'uid'  => [$this->mockUser->name],
                 'cn'   => [$this->mockUser->name],
@@ -837,7 +904,7 @@ public function test_login_with_email_confirmation_required_maps_groups_but_show
             'services.ldap.remove_from_groups' => true,
         ]);
 
-        $this->commonLdapMocks(1, 1, 6, 8, 4, 2, 2);
+        $this->commonLdapMocks(1, 1, 6, 8, 4, 4, 2);
         $this->mockLdap->shouldReceive('searchAndGetEntries')
             ->times(4)
             ->andReturn(['count' => 1, 0 => [
@@ -888,7 +955,7 @@ public function test_thumbnail_attribute_used_as_user_avatar_if_configured()
         $this->commonLdapMocks(1, 1, 1, 2, 1);
         $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
-            ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
+            ->with($this->connection, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
                 'cn'        => [$this->mockUser->name],
                 'dn'        => $ldapDn,
diff --git a/tests/Auth/MfaConfigurationTest.php b/tests/Auth/MfaConfigurationTest.php
index 1f359b41a10..5184bf9843c 100644
--- a/tests/Auth/MfaConfigurationTest.php
+++ b/tests/Auth/MfaConfigurationTest.php
@@ -6,6 +6,7 @@
 use BookStack\Activity\ActivityType;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
+use Illuminate\Support\Facades\Hash;
 use PragmaRX\Google2FA\Google2FA;
 use Tests\TestCase;
 
@@ -166,6 +167,36 @@ public function test_remove_mfa_method()
         $this->assertEquals(0, $admin->mfaValues()->count());
     }
 
+    public function test_mfa_required_if_set_on_role()
+    {
+        $user = $this->users->viewer();
+        $user->password = Hash::make('password');
+        $user->save();
+        /** @var Role $role */
+        $role = $user->roles()->first();
+        $role->mfa_enforced = true;
+        $role->save();
+
+        $resp = $this->post('/login', ['email' => $user->email, 'password' => 'password']);
+        $this->assertFalse(auth()->check());
+        $resp->assertRedirect('/mfa/verify');
+    }
+
+    public function test_mfa_required_if_mfa_option_configured()
+    {
+        $user = $this->users->viewer();
+        $user->password = Hash::make('password');
+        $user->save();
+        $user->mfaValues()->create([
+            'method' => MfaValue::METHOD_TOTP,
+            'value'  => 'test',
+        ]);
+
+        $resp = $this->post('/login', ['email' => $user->email, 'password' => 'password']);
+        $this->assertFalse(auth()->check());
+        $resp->assertRedirect('/mfa/verify');
+    }
+
     public function test_totp_setup_url_shows_correct_user_when_setup_forced_upon_login()
     {
         $admin = $this->users->admin();
diff --git a/tests/Auth/MfaVerificationTest.php b/tests/Auth/MfaVerificationTest.php
index 76c59bc748b..967be1c6a61 100644
--- a/tests/Auth/MfaVerificationTest.php
+++ b/tests/Auth/MfaVerificationTest.php
@@ -66,6 +66,27 @@ public function test_totp_form_has_autofill_configured()
         $html->assertElementExists('input[autocomplete="one-time-code"][name="code"]');
     }
 
+    public function test_totp_verification_is_rate_limited()
+    {
+        [$user, $secret, $loginResp] = $this->startTotpLogin();
+        $loginService = $this->app->make(LoginService::class);
+
+        $resp = $this->get('/mfa/verify');
+        for ($i = 0; $i < 5; $i++) {
+            $this->post('/mfa/totp/verify', [
+                'code' => '123456',
+            ])->assertRedirect('/mfa/verify');
+            $this->assertNotNull($loginService->getLastLoginAttemptUser());
+        }
+
+        $resp = $this->post('/mfa/totp/verify', [
+            'code' => '123456',
+        ]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Too many multi-factor verification attempts. Please try again in 60 seconds.');
+        $this->assertNull($loginService->getLastLoginAttemptUser());
+    }
+
     public function test_backup_code_verification()
     {
         [$user, $codes, $loginResp] = $this->startBackupCodeLogin();
@@ -147,6 +168,27 @@ public function test_backup_code_verification_shows_warning_when_limited_codes_r
         $resp->assertSeeText('You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.');
     }
 
+    public function test_backup_code_verification_is_rate_limited()
+    {
+        [$user, $codes, $loginResp] = $this->startBackupCodeLogin(['abc12-def45', 'abc12-def46']);
+        $loginService = $this->app->make(LoginService::class);
+
+        $resp = $this->get('/mfa/verify');
+        for ($i = 0; $i < 5; $i++) {
+            $this->post('/mfa/backup_codes/verify', [
+                'code' => '123456abcd',
+            ])->assertRedirect('/mfa/verify');
+            $this->assertNotNull($loginService->getLastLoginAttemptUser());
+        }
+
+        $resp = $this->post('/mfa/backup_codes/verify', [
+            'code' => '123456abcd',
+        ]);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Too many multi-factor verification attempts. Please try again in 60 seconds.');
+        $this->assertNull($loginService->getLastLoginAttemptUser());
+    }
+
     public function test_backup_code_form_has_autofill_configured()
     {
         [$user, $codes, $loginResp] = $this->startBackupCodeLogin();
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index a0db1c2ba00..8bbf06729b5 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -138,7 +138,7 @@ public function test_login_success_flow()
     {
         // Start auth
         $this->post('/oidc/login');
-        $state = session()->get('oidc_state');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
 
         $transactions = $this->mockHttpClient([$this->getMockAuthorizationResponse([
             'email' => 'benny@example.com',
@@ -190,6 +190,35 @@ public function test_callback_fails_if_no_state_present_or_matching()
         $this->assertSessionError('Login using SingleSignOn-Testing failed, system did not provide successful authorization');
     }
 
+    public function test_callback_works_even_if_other_request_made_by_session()
+    {
+        $this->mockHttpClient([$this->getMockAuthorizationResponse([
+            'email' => 'benny@example.com',
+            'sub'   => 'benny1010101',
+        ])]);
+
+        $this->post('/oidc/login');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
+
+        $this->get('/');
+
+        $resp = $this->get("/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state={$state}");
+        $resp->assertRedirect('/');
+    }
+
+    public function test_callback_fails_if_state_timestamp_is_too_old()
+    {
+        $this->post('/oidc/login');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
+        session()->put('oidc_state', (time() - 60 * 4) . ':' . $state);
+
+        $this->get('/');
+
+        $resp = $this->get("/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state={$state}");
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('Login using SingleSignOn-Testing failed, system did not provide successful authorization');
+    }
+
     public function test_dump_user_details_option_outputs_as_expected()
     {
         config()->set('oidc.dump_user_details', true);
@@ -442,7 +471,28 @@ public function test_auth_uses_configured_external_id_claim_option()
         $this->assertEquals('xXBennyTheGeezXx', $user->external_auth_id);
     }
 
-    public function test_auth_uses_mulitple_display_name_claims_if_configured()
+    public function test_auth_uses_external_id_as_exact_value()
+    {
+        // External auth id the same as we expect below but different casing
+        User::query()->forceCreate([
+            'email'            => 'otheruser@example.com',
+            'external_auth_id' => 'Benni202',
+            'email_confirmed'  => true,
+            'name'             => 'Barry Scott',
+        ]);
+
+        $resp = $this->runLogin([
+            'email'            => 'benny@example.com',
+            'sub'              => 'benni202',
+        ]);
+        $resp->assertRedirect('/');
+
+        $this->assertDatabaseHas('users', ['email' => 'benny@example.com']);
+        $this->assertEquals('benny@example.com', user()->email);
+        $this->assertEquals('benni202', user()->external_auth_id);
+    }
+
+    public function test_auth_uses_multiple_display_name_claims_if_configured()
     {
         config()->set(['oidc.display_name_claims' => 'first_name|last_name']);
 
@@ -793,11 +843,39 @@ public function test_oidc_id_token_pre_validate_theme_event_with_return()
         ]);
     }
 
+    public function test_oidc_auth_pre_redirect_theme_event_with_return()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+            return 'https://cats.example.com?beans=true';
+        };
+        Theme::listen(ThemeEvents::OIDC_AUTH_PRE_REDIRECT, $callback);
+
+        $resp = $this->post('/oidc/login');
+        $resp->assertRedirect('https://cats.example.com?beans=true');
+
+        $this->assertCount(1, $args);
+        $this->assertStringStartsWith('https://oidc.local/auth', $args[0]);
+    }
+
+    public function test_oidc_auth_pre_redirect_theme_event_with_no_return()
+    {
+        $callback = function ($redirectUrl) {
+            $redirectUrl = 'cat';
+        };
+        Theme::listen(ThemeEvents::OIDC_AUTH_PRE_REDIRECT, $callback);
+
+        $resp = $this->post('/oidc/login');
+        $redirect = $resp->headers->get('Location');
+        $this->assertStringStartsWith('https://oidc.local/auth?', $redirect);
+    }
+
     public function test_pkce_used_on_authorize_and_access()
     {
         // Start auth
         $resp = $this->post('/oidc/login');
-        $state = session()->get('oidc_state');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
 
         $pkceCode = session()->get('oidc_pkce_code');
         $this->assertGreaterThan(30, strlen($pkceCode));
@@ -825,7 +903,7 @@ public function test_userinfo_endpoint_used_if_missing_claims_in_id_token()
     {
         config()->set('oidc.display_name_claims', 'first_name|last_name');
         $this->post('/oidc/login');
-        $state = session()->get('oidc_state');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
 
         $client = $this->mockHttpClient([
             $this->getMockAuthorizationResponse(['name' => null]),
@@ -973,7 +1051,7 @@ public function test_userinfo_endpoint_not_called_if_empty_groups_array_provided
         ]);
 
         $this->post('/oidc/login');
-        $state = session()->get('oidc_state');
+        $state = explode(':', session()->get('oidc_state'), 2)[1];
         $client = $this->mockHttpClient([$this->getMockAuthorizationResponse([
             'groups' => [],
         ])]);
@@ -999,7 +1077,7 @@ protected function withAutodiscovery(): void
     protected function runLogin($claimOverrides = [], $additionalHttpResponses = []): TestResponse
     {
         $this->post('/oidc/login');
-        $state = session()->get('oidc_state');
+        $state = explode(':', session()->get('oidc_state') ?? '', 2)[1] ?? '';
         $this->mockHttpClient([$this->getMockAuthorizationResponse($claimOverrides), ...$additionalHttpResponses]);
 
         return $this->get('/oidc/callback?code=SplxlOBeZQQYbYS6WxSbIA&state=' . $state);
diff --git a/tests/Auth/RegistrationTest.php b/tests/Auth/RegistrationTest.php
index 2666fa3b4c7..e0d7c262682 100644
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -188,6 +188,30 @@ public function test_registration_validation()
         $resp->assertSee('The password must be at least 8 characters.');
     }
 
+    public function test_registration_input_filtered_to_validated_input()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+        $roleIds = Role::all()->pluck('id')->toArray();
+
+        $resp = $this->post('/register', [
+            'name'     => 'Barry',
+            'email'    => 'barry@example.com',
+            'password' => 'superpassword',
+            'password_confirmation' => 'superpassword',
+            'external_auth_id' => 'ext5691284',
+            'roles' => $roleIds,
+        ]);
+
+        $resp->assertRedirect('/');
+
+        /** @var User $user */
+        $user = auth()->user();
+        $this->assertNotNull($user);
+        $this->assertFalse($user->isGuest());
+        $this->assertEmpty($user->external_auth_id);
+        $this->assertEquals(0, $user->roles()->count());
+    }
+
     public function test_registration_simple_honeypot_active()
     {
         $this->setSettings(['registration-enabled' => 'true']);
diff --git a/tests/Auth/Saml2Test.php b/tests/Auth/Saml2Test.php
index 3de6238edc8..fbaffceb38e 100644
--- a/tests/Auth/Saml2Test.php
+++ b/tests/Auth/Saml2Test.php
@@ -36,7 +36,7 @@ protected function setUp(): void
     public function test_metadata_endpoint_displays_xml_as_expected()
     {
         $req = $this->get('/saml2/metadata');
-        $req->assertHeader('Content-Type', 'text/xml; charset=UTF-8');
+        $req->assertHeader('Content-Type', 'text/xml; charset=utf-8');
         $req->assertSee('md:EntityDescriptor');
         $req->assertSee(url('/saml2/acs'));
     }
@@ -51,7 +51,7 @@ public function test_metadata_endpoint_loads_when_autoloading_with_bad_url_set()
 
         $req = $this->get('/saml2/metadata');
         $req->assertOk();
-        $req->assertHeader('Content-Type', 'text/xml; charset=UTF-8');
+        $req->assertHeader('Content-Type', 'text/xml; charset=utf-8');
         $req->assertSee('md:EntityDescriptor');
     }
 
@@ -419,6 +419,29 @@ public function test_login_where_existing_non_saml_user_shows_warning()
         $acsPost->assertSee('A user with the email user@example.com already exists but with different credentials');
     }
 
+    public function test_login_uses_exact_match_for_external_auth_values()
+    {
+        $this->post('/saml2/login');
+        config()->set(['saml2.onelogin.strict' => false]);
+
+        // Make the user pre-existing in DB with auth_id of different casing
+        User::query()->forceCreate([
+            'email'            => 'otheruser@example.com',
+            'external_auth_id' => 'UsEr',
+            'email_confirmed'  => true,
+            'name'             => 'Barry Scott',
+        ]);
+
+        $this->followingRedirects()->post('/saml2/acs', ['SAMLResponse' => $this->acsPostData]);
+
+        $this->assertTrue($this->isAuthenticated());
+        $this->assertDatabaseHas('users', [
+            'email' => 'user@example.com',
+        ]);
+        $this->assertEquals('user@example.com', user()->email);
+        $this->assertEquals('user', user()->external_auth_id);
+    }
+
     public function test_login_request_contains_expected_default_authncontext()
     {
         $authReq = $this->getAuthnRequest();
diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index 89b8fd167dc..6980962b79d 100644
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Auth;
 
 use BookStack\Access\SocialAccount;
+use BookStack\Access\SocialAuthService;
 use BookStack\Activity\ActivityType;
 use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\DB;
@@ -239,4 +240,60 @@ public function test_social_registration_with_no_name_uses_email_as_name()
         $user = $user->whereEmail($user->email)->first();
         $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
     }
+
+    public function test_registration_allows_creation_with_id_which_already_used_by_another_user_and_service()
+    {
+        $user = $this->users->editor();
+        SocialAccount::factory()->create(['driver' => 'google', 'driver_id' => '123abc', 'user_id' => $user->id]);
+
+        $this->setSettings(['registration-enabled' => 'true']);
+        config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc']);
+        session()->put('social-callback', 'register');
+
+        $socialUser = new \Laravel\Socialite\One\User();
+        $socialUser->id = '123abc';
+        $socialUser->email = 'barrygithub@example.com';
+        $socialUser->name = 'BarryGitHub';
+        $socialUser->avatar = 'avatar_placeholder';
+
+        $serviceMock = $this->partialMockService(SocialAuthService::class);
+        $serviceMock->shouldReceive('getSocialUser')->andReturn($socialUser);
+
+        $resp = $this->get('/login/service/github/callback');
+        $resp->assertRedirect('/');
+
+        $this->assertTrue(auth()->check());
+        $this->assertDatabaseHas('social_accounts', [
+            'user_id' => user()->id,
+            'driver' => 'github',
+            'driver_id' => '123abc'
+        ]);
+        $this->assertDatabaseHas('social_accounts', [
+            'user_id' => $user->id,
+            'driver' => 'google',
+            'driver_id' => '123abc'
+        ]);
+    }
+
+    public function test_login_account_link_restrained_by_service()
+    {
+        config([
+            'GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc',
+        ]);
+        $existingUser = $this->users->viewer();
+        SocialAccount::factory()->create(['driver' => 'github', 'driver_id' => 'logintest123', 'user_id' => $existingUser->id]);
+        session()->put('social-callback', 'login');
+
+        $socialUser = new \Laravel\Socialite\One\User();
+        $socialUser->id = 'logintest123';
+        $serviceMock = $this->partialMockService(SocialAuthService::class);
+        $serviceMock->shouldReceive('getSocialUser')->andReturn($socialUser);
+
+        $resp = $this->followingRedirects()->get('/login/service/google/callback');
+
+        $this->assertFalse(auth()->check());
+        $this->assertNotEquals($existingUser->id, user()->id);
+        $resp->assertSee('login-form');
+        $resp->assertSee(trans('errors.social_account_not_used', ['socialAccount' => 'Google']));
+    }
 }
diff --git a/tests/Commands/ClearRevisionsCommandTest.php b/tests/Commands/ClearRevisionsCommandTest.php
index a7aef958fc9..cd2fab56ef5 100644
--- a/tests/Commands/ClearRevisionsCommandTest.php
+++ b/tests/Commands/ClearRevisionsCommandTest.php
@@ -14,16 +14,14 @@ public function test_clear_revisions_command()
         $this->asEditor();
         $pageRepo = app(PageRepo::class);
         $page = Page::first();
-        $pageRepo->update($page, ['name' => 'updated page', 'html' => '<p>new content</p>', 'summary' => 'page revision testing']);
-        $pageRepo->updatePageDraft($page, ['name' => 'updated page', 'html' => '<p>new content in draft</p>', 'summary' => 'page revision testing']);
+        $pageRepo->update($page, ['name' => 'updated page', 'html' => '<p>new content</p>', 'changelog' => 'page revision testing']);
+        $pageRepo->updatePageDraft($page, ['name' => 'updated page', 'html' => '<p>new content in draft</p>', 'changelog' => 'page revision testing']);
 
         $this->assertDatabaseHas('page_revisions', [
             'page_id' => $page->id,
-            'type'    => 'version',
         ]);
-        $this->assertDatabaseHas('page_revisions', [
+        $this->assertDatabaseHas('page_update_drafts', [
             'page_id' => $page->id,
-            'type'    => 'update_draft',
         ]);
 
         $exitCode = Artisan::call('bookstack:clear-revisions');
@@ -31,19 +29,16 @@ public function test_clear_revisions_command()
 
         $this->assertDatabaseMissing('page_revisions', [
             'page_id' => $page->id,
-            'type'    => 'version',
         ]);
-        $this->assertDatabaseHas('page_revisions', [
+        $this->assertDatabaseHas('page_update_drafts', [
             'page_id' => $page->id,
-            'type'    => 'update_draft',
         ]);
 
         $exitCode = Artisan::call('bookstack:clear-revisions', ['--all' => true]);
         $this->assertTrue($exitCode === 0, 'Command executed successfully');
 
-        $this->assertDatabaseMissing('page_revisions', [
+        $this->assertDatabaseMissing('page_update_drafts', [
             'page_id' => $page->id,
-            'type'    => 'update_draft',
         ]);
     }
 }
diff --git a/tests/Commands/CopyShelfPermissionsCommandTest.php b/tests/Commands/CopyShelfPermissionsCommandTest.php
index 5c21a2e341c..d5f9677a229 100644
--- a/tests/Commands/CopyShelfPermissionsCommandTest.php
+++ b/tests/Commands/CopyShelfPermissionsCommandTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Commands;
 
+use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use Tests\TestCase;
 
@@ -61,4 +62,21 @@ public function test_copy_shelf_permissions_command_using_all()
             'view' => true, 'update' => true, 'create' => false, 'delete' => false,
         ]);
     }
+
+    public function test_copy_shelf_permissions_command_using_slug_without_interaction()
+    {
+        $shelf = $this->entities->shelfHasBooks();
+        $editorRole = $this->users->editor()->roles()->first();
+        /** @var Book $child */
+        $child = $shelf->books()->first();
+        $child->shelves()->where('id', '!=', $shelf->id)->delete();
+
+        $this->assertFalse($child->hasPermissions());
+
+        $this->permissions->setEntityPermissions($shelf, ['view', 'update'], [$editorRole]);
+        $this->artisan('bookstack:copy-shelf-permissions --all --no-interaction');
+
+        $child->refresh();
+        $this->assertTrue($child->hasPermissions(), 'Child book should now be restricted');
+    }
 }
diff --git a/tests/Commands/InstallModuleCommandTest.php b/tests/Commands/InstallModuleCommandTest.php
new file mode 100644
index 00000000000..99056b76076
--- /dev/null
+++ b/tests/Commands/InstallModuleCommandTest.php
@@ -0,0 +1,391 @@
+<?php
+
+namespace Tests\Commands;
+
+use GuzzleHttp\Psr7\Response;
+use Illuminate\Support\Facades\File;
+use Tests\TestCase;
+use ZipArchive;
+
+class InstallModuleCommandTest extends TestCase
+{
+    public function test_local_module_install_with_active_theme()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+            $expectedInstallPath = theme_path('modules/test-module');
+            $this->artisan('bookstack:install-module', ['location' => $zip])
+                ->expectsOutput("\nThis will install a module from: {$zip}\n\nModules can contain code which would have the ability to do anything on the BookStack host server.\nYou should only install modules from trusted sources.")
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput('Module "Test Module" (v1.0.0) successfully installed!')
+                ->expectsOutput("Install location: {$expectedInstallPath}")
+                ->assertExitCode(0);
+
+            $this->assertDirectoryExists($expectedInstallPath);
+            $this->assertFileExists($expectedInstallPath . '/bookstack-module.json');
+        });
+    }
+
+    public function test_remote_module_install_with_active_theme()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+
+            $http = $this->mockHttpClient([
+                new Response(200, ['Content-Length' => filesize($zip)], file_get_contents($zip))
+            ]);
+            $expectedInstallPath = theme_path('modules/test-module');
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsOutput("\nThis will download a module from: example.com\n\nModules can contain code which would have the ability to do anything on the BookStack host server.\nYou should only install modules from trusted sources.")
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('Module "Test Module" (v1.0.0) successfully installed!')
+                ->expectsOutput("Install location: {$expectedInstallPath}")
+                ->assertExitCode(0);
+
+            $this->assertEquals(1, $http->requestCount());
+            $request = $http->requestAt(0);
+            $this->assertEquals('/test-module.zip', $request->getUri()->getPath());
+
+            $this->assertDirectoryExists($expectedInstallPath);
+            $this->assertFileExists($expectedInstallPath . '/bookstack-module.json');
+        });
+    }
+
+    public function test_remote_http_module_warns_and_prompts_users()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+
+            $http = $this->mockHttpClient([
+                new Response(200, ['Content-Length' => filesize($zip)], file_get_contents($zip))
+            ]);
+            $expectedInstallPath = theme_path('modules/test-module');
+
+            $this->artisan('bookstack:install-module', ['location' => 'http://example.com/test-module.zip'])
+                ->expectsOutput("\nThis will download a module from: example.com\n\nModules can contain code which would have the ability to do anything on the BookStack host server.\nYou should only install modules from trusted sources.")
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput("You are downloading a module from an insecure HTTP source.\nWe recommend only using HTTPS sources to avoid various security risks.")
+                ->expectsConfirmation('Are you sure you want to continue without HTTPS?', 'yes')
+                ->expectsOutput('Module "Test Module" (v1.0.0) successfully installed!')
+                ->expectsOutput("Install location: {$expectedInstallPath}")
+                ->assertExitCode(0);
+
+            $request = $http->requestAt(0);
+            $this->assertEquals('/test-module.zip', $request->getUri()->getPath());
+        });
+    }
+
+    public function test_remote_module_install_follows_redirects()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'https://example.com/a-test-module.zip']),
+                new Response(200, ['Content-Length' => filesize($zip)], file_get_contents($zip))
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->assertExitCode(0);
+
+            $this->assertEquals(2, $http->requestCount());
+            $this->assertEquals('/test-module.zip', $http->requestAt(0)->getUri()->getPath());
+            $this->assertEquals('/a-test-module.zip', $http->requestAt(1)->getUri()->getPath());
+        });
+    }
+
+    public function test_remote_module_install_prompts_on_following_redirects_to_different_origin()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'http://example.com/a-test-module.zip']),
+                new Response(301, ['Location' => 'https://a.example.com:8080/a-test-module.zip']),
+                new Response(200, ['Content-Length' => filesize($zip)], file_get_contents($zip))
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: http://example.com')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: https://a.example.com:8080')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'yes')
+                ->assertExitCode(0);
+
+            $this->assertEquals(3, $http->requestCount());
+            $this->assertEquals('https', $http->requestAt(0)->getUri()->getScheme());
+            $this->assertEquals('http', $http->requestAt(1)->getUri()->getScheme());
+            $this->assertEquals('a.example.com', $http->requestAt(2)->getUri()->getHost());
+        });
+    }
+
+    public function test_remote_module_install_redirect_origin_prompt_rejection()
+    {
+        $this->usingThemeFolder(function () {
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'http://example.com/a-test-module.zip']),
+                new Response(301, ['Location' => 'https://a.example.com:8080/a-test-module.zip']),
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('The download URL is redirecting to a different site: http://example.com')
+                ->expectsConfirmation('Do you trust downloading the module from this site?', 'no')
+                ->assertExitCode(1);
+
+            $this->assertEquals(1, $http->requestCount());
+            $this->assertEquals('https', $http->requestAt(0)->getUri()->getScheme());
+        });
+    }
+
+    public function test_remote_module_install_has_redirect_limit()
+    {
+        $this->usingThemeFolder(function () {
+            $http = $this->mockHttpClient([
+                new Response(302, ['Location' => 'https://example.com/a-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/b-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/c-test-module.zip']),
+                new Response(302, ['Location' => 'https://example.com/d-test-module.zip']),
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('ERROR: Failed to download module from https://example.com/test-module.zip')
+                ->assertExitCode(1);
+
+            $this->assertEquals(4, $http->requestCount());
+            $this->assertEquals('/c-test-module.zip', $http->requestAt(3)->getUri()->getPath());
+        });
+    }
+
+    public function test_remote_module_install_download_failures_are_announced_to_user()
+    {
+        $this->usingThemeFolder(function () {
+            $http = $this->mockHttpClient([
+                new Response(404),
+            ]);
+
+            $this->artisan('bookstack:install-module', ['location' => 'https://example.com/test-module.zip'])
+                ->expectsConfirmation('Are you sure you trust this source?', 'yes')
+                ->expectsOutput('ERROR: Failed to download module from https://example.com/test-module.zip')
+                ->expectsOutput('Download failed with status code 404')
+                ->assertExitCode(1);
+            $this->assertEquals(1, $http->requestCount());
+        });
+    }
+
+    public function test_run_with_invalid_path_exits_early()
+    {
+        $this->artisan('bookstack:install-module', ['location' => '/not-found.zip'])
+            ->expectsOutput('ERROR: Module file not found at /not-found.zip')
+            ->assertExitCode(1);
+    }
+
+    public function test_run_with_invalid_zip_has_early_exit()
+    {
+        $zip = $this->getModuleZipPath();
+        file_put_contents($zip, 'invalid zip');
+
+        $this->artisan('bookstack:install-module', ['location' => $zip])
+            ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+            ->expectsOutput("ERROR: Cannot open ZIP file at {$zip}")
+            ->assertExitCode(1);
+    }
+
+    public function test_run_with_large_zip_has_early_exit()
+    {
+        $zip = $this->getModuleZipPath(null, [
+            'large-file.txt' => str_repeat('a', 1024 * 1024 * 51)
+        ]);
+
+        $this->artisan('bookstack:install-module', ['location' => $zip])
+            ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+            ->expectsOutput("ERROR: Module ZIP file contents are too large. Maximum size is 50MB")
+            ->assertExitCode(1);
+    }
+
+    public function test_run_with_invalid_module_data_has_early_exit()
+    {
+        $zip = $this->getModuleZipPath([
+            'name' => 'Invalid Module',
+            'description' => 'A module with invalid data',
+            'version' => 'dog',
+        ]);
+
+        $this->artisan('bookstack:install-module', ['location' => $zip])
+            ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+            ->expectsOutput("ERROR: Failed to read module metadata with error: Module in folder \"_temp\" has an invalid 'version' format. Expected semantic version format like '1.0.0' or 'v1.0.0'")
+            ->assertExitCode(1);
+    }
+
+    public function test_module_zip_when_files_in_nested_directory()
+    {
+        $this->usingThemeFolder(function ($themeFolder) {
+            $zip = new ZipArchive();
+            $zipFile = tempnam(sys_get_temp_dir(), 'bs-test-module');
+            $zip->open($zipFile, ZipArchive::CREATE);
+
+            $zip->addEmptyDir('mod');
+            $zip->addFromString('mod/bookstack-module.json', json_encode($metadata ?? [
+                'name' => 'Test Module',
+                'description' => 'A test module for BookStack',
+                'version' => '1.0.0',
+            ]));
+            $zip->addFromString('mod/functions.php', '<?php $a = "cat";');
+            $zip->addEmptyDir('mod/a');
+            $zip->addFromString('mod/a/cat.txt', 'Meow');
+            $zip->close();
+
+            $this->artisan('bookstack:install-module', ['location' => $zipFile])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->assertExitCode(0);
+
+            $modulePath = glob(theme_path('modules/*'), GLOB_ONLYDIR)[0];
+            $this->assertFileExists($modulePath . '/a/cat.txt');
+            $contents = file_get_contents($modulePath . '/a/cat.txt');
+            $this->assertEquals('Meow', $contents);
+        });
+    }
+
+    public function test_module_install_negates_zip_slip()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath(null, [
+                '../parent.txt' => str_repeat('dog', 10)
+            ]);
+
+            $expectedInstallPath = theme_path('modules/test-module');
+            $this->artisan('bookstack:install-module', ['location' => $zip])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput("ERROR: Failed to install module with error: Failed to load extract files from module ZIP with error: Bad file path found in module ZIP file: ../parent.txt")
+                ->assertExitCode(1);
+
+            $this->assertDirectoryDoesNotExist($expectedInstallPath);
+        });
+    }
+
+    public function test_local_module_install_without_active_theme_can_setup_theme_folder()
+    {
+        $zip = $this->getModuleZipPath();
+        $expectedThemePath = base_path('themes/custom');
+        File::deleteDirectory($expectedThemePath);
+
+        $this->artisan('bookstack:install-module', ['location' => $zip])
+            ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+            ->expectsConfirmation('No active theme folder found, would you like to create one?', 'yes')
+            ->expectsOutput("Created theme folder at {$expectedThemePath}")
+            ->expectsOutput("You will need to set APP_THEME=custom in your BookStack env configuration to enable this theme!")
+            ->expectsOutput('Module "Test Module" (v1.0.0) successfully installed!')
+            ->assertExitCode(0);
+
+        $this->assertDirectoryExists($expectedThemePath . '/modules/test-module');
+
+        File::deleteDirectory($expectedThemePath);
+    }
+
+    public function test_local_module_install_with_active_theme_and_conflicting_modules_file_causes_early_exit()
+    {
+        $this->usingThemeFolder(function () {
+            $zip = $this->getModuleZipPath();
+            File::put(theme_path('modules'), '{}');
+
+            $this->artisan('bookstack:install-module', ['location' => $zip])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput("ERROR: Cannot create a modules folder, file already exists at " . theme_path('modules'))
+                ->assertExitCode(1);
+        });
+    }
+
+    public function test_single_existing_module_with_same_name_replace()
+    {
+        $this->usingThemeFolder(function () {
+            $original = $this->createModuleFolderInCurrentTheme(['name' => 'Test Module', 'description' => 'cat', 'version' => '1.0.0']);
+            $new = $this->getModuleZipPath(['name' => 'Test Module', 'description' => '', 'version' => '2.0.0']);
+
+            $this->artisan('bookstack:install-module', ['location' => $new])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput('The following modules already exist with the same name:')
+                ->expectsOutput('Test Module (test-module:v1.0.0) - cat')
+                ->expectsChoice('What would you like to do?', 'Replace existing module', ['Cancel module install', 'Add alongside existing module', 'Replace existing module'])
+                ->expectsOutput("Replacing existing module in test-module folder")
+                ->assertExitCode(0);
+
+            $this->assertFileExists($original . '/bookstack-module.json');
+            $metadata = json_decode(file_get_contents($original . '/bookstack-module.json'), true);
+            $this->assertEquals('2.0.0', $metadata['version']);
+        });
+    }
+
+    public function test_single_existing_module_with_same_name_cancel()
+    {
+        $this->usingThemeFolder(function () {
+            $original = $this->createModuleFolderInCurrentTheme(['name' => 'Test Module', 'description' => 'cat', 'version' => '1.0.0']);
+            $new = $this->getModuleZipPath(['name' => 'Test Module', 'description' => '', 'version' => '2.0.0']);
+
+            $this->artisan('bookstack:install-module', ['location' => $new])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput('The following modules already exist with the same name:')
+                ->expectsOutput('Test Module (test-module:v1.0.0) - cat')
+                ->expectsChoice('What would you like to do?', 'Cancel module install', ['Cancel module install', 'Add alongside existing module', 'Replace existing module'])
+                ->assertExitCode(1);
+
+            $this->assertFileExists($original . '/bookstack-module.json');
+            $metadata = json_decode(file_get_contents($original . '/bookstack-module.json'), true);
+            $this->assertEquals('1.0.0', $metadata['version']);
+        });
+    }
+
+    public function test_single_existing_module_with_same_name_add()
+    {
+        $this->usingThemeFolder(function () {
+            $original = $this->createModuleFolderInCurrentTheme(['name' => 'Test Module', 'description' => 'cat', 'version' => '1.0.0']);
+            $new = $this->getModuleZipPath(['name' => 'Test Module', 'description' => '', 'version' => '2.0.0']);
+
+            $this->artisan('bookstack:install-module', ['location' => $new])
+                ->expectsConfirmation('Are you sure you want to install this module?', 'yes')
+                ->expectsOutput('The following modules already exist with the same name:')
+                ->expectsOutput('Test Module (test-module:v1.0.0) - cat')
+                ->expectsChoice('What would you like to do?', 'Add alongside existing module', ['Cancel module install', 'Add alongside existing module', 'Replace existing module'])
+                ->assertExitCode(0);
+
+            $dirs = File::directories(theme_path('modules/'));
+            $this->assertCount(2, $dirs);
+        });
+    }
+
+    protected function createModuleFolderInCurrentTheme(array|null $metadata = null, array $extraFiles = []): string
+    {
+        $original = $this->getModuleZipPath($metadata, $extraFiles);
+        $targetPath = theme_path('modules/test-module');
+        mkdir($targetPath, 0777, true);
+        $originalZip = new ZipArchive();
+        $originalZip->open($original);
+        $originalZip->extractTo($targetPath);
+        $originalZip->close();
+
+        return $targetPath;
+    }
+
+    protected function getModuleZipPath(array|null $metadata = null, array $extraFiles = []): string
+    {
+        $zip = new ZipArchive();
+        $tmpFile = tempnam(sys_get_temp_dir(), 'bs-test-module');
+        $zip->open($tmpFile, ZipArchive::OVERWRITE);
+
+        $zip->addFromString('bookstack-module.json', json_encode($metadata ?? [
+            'name' => 'Test Module',
+            'description' => 'A test module for BookStack',
+            'version' => '1.0.0',
+        ]));
+
+        foreach ($extraFiles as $path => $contents) {
+            $zip->addFromString($path, $contents);
+        }
+
+        $zip->close();
+        return $tmpFile;
+    }
+}
diff --git a/tests/Commands/RegeneratePermissionsCommandTest.php b/tests/Commands/RegeneratePermissionsCommandTest.php
index 75c6c1b3851..27a339fbe1f 100644
--- a/tests/Commands/RegeneratePermissionsCommandTest.php
+++ b/tests/Commands/RegeneratePermissionsCommandTest.php
@@ -16,7 +16,7 @@ public function test_regen_permissions_command()
         $page = $this->entities->page();
         $editor = $this->users->editor();
         $role = $editor->roles()->first();
-        $this->permissions->addEntityPermission($page, ['view'], $role);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $role);
         JointPermission::query()->truncate();
 
         $this->assertDatabaseMissing('joint_permissions', ['entity_id' => $page->id]);
diff --git a/tests/Commands/UpdateUrlCommandTest.php b/tests/Commands/UpdateUrlCommandTest.php
index d336e05a240..0fb166572d2 100644
--- a/tests/Commands/UpdateUrlCommandTest.php
+++ b/tests/Commands/UpdateUrlCommandTest.php
@@ -19,7 +19,7 @@ public function test_command_updates_page_content()
             ->expectsQuestion("This will search for \"https://example.com\" in your database and replace it with  \"https://cats.example.com\".\nAre you sure you want to proceed?", 'y')
             ->expectsQuestion('This operation could cause issues if used incorrectly. Have you made a backup of your existing database?', 'y');
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'   => $page->id,
             'html' => '<a href="https://cats.example.com/donkeys"></a>',
         ]);
@@ -40,7 +40,7 @@ public function test_command_updates_description_html()
             ->expectsQuestion('This operation could cause issues if used incorrectly. Have you made a backup of your existing database?', 'y');
 
         foreach ($models as $model) {
-            $this->assertDatabaseHas($model->getTable(), [
+            $this->assertDatabaseHasEntityData($model->getMorphClass(), [
                 'id'               => $model->id,
                 'description_html' => '<a href="https://cats.example.com/donkeys"></a>',
             ]);
@@ -108,6 +108,26 @@ public function test_command_updates_page_revisions()
         ]);
     }
 
+    public function test_command_updates_page_update_drafts()
+    {
+        $page = $this->entities->page();
+
+        for ($i = 0; $i < 2; $i++) {
+            $page->updateDrafts()->forceCreate([
+                'name' => $page->name,
+                'markdown' => "[A link {$i}](https://example.com/donkey/cat)"
+            ]);
+        }
+
+        $this->runUpdate('https://example.com', 'https://cats.example.com');
+        setting()->flushCache();
+
+        $this->assertDatabaseHas('page_update_drafts', [
+            'page_id' => $page->id,
+            'markdown' => '[A link 1](https://cats.example.com/donkey/cat)',
+        ]);
+    }
+
     protected function runUpdate(string $oldUrl, string $newUrl)
     {
         $this->artisan("bookstack:update-url {$oldUrl} {$newUrl}")
diff --git a/tests/DebugViewTest.php b/tests/DebugViewTest.php
index 34de6b80297..b9a99ec725e 100644
--- a/tests/DebugViewTest.php
+++ b/tests/DebugViewTest.php
@@ -27,7 +27,7 @@ public function test_debug_view_shows_expected_details()
         $resp->assertSeeText('BookStack Version: ' . trim(file_get_contents(base_path('version'))));
         // Dynamic help links
         $this->withHtml($resp)->assertElementExists('a[href*="q=' . urlencode('BookStack An error occurred during testing') . '"]');
-        $this->withHtml($resp)->assertElementExists('a[href*="?q=is%3Aissue+' . urlencode('An error occurred during testing') . '"]');
+        $this->withHtml($resp)->assertElementExists('a[href*="?q=' . urlencode('An error occurred during testing') . '"]');
     }
 
     public function test_debug_view_only_shows_when_debug_mode_is_enabled()
diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php
index ad1d64e7126..3ba2c3e99c8 100644
--- a/tests/Entity/BookShelfTest.php
+++ b/tests/Entity/BookShelfTest.php
@@ -91,7 +91,7 @@ public function test_shelves_create()
         ]));
         $resp->assertRedirect();
         $editorId = $this->users->editor()->id;
-        $this->assertDatabaseHas('bookshelves', array_merge($shelfInfo, ['created_by' => $editorId, 'updated_by' => $editorId]));
+        $this->assertDatabaseHasEntityData('bookshelf', array_merge($shelfInfo, ['created_by' => $editorId, 'updated_by' => $editorId]));
 
         $shelf = Bookshelf::where('name', '=', $shelfInfo['name'])->first();
         $shelfPage = $this->get($shelf->getUrl());
@@ -117,11 +117,12 @@ public function test_shelves_create_sets_cover_image()
 
         $lastImage = Image::query()->orderByDesc('id')->firstOrFail();
         $shelf = Bookshelf::query()->where('name', '=', $shelfInfo['name'])->first();
-        $this->assertDatabaseHas('bookshelves', [
-            'id'       => $shelf->id,
+        $this->assertDatabaseHas('entity_container_data', [
+            'entity_id'       => $shelf->id,
+            'entity_type' => 'bookshelf',
             'image_id' => $lastImage->id,
         ]);
-        $this->assertEquals($lastImage->id, $shelf->cover->id);
+        $this->assertEquals($lastImage->id, $shelf->coverInfo()->getImage()->id);
         $this->assertEquals('cover_bookshelf', $lastImage->type);
     }
 
@@ -247,7 +248,7 @@ public function test_shelf_edit()
         $this->assertSessionHas('success');
 
         $editorId = $this->users->editor()->id;
-        $this->assertDatabaseHas('bookshelves', array_merge($shelfInfo, ['id' => $shelf->id, 'created_by' => $editorId, 'updated_by' => $editorId]));
+        $this->assertDatabaseHasEntityData('bookshelf', array_merge($shelfInfo, ['id' => $shelf->id, 'created_by' => $editorId, 'updated_by' => $editorId]));
 
         $shelfPage = $this->get($shelf->getUrl());
         $shelfPage->assertSee($shelfInfo['name']);
diff --git a/tests/Entity/BookTest.php b/tests/Entity/BookTest.php
index 51bf65d10bb..c0d4fbc63e6 100644
--- a/tests/Entity/BookTest.php
+++ b/tests/Entity/BookTest.php
@@ -27,7 +27,7 @@ public function test_create()
 
         $resp = $this->get('/books/my-first-book');
         $resp->assertSee($book->name);
-        $resp->assertSee($book->description);
+        $resp->assertSee($book->descriptionInfo()->getPlain());
     }
 
     public function test_create_uses_different_slugs_when_name_reused()
@@ -154,6 +154,20 @@ public function test_delete()
         $this->assertNotificationContains($redirectReq, 'Book Successfully Deleted');
     }
 
+    public function test_delete_with_shelf_context_returns_to_shelf_view_after_delete()
+    {
+        $shelf = $this->entities->shelfHasBooks();
+        /** @var Book $book */
+        $book = $shelf->books()->first();
+
+        $this->asEditor()->get($shelf->getUrl());
+        $this->get($book->getUrl());
+        $this->get($book->getUrl('/delete'));
+        $resp = $this->delete($book->getUrl());
+
+        $resp->assertRedirect($shelf->getUrl());
+    }
+
     public function test_cancel_on_create_page_leads_back_to_books_listing()
     {
         $resp = $this->asEditor()->get('/create-book');
@@ -238,36 +252,12 @@ public function test_books_view_shows_view_toggle_option()
         $this->assertEquals('list', setting()->getUser($editor, 'books_view_type'));
     }
 
-    public function test_slug_multi_byte_url_safe()
-    {
-        $book = $this->entities->newBook([
-            'name' => 'информация',
-        ]);
-
-        $this->assertEquals('informaciia', $book->slug);
-
-        $book = $this->entities->newBook([
-            'name' => '¿Qué?',
-        ]);
-
-        $this->assertEquals('que', $book->slug);
-    }
-
-    public function test_slug_format()
-    {
-        $book = $this->entities->newBook([
-            'name' => 'PartA / PartB / PartC',
-        ]);
-
-        $this->assertEquals('parta-partb-partc', $book->slug);
-    }
-
     public function test_description_limited_to_specific_html()
     {
         $book = $this->entities->book();
 
-        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" target="_blank" data-a="b">a</a><section>Hello</section></p>';
-        $expected = '<p>Content<a href="#cat" target="_blank">a</a></p>';
+        $input = '<h1>Test</h1><p id="abc" href="beans">Content<a href="#cat" target="_blank" data-a="b">a</a><section>Hello</section><code id="abc">code</code></p>';
+        $expected = '<p>Content<a href="#cat" target="_blank">a</a><code>code</code></p>';
 
         $this->asEditor()->put($book->getUrl(), [
             'name' => $book->name,
@@ -289,107 +279,24 @@ public function test_show_view_displays_description_if_no_description_html_set()
         $resp->assertSee("<p>My great<br>\ndescription<br>\n<br>\nwith newlines</p>", false);
     }
 
-    public function test_show_view_has_copy_button()
+    public function test_description_with_only_br_tags_results_in_empty_p_tag_used_on_show()
     {
+        $descriptions = [
+            '<p><br></p>',
+            '<p><br><br><br><br></p>',
+            '<p><br><br><br></p><h1><br><br><br><br><br></h1>',
+        ];
         $book = $this->entities->book();
-        $resp = $this->asEditor()->get($book->getUrl());
-
-        $this->withHtml($resp)->assertElementContains("a[href=\"{$book->getUrl('/copy')}\"]", 'Copy');
-    }
-
-    public function test_copy_view()
-    {
-        $book = $this->entities->book();
-        $resp = $this->asEditor()->get($book->getUrl('/copy'));
-
-        $resp->assertOk();
-        $resp->assertSee('Copy Book');
-        $this->withHtml($resp)->assertElementExists("input[name=\"name\"][value=\"{$book->name}\"]");
-    }
-
-    public function test_copy()
-    {
-        /** @var Book $book */
-        $book = Book::query()->whereHas('chapters')->whereHas('pages')->first();
-        $resp = $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
+        $this->asEditor();
 
-        /** @var Book $copy */
-        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+        foreach ($descriptions as $descriptionTestCase) {
+            $book->description_html = $descriptionTestCase;
+            $book->save();
 
-        $resp->assertRedirect($copy->getUrl());
-        $this->assertEquals($book->getDirectVisibleChildren()->count(), $copy->getDirectVisibleChildren()->count());
-
-        $this->get($copy->getUrl())->assertSee($book->description_html, false);
-    }
-
-    public function test_copy_does_not_copy_non_visible_content()
-    {
-        /** @var Book $book */
-        $book = Book::query()->whereHas('chapters')->whereHas('pages')->first();
-
-        // Hide child content
-        /** @var BookChild $page */
-        foreach ($book->getDirectVisibleChildren() as $child) {
-            $this->permissions->setEntityPermissions($child, [], []);
+            $resp = $this->get($book->getUrl());
+            $html = $this->withHtml($resp);
+            $descriptionHtml = $html->getInnerHtml('.book-content > div.text-muted:first-child');
+            $this->assertEquals('<p></p>', $descriptionHtml);
         }
-
-        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
-        /** @var Book $copy */
-        $copy = Book::query()->where('name', '=', 'My copy book')->first();
-
-        $this->assertEquals(0, $copy->getDirectVisibleChildren()->count());
-    }
-
-    public function test_copy_does_not_copy_pages_or_chapters_if_user_cant_create()
-    {
-        /** @var Book $book */
-        $book = Book::query()->whereHas('chapters')->whereHas('directPages')->whereHas('chapters')->first();
-        $viewer = $this->users->viewer();
-        $this->permissions->grantUserRolePermissions($viewer, ['book-create-all']);
-
-        $this->actingAs($viewer)->post($book->getUrl('/copy'), ['name' => 'My copy book']);
-        /** @var Book $copy */
-        $copy = Book::query()->where('name', '=', 'My copy book')->first();
-
-        $this->assertEquals(0, $copy->pages()->count());
-        $this->assertEquals(0, $copy->chapters()->count());
-    }
-
-    public function test_copy_clones_cover_image_if_existing()
-    {
-        $book = $this->entities->book();
-        $bookRepo = $this->app->make(BookRepo::class);
-        $coverImageFile = $this->files->uploadedImage('cover.png');
-        $bookRepo->updateCoverImage($book, $coverImageFile);
-
-        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
-        /** @var Book $copy */
-        $copy = Book::query()->where('name', '=', 'My copy book')->first();
-
-        $this->assertNotNull($copy->cover);
-        $this->assertNotEquals($book->cover->id, $copy->cover->id);
-    }
-
-    public function test_copy_adds_book_to_shelves_if_edit_permissions_allows()
-    {
-        /** @var Bookshelf $shelfA */
-        /** @var Bookshelf $shelfB */
-        [$shelfA, $shelfB] = Bookshelf::query()->take(2)->get();
-        $book = $this->entities->book();
-
-        $shelfA->appendBook($book);
-        $shelfB->appendBook($book);
-
-        $viewer = $this->users->viewer();
-        $this->permissions->grantUserRolePermissions($viewer, ['book-update-all', 'book-create-all', 'bookshelf-update-all']);
-        $this->permissions->setEntityPermissions($shelfB);
-
-
-        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
-        /** @var Book $copy */
-        $copy = Book::query()->where('name', '=', 'My copy book')->first();
-
-        $this->assertTrue($copy->shelves()->where('id', '=', $shelfA->id)->exists());
-        $this->assertFalse($copy->shelves()->where('id', '=', $shelfB->id)->exists());
     }
 }
diff --git a/tests/Entity/ChapterTest.php b/tests/Entity/ChapterTest.php
index 1577cee76d8..0c0ec784135 100644
--- a/tests/Entity/ChapterTest.php
+++ b/tests/Entity/ChapterTest.php
@@ -66,90 +66,7 @@ public function test_delete()
         $this->assertNotificationContains($redirectReq, 'Chapter Successfully Deleted');
     }
 
-    public function test_show_view_has_copy_button()
-    {
-        $chapter = $this->entities->chapter();
-
-        $resp = $this->asEditor()->get($chapter->getUrl());
-        $this->withHtml($resp)->assertElementContains("a[href$=\"{$chapter->getUrl('/copy')}\"]", 'Copy');
-    }
-
-    public function test_copy_view()
-    {
-        $chapter = $this->entities->chapter();
-
-        $resp = $this->asEditor()->get($chapter->getUrl('/copy'));
-        $resp->assertOk();
-        $resp->assertSee('Copy Chapter');
-        $this->withHtml($resp)->assertElementExists("input[name=\"name\"][value=\"{$chapter->name}\"]");
-        $this->withHtml($resp)->assertElementExists('input[name="entity_selection"]');
-    }
-
-    public function test_copy()
-    {
-        /** @var Chapter $chapter */
-        $chapter = Chapter::query()->whereHas('pages')->first();
-        /** @var Book $otherBook */
-        $otherBook = Book::query()->where('id', '!=', $chapter->book_id)->first();
-
-        $resp = $this->asEditor()->post($chapter->getUrl('/copy'), [
-            'name'             => 'My copied chapter',
-            'entity_selection' => 'book:' . $otherBook->id,
-        ]);
-
-        /** @var Chapter $newChapter */
-        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
-
-        $resp->assertRedirect($newChapter->getUrl());
-        $this->assertEquals($otherBook->id, $newChapter->book_id);
-        $this->assertEquals($chapter->pages->count(), $newChapter->pages->count());
-    }
-
-    public function test_copy_does_not_copy_non_visible_pages()
-    {
-        $chapter = $this->entities->chapterHasPages();
 
-        // Hide pages to all non-admin roles
-        /** @var Page $page */
-        foreach ($chapter->pages as $page) {
-            $this->permissions->setEntityPermissions($page, [], []);
-        }
-
-        $this->asEditor()->post($chapter->getUrl('/copy'), [
-            'name' => 'My copied chapter',
-        ]);
-
-        /** @var Chapter $newChapter */
-        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
-        $this->assertEquals(0, $newChapter->pages()->count());
-    }
-
-    public function test_copy_does_not_copy_pages_if_user_cant_page_create()
-    {
-        $chapter = $this->entities->chapterHasPages();
-        $viewer = $this->users->viewer();
-        $this->permissions->grantUserRolePermissions($viewer, ['chapter-create-all']);
-
-        // Lacking permission results in no copied pages
-        $this->actingAs($viewer)->post($chapter->getUrl('/copy'), [
-            'name' => 'My copied chapter',
-        ]);
-
-        /** @var Chapter $newChapter */
-        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
-        $this->assertEquals(0, $newChapter->pages()->count());
-
-        $this->permissions->grantUserRolePermissions($viewer, ['page-create-all']);
-
-        // Having permission rules in copied pages
-        $this->actingAs($viewer)->post($chapter->getUrl('/copy'), [
-            'name' => 'My copied again chapter',
-        ]);
-
-        /** @var Chapter $newChapter2 */
-        $newChapter2 = Chapter::query()->where('name', '=', 'My copied again chapter')->first();
-        $this->assertEquals($chapter->pages()->count(), $newChapter2->pages()->count());
-    }
 
     public function test_sort_book_action_visible_if_permissions_allow()
     {
diff --git a/tests/Entity/ConvertTest.php b/tests/Entity/ConvertTest.php
index d9b1ee466cf..e3ba78dfead 100644
--- a/tests/Entity/ConvertTest.php
+++ b/tests/Entity/ConvertTest.php
@@ -35,8 +35,8 @@ public function test_convert_chapter_to_book()
         /** @var Book $newBook */
         $newBook = Book::query()->orderBy('id', 'desc')->first();
 
-        $this->assertDatabaseMissing('chapters', ['id' => $chapter->id]);
-        $this->assertDatabaseHas('pages', ['id' => $childPage->id, 'book_id' => $newBook->id, 'chapter_id' => 0]);
+        $this->assertDatabaseMissing('entities', ['id' => $chapter->id, 'type' => 'chapter']);
+        $this->assertDatabaseHasEntityData('page', ['id' => $childPage->id, 'book_id' => $newBook->id, 'chapter_id' => 0]);
         $this->assertCount(1, $newBook->tags);
         $this->assertEquals('Category', $newBook->tags->first()->name);
         $this->assertEquals('Penguins', $newBook->tags->first()->value);
@@ -67,6 +67,32 @@ public function test_convert_chapter_to_book_requires_permissions()
         $resp->assertRedirect();
     }
 
+    public function test_convert_chapter_to_book_rebuilds_page_permissions()
+    {
+        $editor = $this->users->editor();
+        $chapter = $this->entities->chapterHasPages();
+        /** @var Page $childPage */
+        $childPage = $chapter->pages()->first();
+        $oldBookId = $childPage->book_id;
+
+        // Make chapter non-accessible via parent book, so the permissions should not
+        // be restricting the child page after conversion
+        $this->permissions->disableEntityInheritedPermissions($chapter->book);
+        $this->actingAs($editor)->get($childPage->getUrl())->assertNotFound();
+
+        $resp = $this->asAdmin()->post($chapter->getUrl('/convert-to-book'));
+        $resp->assertRedirectContains('/books/');
+
+        /** @var Book $newBook */
+        $newBook = Book::query()->orderBy('id', 'desc')->first();
+        $childPage->refresh();
+        $this->assertNotEquals($oldBookId, $childPage->book_id);
+        $this->assertEquals($newBook->id, $childPage->book_id);
+
+        $resp = $this->actingAs($editor)->get($childPage->getUrl());
+        $resp->assertOk();
+    }
+
     public function test_book_edit_view_shows_convert_option()
     {
         $book = $this->entities->book();
@@ -100,7 +126,7 @@ public function test_book_convert_to_shelf()
 
         // Checks for new shelf
         $resp->assertRedirectContains('/shelves/');
-        $this->assertDatabaseMissing('chapters', ['id' => $childChapter->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $childChapter->id, 'type' => 'chapter']);
         $this->assertCount(1, $newShelf->tags);
         $this->assertEquals('Category', $newShelf->tags->first()->name);
         $this->assertEquals('Ducks', $newShelf->tags->first()->value);
@@ -112,8 +138,8 @@ public function test_book_convert_to_shelf()
         $this->assertActivityExists(ActivityType::BOOKSHELF_CREATE_FROM_BOOK, $newShelf);
 
         // Checks for old book to contain child pages
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'name' => $book->name . ' Pages']);
-        $this->assertDatabaseHas('pages', ['id' => $childPage->id, 'book_id' => $book->id, 'chapter_id' => 0]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'name' => $book->name . ' Pages']);
+        $this->assertDatabaseHasEntityData('page', ['id' => $childPage->id, 'book_id' => $book->id, 'chapter_id' => null]);
 
         // Checks for nested page
         $chapterChildPage->refresh();
diff --git a/tests/Entity/CopyTest.php b/tests/Entity/CopyTest.php
new file mode 100644
index 00000000000..d4b6d54cf88
--- /dev/null
+++ b/tests/Entity/CopyTest.php
@@ -0,0 +1,399 @@
+<?php
+
+namespace Tests\Entity;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\BookChild;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Repos\BookRepo;
+use Tests\TestCase;
+
+class CopyTest extends TestCase
+{
+    public function test_book_show_view_has_copy_button()
+    {
+        $book = $this->entities->book();
+        $resp = $this->asEditor()->get($book->getUrl());
+
+        $this->withHtml($resp)->assertElementContains("a[href=\"{$book->getUrl('/copy')}\"]", 'Copy');
+    }
+
+    public function test_book_copy_view()
+    {
+        $book = $this->entities->book();
+        $resp = $this->asEditor()->get($book->getUrl('/copy'));
+
+        $resp->assertOk();
+        $resp->assertSee('Copy Book');
+        $this->withHtml($resp)->assertElementExists("input[name=\"name\"][value=\"{$book->name}\"]");
+    }
+
+    public function test_book_copy()
+    {
+        /** @var Book $book */
+        $book = Book::query()->whereHas('chapters')->whereHas('pages')->first();
+        $resp = $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
+
+        /** @var Book $copy */
+        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+
+        $resp->assertRedirect($copy->getUrl());
+        $this->assertEquals($book->getDirectVisibleChildren()->count(), $copy->getDirectVisibleChildren()->count());
+
+        $this->get($copy->getUrl())->assertSee($book->description_html, false);
+    }
+
+    public function test_book_copy_does_not_copy_non_visible_content()
+    {
+        /** @var Book $book */
+        $book = Book::query()->whereHas('chapters')->whereHas('pages')->first();
+
+        // Hide child content
+        /** @var BookChild $page */
+        foreach ($book->getDirectVisibleChildren() as $child) {
+            $this->permissions->setEntityPermissions($child, [], []);
+        }
+
+        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
+        /** @var Book $copy */
+        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+
+        $this->assertEquals(0, $copy->getDirectVisibleChildren()->count());
+    }
+
+    public function test_book_copy_does_not_copy_pages_or_chapters_if_user_cant_create()
+    {
+        /** @var Book $book */
+        $book = Book::query()->whereHas('chapters')->whereHas('directPages')->whereHas('chapters')->first();
+        $viewer = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($viewer, ['book-create-all']);
+
+        $this->actingAs($viewer)->post($book->getUrl('/copy'), ['name' => 'My copy book']);
+        /** @var Book $copy */
+        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+
+        $this->assertEquals(0, $copy->pages()->count());
+        $this->assertEquals(0, $copy->chapters()->count());
+    }
+
+    public function test_book_copy_clones_cover_image_if_existing()
+    {
+        $book = $this->entities->book();
+        $bookRepo = $this->app->make(BookRepo::class);
+        $coverImageFile = $this->files->uploadedImage('cover.png');
+        $bookRepo->updateCoverImage($book, $coverImageFile);
+
+        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book'])->assertRedirect();
+        /** @var Book $copy */
+        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+
+        $this->assertNotNull($copy->coverInfo()->getImage());
+        $this->assertNotEquals($book->coverInfo()->getImage()->id, $copy->coverInfo()->getImage()->id);
+    }
+
+    public function test_book_copy_adds_book_to_shelves_if_edit_permissions_allows()
+    {
+        /** @var Bookshelf $shelfA */
+        /** @var Bookshelf $shelfB */
+        [$shelfA, $shelfB] = Bookshelf::query()->take(2)->get();
+        $book = $this->entities->book();
+
+        $shelfA->appendBook($book);
+        $shelfB->appendBook($book);
+
+        $viewer = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($viewer, ['book-update-all', 'book-create-all', 'bookshelf-update-all']);
+        $this->permissions->setEntityPermissions($shelfB);
+
+
+        $this->asEditor()->post($book->getUrl('/copy'), ['name' => 'My copy book']);
+        /** @var Book $copy */
+        $copy = Book::query()->where('name', '=', 'My copy book')->first();
+
+        $this->assertTrue($copy->shelves()->where('id', '=', $shelfA->id)->exists());
+        $this->assertFalse($copy->shelves()->where('id', '=', $shelfB->id)->exists());
+    }
+
+    public function test_chapter_show_view_has_copy_button()
+    {
+        $chapter = $this->entities->chapter();
+
+        $resp = $this->asEditor()->get($chapter->getUrl());
+        $this->withHtml($resp)->assertElementContains("a[href$=\"{$chapter->getUrl('/copy')}\"]", 'Copy');
+    }
+
+    public function test_chapter_copy_view()
+    {
+        $chapter = $this->entities->chapter();
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/copy'));
+        $resp->assertOk();
+        $resp->assertSee('Copy Chapter');
+        $this->withHtml($resp)->assertElementExists("input[name=\"name\"][value=\"{$chapter->name}\"]");
+        $this->withHtml($resp)->assertElementExists('input[name="entity_selection"]');
+    }
+
+    public function test_chapter_copy()
+    {
+        /** @var Chapter $chapter */
+        $chapter = Chapter::query()->whereHas('pages')->first();
+        /** @var Book $otherBook */
+        $otherBook = Book::query()->where('id', '!=', $chapter->book_id)->first();
+
+        $resp = $this->asEditor()->post($chapter->getUrl('/copy'), [
+            'name'             => 'My copied chapter',
+            'entity_selection' => 'book:' . $otherBook->id,
+        ]);
+
+        /** @var Chapter $newChapter */
+        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
+
+        $resp->assertRedirect($newChapter->getUrl());
+        $this->assertEquals($otherBook->id, $newChapter->book_id);
+        $this->assertEquals($chapter->pages->count(), $newChapter->pages->count());
+    }
+
+    public function test_chapter_copy_does_not_copy_non_visible_pages()
+    {
+        $chapter = $this->entities->chapterHasPages();
+
+        // Hide pages to all non-admin roles
+        /** @var Page $page */
+        foreach ($chapter->pages as $page) {
+            $this->permissions->setEntityPermissions($page, [], []);
+        }
+
+        $this->asEditor()->post($chapter->getUrl('/copy'), [
+            'name' => 'My copied chapter',
+        ]);
+
+        /** @var Chapter $newChapter */
+        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
+        $this->assertEquals(0, $newChapter->pages()->count());
+    }
+
+    public function test_chapter_copy_does_not_copy_pages_if_user_cant_page_create()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        $viewer = $this->users->viewer();
+        $this->permissions->grantUserRolePermissions($viewer, ['chapter-create-all']);
+
+        // Lacking permission results in no copied pages
+        $this->actingAs($viewer)->post($chapter->getUrl('/copy'), [
+            'name' => 'My copied chapter',
+        ]);
+
+        /** @var Chapter $newChapter */
+        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
+        $this->assertEquals(0, $newChapter->pages()->count());
+
+        $this->permissions->grantUserRolePermissions($viewer, ['page-create-all']);
+
+        // Having permission rules in copied pages
+        $this->actingAs($viewer)->post($chapter->getUrl('/copy'), [
+            'name' => 'My copied again chapter',
+        ]);
+
+        /** @var Chapter $newChapter2 */
+        $newChapter2 = Chapter::query()->where('name', '=', 'My copied again chapter')->first();
+        $this->assertEquals($chapter->pages()->count(), $newChapter2->pages()->count());
+    }
+
+    public function test_book_copy_updates_internal_references()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        /** @var Chapter $chapter */
+        $chapter = $book->chapters()->first();
+        /** @var Page $page */
+        $page = $chapter->pages()->first();
+        $this->asEditor();
+        $this->entities->updatePage($page, [
+            'name' => 'reference test page',
+            'html' => '<p>This is a test <a href="' . $book->getUrl() . '">book link</a></p>',
+        ]);
+
+        // Quick pre-update to get stable slug
+        $this->put($book->getUrl(), ['name' => 'Internal ref test']);
+        $book->refresh();
+        $page->refresh();
+
+        $html = '<p>This is a test <a href="' . $page->getUrl() . '">page link</a></p>';
+        $this->put($book->getUrl(), ['name' => 'Internal ref test', 'description_html' => $html]);
+
+        $this->post($book->getUrl('/copy'), ['name' => 'My copied book']);
+
+        $newBook = Book::query()->where('name', '=', 'My copied book')->first();
+        $newPage = $newBook->pages()->where('name', '=', 'reference test page')->first();
+
+        $this->assertStringContainsString($newBook->getUrl(), $newPage->html);
+        $this->assertStringContainsString($newPage->getUrl(), $newBook->description_html);
+
+        $this->assertStringNotContainsString($book->getUrl(), $newPage->html);
+        $this->assertStringNotContainsString($page->getUrl(), $newBook->description_html);
+    }
+
+    public function test_chapter_copy_updates_internal_references()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        /** @var Page $page */
+        $page = $chapter->pages()->first();
+        $this->asEditor();
+        $this->entities->updatePage($page, [
+            'name' => 'reference test page',
+            'html' => '<p>This is a test <a href="' . $chapter->getUrl() . '">chapter link</a></p>',
+        ]);
+
+        // Quick pre-update to get stable slug
+        $this->put($chapter->getUrl(), ['name' => 'Internal ref test']);
+        $chapter->refresh();
+        $page->refresh();
+
+        $html = '<p>This is a test <a href="' . $page->getUrl() . '">page link</a></p>';
+        $this->put($chapter->getUrl(), ['name' => 'Internal ref test', 'description_html' => $html]);
+
+        $this->post($chapter->getUrl('/copy'), ['name' => 'My copied chapter']);
+
+        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
+        $newPage = $newChapter->pages()->where('name', '=', 'reference test page')->first();
+
+        $this->assertStringContainsString($newChapter->getUrl() . '"', $newPage->html);
+        $this->assertStringContainsString($newPage->getUrl() . '"', $newChapter->description_html);
+
+        $this->assertStringNotContainsString($chapter->getUrl() . '"', $newPage->html);
+        $this->assertStringNotContainsString($page->getUrl() . '"', $newChapter->description_html);
+    }
+
+    public function test_chapter_copy_updates_internal_permalink_references_in_its_description()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        /** @var Page $page */
+        $page = $chapter->pages()->first();
+
+        $this->asEditor()->put($chapter->getUrl(), [
+            'name' => 'Internal ref test',
+            'description_html' => '<p>This is a test <a href="' . $page->getPermalink() . '">page link</a></p>',
+        ]);
+        $chapter->refresh();
+
+        $this->post($chapter->getUrl('/copy'), ['name' => 'My copied chapter']);
+        $newChapter = Chapter::query()->where('name', '=', 'My copied chapter')->first();
+
+        $this->assertStringContainsString('/link/', $newChapter->description_html);
+        $this->assertStringNotContainsString($page->getPermalink() . '"', $newChapter->description_html);
+    }
+
+    public function test_page_copy_updates_internal_self_references()
+    {
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        // Initial update to get stable slug
+        $this->entities->updatePage($page, ['name' => 'reference test page']);
+
+        $page->refresh();
+        $this->entities->updatePage($page, [
+            'name' => 'reference test page',
+            'html' => '<p>This is a test <a href="' . $page->getUrl() . '">page link</a></p>',
+        ]);
+
+        $this->post($page->getUrl('/copy'), ['name' => 'My copied page']);
+        $newPage = Page::query()->where('name', '=', 'My copied page')->first();
+        $this->assertNotNull($newPage);
+
+        $this->assertStringContainsString($newPage->getUrl(), $newPage->html);
+        $this->assertStringNotContainsString($page->getUrl(), $newPage->html);
+    }
+
+    public function test_page_copy()
+    {
+        $page = $this->entities->page();
+        $page->html = '<p>This is some test content</p>';
+        $page->save();
+
+        $currentBook = $page->book;
+        $newBook = Book::where('id', '!=', $currentBook->id)->first();
+
+        $resp = $this->asEditor()->get($page->getUrl('/copy'));
+        $resp->assertSee('Copy Page');
+
+        $movePageResp = $this->post($page->getUrl('/copy'), [
+            'entity_selection' => 'book:' . $newBook->id,
+            'name'             => 'My copied test page',
+        ]);
+        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
+
+        $movePageResp->assertRedirect($pageCopy->getUrl());
+        $this->assertTrue($pageCopy->book->id == $newBook->id, 'Page was copied to correct book');
+        $this->assertStringContainsString('This is some test content', $pageCopy->html);
+    }
+
+    public function test_page_copy_with_markdown_has_both_html_and_markdown()
+    {
+        $page = $this->entities->page();
+        $page->html = '<h1>This is some test content</h1>';
+        $page->markdown = '# This is some test content';
+        $page->save();
+        $newBook = Book::where('id', '!=', $page->book->id)->first();
+
+        $this->asEditor()->post($page->getUrl('/copy'), [
+            'entity_selection' => 'book:' . $newBook->id,
+            'name'             => 'My copied test page',
+        ]);
+        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
+
+        $this->assertStringContainsString('This is some test content', $pageCopy->html);
+        $this->assertEquals('# This is some test content', $pageCopy->markdown);
+    }
+
+    public function test_page_copy_with_no_destination()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+
+        $resp = $this->asEditor()->get($page->getUrl('/copy'));
+        $resp->assertSee('Copy Page');
+
+        $movePageResp = $this->post($page->getUrl('/copy'), [
+            'name' => 'My copied test page',
+        ]);
+
+        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
+
+        $movePageResp->assertRedirect($pageCopy->getUrl());
+        $this->assertTrue($pageCopy->book->id == $currentBook->id, 'Page was copied to correct book');
+        $this->assertTrue($pageCopy->id !== $page->id, 'Page copy is not the same instance');
+    }
+
+    public function test_page_can_be_copied_without_edit_permission()
+    {
+        $page = $this->entities->page();
+        $currentBook = $page->book;
+        $newBook = Book::where('id', '!=', $currentBook->id)->first();
+        $viewer = $this->users->viewer();
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl());
+        $resp->assertDontSee($page->getUrl('/copy'));
+
+        $newBook->owned_by = $viewer->id;
+        $newBook->save();
+        $this->permissions->grantUserRolePermissions($viewer, ['page-create-own']);
+        $this->permissions->regenerateForEntity($newBook);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl());
+        $resp->assertSee($page->getUrl('/copy'));
+
+        $movePageResp = $this->post($page->getUrl('/copy'), [
+            'entity_selection' => 'book:' . $newBook->id,
+            'name'             => 'My copied test page',
+        ]);
+        $movePageResp->assertRedirect();
+
+        $this->assertDatabaseHasEntityData('page', [
+            'name'       => 'My copied test page',
+            'created_by' => $viewer->id,
+            'book_id'    => $newBook->id,
+        ]);
+    }
+}
diff --git a/tests/Entity/DefaultTemplateTest.php b/tests/Entity/DefaultTemplateTest.php
index 5369a5430bc..d3109c8a2fe 100644
--- a/tests/Entity/DefaultTemplateTest.php
+++ b/tests/Entity/DefaultTemplateTest.php
@@ -18,7 +18,7 @@ public function test_creating_book_with_default_template()
         ];
 
         $this->asEditor()->post('/books', $details);
-        $this->assertDatabaseHas('books', $details);
+        $this->assertDatabaseHasEntityData('book', $details);
     }
 
     public function test_creating_chapter_with_default_template()
@@ -31,7 +31,7 @@ public function test_creating_chapter_with_default_template()
         ];
 
         $this->asEditor()->post($book->getUrl('/create-chapter'), $details);
-        $this->assertDatabaseHas('chapters', $details);
+        $this->assertDatabaseHasEntityData('chapter', $details);
     }
 
     public function test_updating_book_with_default_template()
@@ -40,10 +40,10 @@ public function test_updating_book_with_default_template()
         $templatePage = $this->entities->templatePage();
 
         $this->asEditor()->put($book->getUrl(), ['name' => $book->name, 'default_template_id' => strval($templatePage->id)]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
 
         $this->asEditor()->put($book->getUrl(), ['name' => $book->name, 'default_template_id' => '']);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'default_template_id' => null]);
     }
 
     public function test_updating_chapter_with_default_template()
@@ -52,10 +52,10 @@ public function test_updating_chapter_with_default_template()
         $templatePage = $this->entities->templatePage();
 
         $this->asEditor()->put($chapter->getUrl(), ['name' => $chapter->name, 'default_template_id' => strval($templatePage->id)]);
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
 
         $this->asEditor()->put($chapter->getUrl(), ['name' => $chapter->name, 'default_template_id' => '']);
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'default_template_id' => null]);
     }
 
     public function test_default_book_template_cannot_be_set_if_not_a_template()
@@ -65,7 +65,7 @@ public function test_default_book_template_cannot_be_set_if_not_a_template()
         $this->assertFalse($page->template);
 
         $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $page->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'default_template_id' => null]);
     }
 
     public function test_default_chapter_template_cannot_be_set_if_not_a_template()
@@ -75,7 +75,7 @@ public function test_default_chapter_template_cannot_be_set_if_not_a_template()
         $this->assertFalse($page->template);
 
         $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $page->id]);
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'default_template_id' => null]);
     }
 
 
@@ -86,7 +86,7 @@ public function test_default_book_template_cannot_be_set_if_not_have_access()
         $this->permissions->disableEntityInheritedPermissions($templatePage);
 
         $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'default_template_id' => null]);
     }
 
     public function test_default_chapter_template_cannot_be_set_if_not_have_access()
@@ -96,7 +96,7 @@ public function test_default_chapter_template_cannot_be_set_if_not_have_access()
         $this->permissions->disableEntityInheritedPermissions($templatePage);
 
         $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => null]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'default_template_id' => null]);
     }
 
     public function test_inaccessible_book_default_template_can_be_set_if_unchanged()
@@ -106,7 +106,7 @@ public function test_inaccessible_book_default_template_can_be_set_if_unchanged(
         $this->permissions->disableEntityInheritedPermissions($templatePage);
 
         $this->asEditor()->put("/books/{$book->slug}", ['name' => $book->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('books', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHasEntityData('book', ['id' => $book->id, 'default_template_id' => $templatePage->id]);
     }
 
     public function test_inaccessible_chapter_default_template_can_be_set_if_unchanged()
@@ -116,7 +116,7 @@ public function test_inaccessible_chapter_default_template_can_be_set_if_unchang
         $this->permissions->disableEntityInheritedPermissions($templatePage);
 
         $this->asEditor()->put("/chapters/{$chapter->slug}", ['name' => $chapter->name, 'default_template_id' => $templatePage->id]);
-        $this->assertDatabaseHas('chapters', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
+        $this->assertDatabaseHasEntityData('chapter', ['id' => $chapter->id, 'default_template_id' => $templatePage->id]);
     }
 
     public function test_default_page_template_option_shows_on_book_form()
@@ -173,7 +173,7 @@ public function test_creating_book_page_uses_book_default_template()
         $templatePage->forceFill(['html' => '<p>My template page</p>', 'markdown' => '# My template page'])->save();
         $book = $this->bookUsingDefaultTemplate($templatePage);
 
-        $this->asEditor()->get($book->getUrl('/create-page'));
+        $this->asEditor()->get($book->getUrl('/create-page'))->assertRedirect();
         $latestPage = $book->pages()
             ->where('draft', '=', true)
             ->where('template', '=', false)
@@ -251,7 +251,7 @@ public function test_creating_page_as_guest_uses_default_template()
 
         $this->post($book->getUrl('/create-guest-page'), [
             'name' => 'My guest page with template'
-        ]);
+        ])->assertRedirect();
         $latestBookPage = $book->pages()
             ->where('draft', '=', false)
             ->where('template', '=', false)
diff --git a/tests/Entity/EntityQueryTest.php b/tests/Entity/EntityQueryTest.php
new file mode 100644
index 00000000000..180cb3076c6
--- /dev/null
+++ b/tests/Entity/EntityQueryTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Entity;
+
+use BookStack\Entities\Models\Book;
+use Illuminate\Database\Eloquent\Builder;
+use Tests\TestCase;
+
+class EntityQueryTest extends TestCase
+{
+    public function test_basic_entity_query_has_join_and_type_applied()
+    {
+        $query = Book::query();
+        $expected = 'select * from `entities` left join `entity_container_data` on `entity_container_data`.`entity_id` = `entities`.`id` and `entity_container_data`.`entity_type` = ? where `type` = ? and `entities`.`deleted_at` is null';
+        $this->assertEquals($expected, $query->toSql());
+        $this->assertEquals(['book', 'book'], $query->getBindings());
+    }
+
+    public function test_joins_in_sub_queries_use_alias_names()
+    {
+        $query = Book::query()->whereHas('chapters', function (Builder $query) {
+            $query->where('name', '=', 'a');
+        });
+
+        // Probably from type limits on relation where not needed?
+        $expected = 'select * from `entities` left join `entity_container_data` on `entity_container_data`.`entity_id` = `entities`.`id` and `entity_container_data`.`entity_type` = ? where exists (select * from `entities` as `laravel_reserved_%d` left join `entity_container_data` on `entity_container_data`.`entity_id` = `laravel_reserved_%d`.`id` and `entity_container_data`.`entity_type` = ? where `entities`.`id` = `laravel_reserved_%d`.`book_id` and `name` = ? and `type` = ? and `laravel_reserved_%d`.`deleted_at` is null) and `type` = ? and `entities`.`deleted_at` is null';
+        $this->assertStringMatchesFormat($expected, $query->toSql());
+        $this->assertEquals(['book', 'chapter', 'a', 'chapter', 'book'], $query->getBindings());
+    }
+
+    public function test_book_chapter_relation_applies_type_condition()
+    {
+        $book = $this->entities->book();
+        $query = $book->chapters();
+        $expected = 'select * from `entities` left join `entity_container_data` on `entity_container_data`.`entity_id` = `entities`.`id` and `entity_container_data`.`entity_type` = ? where `entities`.`book_id` = ? and `entities`.`book_id` is not null and `type` = ? and `entities`.`deleted_at` is null';
+        $this->assertEquals($expected, $query->toSql());
+        $this->assertEquals(['chapter', $book->id, 'chapter'], $query->getBindings());
+
+        $query = Book::query()->whereHas('chapters');
+        $expected = 'select * from `entities` left join `entity_container_data` on `entity_container_data`.`entity_id` = `entities`.`id` and `entity_container_data`.`entity_type` = ? where exists (select * from `entities` as `laravel_reserved_%d` left join `entity_container_data` on `entity_container_data`.`entity_id` = `laravel_reserved_%d`.`id` and `entity_container_data`.`entity_type` = ? where `entities`.`id` = `laravel_reserved_%d`.`book_id` and `type` = ? and `laravel_reserved_%d`.`deleted_at` is null) and `type` = ? and `entities`.`deleted_at` is null';
+        $this->assertStringMatchesFormat($expected, $query->toSql());
+        $this->assertEquals(['book', 'chapter', 'chapter', 'book'], $query->getBindings());
+    }
+}
diff --git a/tests/Entity/PageContentFilteringTest.php b/tests/Entity/PageContentFilteringTest.php
new file mode 100644
index 00000000000..f6bfa76cef6
--- /dev/null
+++ b/tests/Entity/PageContentFilteringTest.php
@@ -0,0 +1,544 @@
+<?php
+
+namespace Tests\Entity;
+
+use Tests\TestCase;
+
+class PageContentFilteringTest extends TestCase
+{
+    public function test_page_content_scripts_removed_by_default()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $script = 'abc123<script>console.log("hello-test")</script>abc123';
+        $page->html = "escape {$script}";
+        $page->save();
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertStatus(200);
+        $pageView->assertDontSee($script, false);
+        $pageView->assertSee('abc123abc123');
+    }
+
+    public function test_more_complex_content_script_escaping_scenarios()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            "<p>Some script</p><script>alert('cat')</script>",
+            "<div><div><div><div><p>Some script</p><script>alert('cat')</script></div></div></div></div>",
+            "<p>Some script<script>alert('cat')</script></p>",
+            "<p>Some script <div><script>alert('cat')</script></div></p>",
+            "<p>Some script <script><div>alert('cat')</script></div></p>",
+            "<p>Some script <script><div>alert('cat')</script><script><div>alert('cat')</script></p><script><div>alert('cat')</script>",
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<script>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</script>');
+        }
+    }
+
+    public function test_js_and_base64_src_urls_are_removed()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            '<iframe src="javascript:alert(document.cookie)"></iframe>',
+            '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
+            '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
+            '<iframe SRC=" javascript: alert(document.cookie)"></iframe>',
+            '<iframe src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
+            '<iframe src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
+            '<iframe src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
+            '<img src="javascript:alert(document.cookie)"/>',
+            '<img src="JavAScRipT:alert(document.cookie)"/>',
+            '<img src="JavAScRipT:alert(document.cookie)"/>',
+            '<img SRC=" javascript: alert(document.cookie)"/>',
+            '<img src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+            '<img src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+            '<img src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+            '<iframe srcdoc="<script>window.alert(document.cookie)</script>"></iframe>',
+            '<iframe SRCdoc="<script>window.alert(document.cookie)</script>"></iframe>',
+            '<IMG SRC=`javascript:alert("RSnake says, \'XSS\'")`>',
+            '<object data="javascript:alert(document.cookie)"></object>',
+            '<object data="JavAScRipT:alert(document.cookie)"></object>',
+            '<object data="JavAScRipT:alert(document.cookie)"></object>',
+            '<object SRC=" javascript: alert(document.cookie)"></object>',
+            '<object data="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></object>',
+            '<object data="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></object>',
+            '<object data=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></object>',
+            '<embed src="javascript:alert(document.cookie)"/>',
+            '<embed src="JavAScRipT:alert(document.cookie)"/>',
+            '<embed src="JavAScRipT:alert(document.cookie)"/>',
+            '<embed SRC=" javascript: alert(document.cookie)"/>',
+            '<embed src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+            '<embed src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+            '<embed src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $html = $this->withHtml($pageView);
+            $html->assertElementNotContains('.page-content', '<object');
+            $html->assertElementNotContains('.page-content', 'data=');
+            $html->assertElementNotContains('.page-content', '<iframe>');
+            $html->assertElementNotContains('.page-content', '<img');
+            $html->assertElementNotContains('.page-content', '</iframe>');
+            $html->assertElementNotContains('.page-content', 'src=');
+            $html->assertElementNotContains('.page-content', 'javascript:');
+            $html->assertElementNotContains('.page-content', 'data:');
+            $html->assertElementNotContains('.page-content', 'base64');
+        }
+    }
+
+    public function test_javascript_uri_links_are_removed()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            '<a id="xss" href="javascript:alert(document.cookie)>Click me</a>',
+            '<a id="xss" href="javascript: alert(document.cookie)>Click me</a>',
+            '<a id="xss" href="JaVaScRiPt: alert(document.cookie)>Click me</a>',
+            '<a id="xss" href=" JaVaScRiPt: alert(document.cookie)>Click me</a>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<a id="xss"');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'href=javascript:');
+        }
+    }
+
+    public function test_form_filtering_is_controlled_by_config()
+    {
+        config()->set('app.content_filtering', '');
+        $page = $this->entities->page();
+        $page->html = '<form><input type="text" id="dont-see-this" value="test"></form>';
+        $page->save();
+
+        $this->asEditor()->get($page->getUrl())->assertSee('dont-see-this', false);
+
+        config()->set('app.content_filtering', 'f');
+        $this->get($page->getUrl())->assertDontSee('dont-see-this', false);
+    }
+
+    public function test_form_actions_with_javascript_are_removed()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            '<customform><custominput id="xss" type=submit formaction=javascript:alert(document.domain) value=Submit><custominput></customform>',
+            '<customform ><custombutton id="xss" formaction="JaVaScRiPt:alert(document.domain)">Click me</custombutton></customform>',
+            '<customform ><custombutton id="xss" formaction=javascript:alert(document.domain)>Click me</custombutton></customform>',
+            '<customform id="xss" action=javascript:alert(document.domain)><input type=submit value=Submit></customform>',
+            '<customform id="xss" action="JaVaScRiPt:alert(document.domain)"><input type=submit value=Submit></customform>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $pageView->assertDontSee('id="xss"', false);
+            $pageView->assertDontSee('action=javascript:', false);
+            $pageView->assertDontSee('action=JaVaScRiPt:', false);
+            $pageView->assertDontSee('formaction=javascript:', false);
+            $pageView->assertDontSee('formaction=JaVaScRiPt:', false);
+        }
+    }
+
+    public function test_form_elements_are_removed()
+    {
+        config()->set('app.content_filtering', 'f');
+
+        $checks = [
+            '<p>thisisacattofind</p><form>thisdogshouldnotbefound</form>',
+            '<p>thisisacattofind</p><input type="text" value="thisdogshouldnotbefound">',
+            '<p>thisisacattofind</p><select><option>thisdogshouldnotbefound</option></select>',
+            '<p>thisisacattofind</p><textarea>thisdogshouldnotbefound</textarea>',
+            '<p>thisisacattofind</p><fieldset>thisdogshouldnotbefound</fieldset>',
+            '<p>thisisacattofind</p><button>thisdogshouldnotbefound</button>',
+            '<p>thisisacattofind</p><BUTTON>thisdogshouldnotbefound</BUTTON>',
+            <<<'TESTCASE'
+<svg width="200" height="100" xmlns="http://www.w3.org/2000/svg">
+  <foreignObject width="100%" height="100%">
+    
+    <body xmlns="http://www.w3.org/1999/xhtml">
+    <p>thisisacattofind</p>
+      <form>
+        <p>thisdogshouldnotbefound</p>
+      </form>
+      <input type="text" placeholder="thisdogshouldnotbefound" />
+      <button type="submit">thisdogshouldnotbefound</button>
+    </body>
+
+  </foreignObject>
+</svg>
+TESTCASE
+
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $pageView->assertSee('thisisacattofind');
+            $pageView->assertDontSee('thisdogshouldnotbefound');
+        }
+    }
+
+    public function test_form_attributes_are_removed()
+    {
+        config()->set('app.content_filtering', 'f');
+
+        $withinSvgSample = <<<'TESTCASE'
+<svg width="200" height="100" xmlns="http://www.w3.org/2000/svg">
+  <foreignObject width="100%" height="100%">
+    
+    <body xmlns="http://www.w3.org/1999/xhtml">
+    <p formaction="a">thisisacattofind</p>
+    <p formaction="a">thisisacattofind</p>
+    </body>
+
+  </foreignObject>
+</svg>
+TESTCASE;
+
+        $checks = [
+            'formaction' => '<p formaction="a">thisisacattofind</p>',
+            'form' => '<p form="a">thisisacattofind</p>',
+            'formmethod' => '<p formmethod="a">thisisacattofind</p>',
+            'formtarget' => '<p formtarget="a">thisisacattofind</p>',
+            'FORMTARGET' => '<p FORMTARGET="a">thisisacattofind</p>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $attribute => $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $pageView->assertSee('thisisacattofind');
+            $this->withHtml($pageView)->assertElementNotExists(".page-content [{$attribute}]");
+        }
+
+        $page->html = $withinSvgSample;
+        $page->save();
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertStatus(200);
+        $html = $this->withHtml($pageView);
+        foreach ($checks as $attribute => $check) {
+            $pageView->assertSee('thisisacattofind');
+            $html->assertElementNotExists(".page-content [{$attribute}]");
+        }
+    }
+
+    public function test_metadata_redirects_are_removed()
+    {
+        config()->set('app.content_filtering', 'h');
+
+        $checks = [
+            '<meta http-equiv="refresh" content="0; url=//external_url">',
+            '<meta http-equiv="refresh" ConTeNt="0; url=//external_url">',
+            '<meta http-equiv="refresh" content="0; UrL=//external_url">',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<meta>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</meta>');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'content=');
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'external_url');
+        }
+    }
+
+    public function test_page_inline_on_attributes_removed_by_default()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $this->asEditor();
+        $page = $this->entities->page();
+        $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
+        $page->html = "escape {$script}";
+        $page->save();
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertStatus(200);
+        $pageView->assertDontSee($script, false);
+        $pageView->assertSee('<p>Hello</p>', false);
+    }
+
+    public function test_more_complex_inline_on_attributes_escaping_scenarios()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            '<p onclick="console.log(\'test\')">Hello</p>',
+            '<p OnCliCk="console.log(\'test\')">Hello</p>',
+            '<div>Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p>',
+            '<div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div>',
+            '<div><div><div><div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div></div></div></div>',
+            '<div onclick="console.log(\'test\')">Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p><div></div>',
+            '<a a="<img src=1 onerror=\'alert(1)\'> ',
+            '\<a onclick="alert(document.cookie)"\>xss link\</a\>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'onclick');
+        }
+    }
+
+    public function test_page_content_scripts_show_with_filters_disabled()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        config()->set('app.content_filtering', '');
+
+        $script = 'abc123<script>console.log("hello-test")</script>abc123';
+        $page->html = "no escape {$script}";
+        $page->save();
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertSee($script, false);
+        $pageView->assertDontSee('abc123abc123');
+    }
+
+    public function test_svg_script_usage_is_removed()
+    {
+        config()->set('app.content_filtering', 'j');
+
+        $checks = [
+            '<svg id="test" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><a xlink:href="javascript:alert(document.domain)"><rect x="0" y="0" width="100" height="100" /></a></svg>',
+            '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><use xlink:href="data:application/xml;base64 ,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KPGRlZnM+CjxjaXJjbGUgaWQ9InRlc3QiIHI9IjAiIGN4PSIwIiBjeT0iMCIgc3R5bGU9ImZpbGw6ICNGMDAiPgo8c2V0IGF0dHJpYnV0ZU5hbWU9ImZpbGwiIGF0dHJpYnV0ZVR5cGU9IkNTUyIgb25iZWdpbj0nYWxlcnQoZG9jdW1lbnQuZG9tYWluKScKb25lbmQ9J2FsZXJ0KCJvbmVuZCIpJyB0bz0iIzAwRiIgYmVnaW49IjBzIiBkdXI9Ijk5OXMiIC8+CjwvY2lyY2xlPgo8L2RlZnM+Cjx1c2UgeGxpbms6aHJlZj0iI3Rlc3QiLz4KPC9zdmc+#test"/></svg>',
+            '<svg><animate href=#xss attributeName=href values=javascript:alert(1) /></svg>',
+            '<svg><animate href="#xss" attributeName="href" values="a;javascript:alert(1)" /></svg>',
+            '<svg><animate href="#xss" attributeName="href" values="a;data:alert(1)" /></svg>',
+            '<svg><animate href=#xss attributeName=href from=javascript:alert(1) to=1 /><a id=xss><text x=20 y=20>XSS</text></a>',
+            '<svg><set href=#xss attributeName=href from=? to=javascript:alert(1) /><a id=xss><text x=20 y=20>XSS</text></a>',
+            '<svg><g><g><g><animate href=#xss attributeName=href values=javascript:alert(1) /></g></g></g></svg>',
+        ];
+
+        $this->asEditor();
+        $page = $this->entities->page();
+
+        foreach ($checks as $check) {
+            $page->html = $check;
+            $page->save();
+
+            $pageView = $this->get($page->getUrl());
+            $pageView->assertStatus(200);
+            $html = $this->withHtml($pageView);
+            $html->assertElementNotContains('.page-content', 'alert');
+            $html->assertElementNotContains('.page-content', 'xlink:href');
+            $html->assertElementNotContains('.page-content', 'application/xml');
+            $html->assertElementNotContains('.page-content', 'javascript');
+        }
+    }
+
+    public function test_page_inline_on_attributes_show_with_filters_disabled()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        config()->set('app.content_filtering', '');
+
+        $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
+        $page->html = "escape {$script}";
+        $page->save();
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertSee($script, false);
+        $pageView->assertDontSee('<p>Hello</p>', false);
+    }
+
+    public function test_non_content_filtering_is_controlled_by_config()
+    {
+        config()->set('app.content_filtering', '');
+        $page = $this->entities->page();
+        $html = <<<'HTML'
+<style>superbeans!</style>
+<template id="template">superbeans!</template>
+HTML;
+        $page->html = $html;
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertSee('superbeans', false);
+
+        config()->set('app.content_filtering', 'h');
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertDontSee('superbeans', false);
+    }
+
+    public function test_non_content_filtering()
+    {
+        config()->set('app.content_filtering', 'h');
+        $page = $this->entities->page();
+        $html = <<<'HTML'
+<style>superbeans!</style>
+<p>inbetweenpsection</p>
+<link rel="stylesheet" href="https://example.com/superbeans.css">
+<meta name="description" content="superbeans!">
+<title>superbeans!</title>
+<template id="template">superbeans!</template>
+HTML;
+
+        $page->html = $html;
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertDontSee('superbeans', false);
+        $resp->assertSee('inbetweenpsection', false);
+    }
+
+    public function test_allow_list_filtering_is_controlled_by_config()
+    {
+        config()->set('app.content_filtering', '');
+        $page = $this->entities->page();
+        $page->html = '<div style="position: absolute; left: 0;color:#00FFEE;">Hello!</div>';
+        $page->save();
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertSee('style="position: absolute; left: 0;color:#00FFEE;"', false);
+
+        config()->set('app.content_filtering', 'a');
+        $resp = $this->get($page->getUrl());
+        $resp->assertDontSee('style="position: absolute; left: 0;color:#00FFEE;"', false);
+        $resp->assertSee('style="color:#00FFEE;"', false);
+    }
+
+    public function test_allow_list_style_filtering()
+    {
+        $testCasesExpectedByInput = [
+            '<div style="position:absolute;left:0;color:#00FFEE;">Hello!</div>' => '<div style="color:#00FFEE;">Hello!</div>',
+            '<div style="background:#FF0000;left:0;color:#00FFEE;">Hello!</div>' => '<div style="background:#FF0000;color:#00FFEE;">Hello!</div>',
+            '<div style="color:#00FFEE;">Hello!<style>testinghello!</style></div>' => '<div style="color:#00FFEE;">Hello!</div>',
+            '<div drawio-diagram="5332" another-attr="cat">Hello!</div>' => '<div drawio-diagram="5332">Hello!</div>',
+            '<iframe src="file://link/to/file" id="bkmrk-file-iframe"></iframe>' => '<iframe id="bkmrk-file-iframe"></iframe>',
+            '<embed src="file://link/to/file" id="bkmrk-file-embed"></embed>' => '<embed id="bkmrk-file-embed">',
+            '<object data="file://link/to/file" id="bkmrk-file-object"></object>' => '<object id="bkmrk-file-object">',
+            '<div id="bkmrk-file-img"><img src="file://link/to/file" alt="My local image"></div>' => '<div id="bkmrk-file-img"></div>',
+            '<div id="bkmrk-file-img"><img srcset="file://link/to/file" alt="My local image"></div>' => '<div id="bkmrk-file-img"></div>',
+            '<div id="bkmrk-file-img"><img src="http://example.com" srcset="file://link/to/file  2x" alt="My local image"></div>' => '<div id="bkmrk-file-img"><img src="http://example.com" alt="My local image"></div>',
+            '<div id="bkmrk-file-img"><picture><source srcset="file://link/to/file"/><img src="http://example.com" alt="cat"/></picture></div>' => '<div id="bkmrk-file-img"><picture><source><img src="http://example.com" alt="cat"></picture></div>',
+            '<div id="bkmrk-link"><link rel="preload" as="image" imagesizes="50vw" imagesrcset="file://cat.com, bg-wide.png 800w" /></div>' => '<div id="bkmrk-link"></div>',
+        ];
+
+        config()->set('app.content_filtering', 'a');
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        foreach ($testCasesExpectedByInput as $input => $expected) {
+            $page->html = $input;
+            $page->save();
+            $resp = $this->get($page->getUrl());
+
+            $resp->assertSee($expected, false);
+            $resp->assertDontSee($input, false);
+        }
+    }
+
+    public function test_media_protocol_relative_urls_are_given_scheme_depending_on_app_url()
+    {
+        $testCasesExpectedByInput = [
+            '<div id="bkmrk-file-img"><img src="//link/to/file" alt="My local image"></div>' => '<div id="bkmrk-file-img"><img src="SCHEME://link/to/file" alt="My local image"></div>',
+            '<iframe src="//link/to/file" id="bkmrk-file-iframe"></iframe>' => '<iframe src="SCHEME://link/to/file" id="bkmrk-file-iframe"></iframe>',
+            '<embed src="//link/to/file" id="bkmrk-file-embed">' => '<embed src="SCHEME://link/to/file" id="bkmrk-file-embed">',
+            '<object data="//link/to/file" id="bkmrk-file-object"></object>' => '<object data="SCHEME://link/to/file" id="bkmrk-file-object"></object>',
+            '<div id="bkmrk-file-img"><img srcset="//link/to/file 2x, //link-to-another 4x" src="//link/to/a/file" alt="My local image"></div>' => '<div id="bkmrk-file-img"><img srcset="SCHEME://link/to/file 2x, SCHEME://link-to-another 4x" src="SCHEME://link/to/a/file" alt="My local image"></div>',
+        ];
+
+        $baseUrls = ['https://example.com' => 'https', 'http://example.com' => 'http'];
+        foreach ($baseUrls as $baseUrl => $expectedScheme) {
+            $this->runWithEnv(['APP_URL' => $baseUrl], function () use ($expectedScheme, $baseUrl, $testCasesExpectedByInput) {
+                config()->set('app.content_filtering', 'a');
+                $page = $this->entities->page();
+                $this->asEditor();
+
+                foreach ($testCasesExpectedByInput as $input => $expected) {
+                    $page->html = $input;
+                    $page->save();
+                    $resp = $this->get($page->getUrl());
+
+                    $resp->assertSee(str_replace('SCHEME', $expectedScheme, $expected), false);
+                    $resp->assertDontSee($input, false);
+                }
+            });
+        }
+    }
+
+    public function test_allow_list_does_not_filter_cases()
+    {
+        $testCasesExpectedByInput = [
+            '<p><a href="https://example.com" target="_blank">New tab linkydoodle</a></p>',
+            '<p><a href="https://example.com/user/1" data-mention-user-id="5">@mentionusertext</a></p>',
+            '<p><a href="file://link/to/file">Link to file</a></p>',
+            '<p><a href="sftp://example.com/a/link/to/file">Link to file</a></p>',
+            '<p><a href="#hello-section">Link to another section</a></p>',
+            '<details><summary>Hello</summary><p>Mydetailshere</p></details>',
+            '<table><tr><th align="right">Hello</th></tr><tr><td align="center">Hello</td></tr></table>',
+        ];
+
+        config()->set('app.content_filtering', 'a');
+        $page = $this->entities->page();
+        $this->asEditor();
+
+        foreach ($testCasesExpectedByInput as $input) {
+            $page->html = $input;
+            $page->save();
+            $resp = $this->get($page->getUrl());
+
+            $resp->assertSee($input, false);
+        }
+    }
+}
diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 23a38b5735b..3cbb0e73959 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -48,7 +48,7 @@ public function test_saving_page_with_includes()
         $includeTag = '{{@' . $secondPage->id . '}}';
         $page->html = '<p>' . $includeTag . '</p>';
 
-        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'summary' => '']);
+        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'changelog' => '']);
 
         $resp->assertStatus(302);
 
@@ -101,261 +101,6 @@ public function test_page_includes_to_nonexisting_pages_does_not_error()
         $pageResp->assertSee('Hello Barry');
     }
 
-    public function test_page_content_scripts_removed_by_default()
-    {
-        $this->asEditor();
-        $page = $this->entities->page();
-        $script = 'abc123<script>console.log("hello-test")</script>abc123';
-        $page->html = "escape {$script}";
-        $page->save();
-
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertStatus(200);
-        $pageView->assertDontSee($script, false);
-        $pageView->assertSee('abc123abc123');
-    }
-
-    public function test_more_complex_content_script_escaping_scenarios()
-    {
-        $checks = [
-            "<p>Some script</p><script>alert('cat')</script>",
-            "<div><div><div><div><p>Some script</p><script>alert('cat')</script></div></div></div></div>",
-            "<p>Some script<script>alert('cat')</script></p>",
-            "<p>Some script <div><script>alert('cat')</script></div></p>",
-            "<p>Some script <script><div>alert('cat')</script></div></p>",
-            "<p>Some script <script><div>alert('cat')</script><script><div>alert('cat')</script></p><script><div>alert('cat')</script>",
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<script>');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</script>');
-        }
-    }
-
-    public function test_js_and_base64_src_urls_are_removed()
-    {
-        $checks = [
-            '<iframe src="javascript:alert(document.cookie)"></iframe>',
-            '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
-            '<iframe src="JavAScRipT:alert(document.cookie)"></iframe>',
-            '<iframe SRC=" javascript: alert(document.cookie)"></iframe>',
-            '<iframe src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
-            '<iframe src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
-            '<iframe src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg==" frameborder="0"></iframe>',
-            '<img src="javascript:alert(document.cookie)"/>',
-            '<img src="JavAScRipT:alert(document.cookie)"/>',
-            '<img src="JavAScRipT:alert(document.cookie)"/>',
-            '<img SRC=" javascript: alert(document.cookie)"/>',
-            '<img src="data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
-            '<img src="DaTa:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
-            '<img src=" data:text/html;base64,PHNjcmlwdD5hbGVydCgnaGVsbG8nKTwvc2NyaXB0Pg=="/>',
-            '<iframe srcdoc="<script>window.alert(document.cookie)</script>"></iframe>',
-            '<iframe SRCdoc="<script>window.alert(document.cookie)</script>"></iframe>',
-            '<IMG SRC=`javascript:alert("RSnake says, \'XSS\'")`>',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $html = $this->withHtml($pageView);
-            $html->assertElementNotContains('.page-content', '<iframe>');
-            $html->assertElementNotContains('.page-content', '<img');
-            $html->assertElementNotContains('.page-content', '</iframe>');
-            $html->assertElementNotContains('.page-content', 'src=');
-            $html->assertElementNotContains('.page-content', 'javascript:');
-            $html->assertElementNotContains('.page-content', 'data:');
-            $html->assertElementNotContains('.page-content', 'base64');
-        }
-    }
-
-    public function test_javascript_uri_links_are_removed()
-    {
-        $checks = [
-            '<a id="xss" href="javascript:alert(document.cookie)>Click me</a>',
-            '<a id="xss" href="javascript: alert(document.cookie)>Click me</a>',
-            '<a id="xss" href="JaVaScRiPt: alert(document.cookie)>Click me</a>',
-            '<a id="xss" href=" JaVaScRiPt: alert(document.cookie)>Click me</a>',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<a id="xss"');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'href=javascript:');
-        }
-    }
-
-    public function test_form_actions_with_javascript_are_removed()
-    {
-        $checks = [
-            '<form><input id="xss" type=submit formaction=javascript:alert(document.domain) value=Submit><input></form>',
-            '<form ><button id="xss" formaction="JaVaScRiPt:alert(document.domain)">Click me</button></form>',
-            '<form ><button id="xss" formaction=javascript:alert(document.domain)>Click me</button></form>',
-            '<form id="xss" action=javascript:alert(document.domain)><input type=submit value=Submit></form>',
-            '<form id="xss" action="JaVaScRiPt:alert(document.domain)"><input type=submit value=Submit></form>',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<button id="xss"');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<input id="xss"');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<form id="xss"');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'action=javascript:');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'formaction=javascript:');
-        }
-    }
-
-    public function test_metadata_redirects_are_removed()
-    {
-        $checks = [
-            '<meta http-equiv="refresh" content="0; url=//external_url">',
-            '<meta http-equiv="refresh" ConTeNt="0; url=//external_url">',
-            '<meta http-equiv="refresh" content="0; UrL=//external_url">',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '<meta>');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', '</meta>');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'content=');
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'external_url');
-        }
-    }
-
-    public function test_page_inline_on_attributes_removed_by_default()
-    {
-        $this->asEditor();
-        $page = $this->entities->page();
-        $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
-        $page->html = "escape {$script}";
-        $page->save();
-
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertStatus(200);
-        $pageView->assertDontSee($script, false);
-        $pageView->assertSee('<p>Hello</p>', false);
-    }
-
-    public function test_more_complex_inline_on_attributes_escaping_scenarios()
-    {
-        $checks = [
-            '<p onclick="console.log(\'test\')">Hello</p>',
-            '<p OnCliCk="console.log(\'test\')">Hello</p>',
-            '<div>Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p>',
-            '<div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div>',
-            '<div><div><div><div>Lorem ipsum dolor sit amet.<p onclick="console.log(\'test\')">Hello</p></div></div></div></div>',
-            '<div onclick="console.log(\'test\')">Lorem ipsum dolor sit amet.</div><p onclick="console.log(\'test\')">Hello</p><div></div>',
-            '<a a="<img src=1 onerror=\'alert(1)\'> ',
-            '\<a onclick="alert(document.cookie)"\>xss link\</a\>',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $this->withHtml($pageView)->assertElementNotContains('.page-content', 'onclick');
-        }
-    }
-
-    public function test_page_content_scripts_show_when_configured()
-    {
-        $this->asEditor();
-        $page = $this->entities->page();
-        config()->set('app.allow_content_scripts', 'true');
-
-        $script = 'abc123<script>console.log("hello-test")</script>abc123';
-        $page->html = "no escape {$script}";
-        $page->save();
-
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertSee($script, false);
-        $pageView->assertDontSee('abc123abc123');
-    }
-
-    public function test_svg_script_usage_is_removed()
-    {
-        $checks = [
-            '<svg id="test" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><a xlink:href="javascript:alert(document.domain)"><rect x="0" y="0" width="100" height="100" /></a></svg>',
-            '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><use xlink:href="data:application/xml;base64 ,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KPGRlZnM+CjxjaXJjbGUgaWQ9InRlc3QiIHI9IjAiIGN4PSIwIiBjeT0iMCIgc3R5bGU9ImZpbGw6ICNGMDAiPgo8c2V0IGF0dHJpYnV0ZU5hbWU9ImZpbGwiIGF0dHJpYnV0ZVR5cGU9IkNTUyIgb25iZWdpbj0nYWxlcnQoZG9jdW1lbnQuZG9tYWluKScKb25lbmQ9J2FsZXJ0KCJvbmVuZCIpJyB0bz0iIzAwRiIgYmVnaW49IjBzIiBkdXI9Ijk5OXMiIC8+CjwvY2lyY2xlPgo8L2RlZnM+Cjx1c2UgeGxpbms6aHJlZj0iI3Rlc3QiLz4KPC9zdmc+#test"/></svg>',
-            '<svg><animate href=#xss attributeName=href values=javascript:alert(1) /></svg>',
-            '<svg><animate href="#xss" attributeName="href" values="a;javascript:alert(1)" /></svg>',
-            '<svg><animate href="#xss" attributeName="href" values="a;data:alert(1)" /></svg>',
-            '<svg><animate href=#xss attributeName=href from=javascript:alert(1) to=1 /><a id=xss><text x=20 y=20>XSS</text></a>',
-            '<svg><set href=#xss attributeName=href from=? to=javascript:alert(1) /><a id=xss><text x=20 y=20>XSS</text></a>',
-            '<svg><g><g><g><animate href=#xss attributeName=href values=javascript:alert(1) /></g></g></g></svg>',
-        ];
-
-        $this->asEditor();
-        $page = $this->entities->page();
-
-        foreach ($checks as $check) {
-            $page->html = $check;
-            $page->save();
-
-            $pageView = $this->get($page->getUrl());
-            $pageView->assertStatus(200);
-            $html = $this->withHtml($pageView);
-            $html->assertElementNotContains('.page-content', 'alert');
-            $html->assertElementNotContains('.page-content', 'xlink:href');
-            $html->assertElementNotContains('.page-content', 'application/xml');
-            $html->assertElementNotContains('.page-content', 'javascript');
-        }
-    }
-
-    public function test_page_inline_on_attributes_show_if_configured()
-    {
-        $this->asEditor();
-        $page = $this->entities->page();
-        config()->set('app.allow_content_scripts', 'true');
-
-        $script = '<p onmouseenter="console.log(\'test\')">Hello</p>';
-        $page->html = "escape {$script}";
-        $page->save();
-
-        $pageView = $this->get($page->getUrl());
-        $pageView->assertSee($script, false);
-        $pageView->assertDontSee('<p>Hello</p>', false);
-    }
-
     public function test_duplicate_ids_does_not_break_page_render()
     {
         $this->asEditor();
@@ -382,7 +127,7 @@ public function test_duplicate_ids_fixed_on_page_save()
         $pageSave = $this->put($page->getUrl(), [
             'name'    => $page->name,
             'html'    => $content,
-            'summary' => '',
+            'changelog' => '',
         ]);
         $pageSave->assertRedirect();
 
@@ -399,7 +144,7 @@ public function test_anchors_referencing_non_bkmrk_ids_rewritten_after_save()
         $this->put($page->getUrl(), [
             'name'    => $page->name,
             'html'    => $content,
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         $updatedPage = Page::query()->where('id', '=', $page->id)->first();
@@ -508,7 +253,7 @@ public function test_page_markdown_table_rendering()
 | Paragraph   | Text        |';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -527,7 +272,7 @@ public function test_page_markdown_task_list_rendering()
 - [x] Item b';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -547,7 +292,7 @@ public function test_page_markdown_strikethrough_rendering()
         $content = '~~some crossed out text~~';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
+            'html' => '', 'changelog' => '',
         ]);
 
         $page->refresh();
@@ -559,14 +304,15 @@ public function test_page_markdown_strikethrough_rendering()
 
     public function test_page_markdown_single_html_comment_saving()
     {
+        config()->set('app.content_filtering', 'jfh');
         $this->asEditor();
         $page = $this->entities->page();
 
         $content = '<!-- Test Comment -->';
         $this->put($page->getUrl(), [
             'name' => $page->name,  'markdown' => $content,
-            'html' => '', 'summary' => '',
-        ]);
+            'html' => '', 'changelog' => '',
+        ])->assertRedirect();
 
         $page->refresh();
         $this->assertStringMatchesFormat($content, $page->html);
@@ -582,7 +328,7 @@ public function test_base64_images_get_extracted_from_page_content()
         $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
-            'name' => $page->name, 'summary' => '',
+            'name' => $page->name, 'changelog' => '',
             'html' => '<p>test<img src="data:image/jpeg;base64,' . $this->base64Jpeg . '"/></p>',
         ]);
 
@@ -606,7 +352,7 @@ public function test_base64_images_get_extracted_when_containing_whitespace()
         $base64PngWithWhitespace = "iVBORw0KGg\noAAAANSUhE\tUgAAAAEAAAA BCA   YAAAAfFcSJAAA\n\t ACklEQVR4nGMAAQAABQAB";
         $base64PngWithoutWhitespace = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQAB';
         $this->put($page->getUrl(), [
-            'name' => $page->name, 'summary' => '',
+            'name' => $page->name, 'changelog' => '',
             'html' => '<p>test<img src="data:image/png;base64,' . $base64PngWithWhitespace . '"/></p>',
         ]);
 
@@ -624,7 +370,7 @@ public function test_base64_images_get_extracted_when_containing_whitespace()
 
     public function test_base64_images_within_html_blanked_if_not_supported_extension_for_extract()
     {
-        // Relevant to https://github.com/BookStackApp/BookStack/issues/3010 and other cases
+        // Relevant to https://codeberg.org/bookstack/bookstack/issues/3010 and other cases
         $extensions = [
             'jiff', 'pngr', 'png ', ' png', '.png', 'png.', 'p.ng', ',png',
             'data:image/png', ',data:image/png',
@@ -635,7 +381,7 @@ public function test_base64_images_within_html_blanked_if_not_supported_extensio
             $page = $this->entities->page();
 
             $this->put($page->getUrl(), [
-                'name' => $page->name, 'summary' => '',
+                'name' => $page->name, 'changelog' => '',
                 'html' => '<p>test<img src="data:image/' . $extension . ';base64,' . $this->base64Jpeg . '"/></p>',
             ]);
 
@@ -679,7 +425,7 @@ public function test_base64_images_get_extracted_from_markdown_page_content()
         $page = $this->entities->page();
 
         $this->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jpeg;base64,' . $this->base64Jpeg . ')',
         ]);
 
@@ -710,7 +456,7 @@ public function test_markdown_base64_extract_not_limited_by_pcre_limits()
         $base64Content = base64_encode($content);
 
         $this->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jpeg;base64,' . $base64Content . ') ![test](data:image/jpeg;base64,' . $base64Content . ')',
         ]);
 
@@ -733,7 +479,7 @@ public function test_base64_images_within_markdown_blanked_if_not_supported_exte
         $page = $this->entities->page();
 
         $this->asEditor()->put($page->getUrl(), [
-            'name'     => $page->name, 'summary' => '',
+            'name'     => $page->name, 'changelog' => '',
             'markdown' => 'test ![test](data:image/jiff;base64,' . $this->base64Jpeg . ')',
         ]);
 
diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index e99ba9b8189..5dfcc82eb95 100644
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Exceptions\PermissionsException;
 use Tests\TestCase;
 
 class PageDraftTest extends TestCase
@@ -84,9 +85,7 @@ public function test_draft_save_shows_alert_if_draft_older_than_last_page_update
             'html' => '<p>updated draft</p>',
         ]);
 
-        /** @var PageRevision $draft */
-        $draft = $page->allRevisions()
-            ->where('type', '=', 'update_draft')
+        $draft = $page->updateDrafts()
             ->where('created_by', '=', $editor->id)
             ->first();
         $draft->created_at = now()->subMinute(1);
@@ -160,9 +159,11 @@ public function test_page_html_in_ajax_fetch_response()
     {
         $this->asAdmin();
         $page = $this->entities->page();
+        $page->html = '<p>test content<script>hellotherekitty</script></p>';
+        $page->save();
 
         $this->getJson('/ajax/page/' . $page->id)->assertJson([
-            'html' => $page->html,
+            'html' => '<p>test content</p>',
         ]);
     }
 
@@ -176,18 +177,17 @@ public function test_user_draft_removed_on_user_drafts_delete_call()
             'html' => '<p>updated draft again</p>',
         ]);
 
-        $revisionData = [
-            'type' => 'update_draft',
+        $draftMetadata = [
             'created_by' => $editor->id,
             'page_id' => $page->id,
         ];
 
-        $this->assertDatabaseHas('page_revisions', $revisionData);
+        $this->assertDatabaseHas('page_update_drafts', $draftMetadata);
 
-        $resp = $this->delete("/page-revisions/user-drafts/{$page->id}");
+        $resp = $this->delete("/page-user-drafts/{$page->id}");
 
         $resp->assertOk();
-        $this->assertDatabaseMissing('page_revisions', $revisionData);
+        $this->assertDatabaseMissing('page_update_drafts', $draftMetadata);
     }
 
     public function test_updating_page_draft_with_markdown_retains_markdown_content()
@@ -204,7 +204,7 @@ public function test_updating_page_draft_with_markdown_retains_markdown_content(
         ]);
         $resp->assertOk();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'       => $draft->id,
             'draft'    => true,
             'name'     => 'My updated draft',
@@ -235,10 +235,75 @@ public function test_slug_generated_on_draft_publish_to_page_when_no_name_change
             'markdown' => '# My markdown page',
         ]);
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'    => $draft->id,
             'draft' => false,
             'slug'  => 'my-page',
         ]);
     }
+
+    public function test_draft_publish_can_only_be_used_on_draft_pages()
+    {
+        $page = $this->entities->page();
+        $this->withoutExceptionHandling();
+
+        $exception = null;
+        try {
+            $this->asEditor()->post($page->book->getUrl("/draft/{$page->id}"), ['name' => 'My published drafty']);
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertInstanceOf(PermissionsException::class, $exception);
+        $this->assertStringContainsString('This page is already published or does not belong to you', $exception->getMessage());
+
+        $page->refresh();
+        $this->assertNotEquals('My published drafty', $page->name);
+    }
+
+    public function test_destroy_draft_can_only_be_used_on_draft_pages()
+    {
+        $page = $this->entities->page();
+        $this->withoutExceptionHandling();
+
+        $exception = null;
+        try {
+            $this->asEditor()->delete($page->book->getUrl("/draft/{$page->id}"));
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertInstanceOf(PermissionsException::class, $exception);
+        $this->assertStringContainsString('This page is already published or does not belong to you', $exception->getMessage());
+
+        $page->refresh();
+        $this->assertDatabaseHas('entities', [
+            'id' => $page->id,
+            'type' => 'page',
+            'deleted_at' => null
+        ]);
+    }
+
+    public function test_saving_update_draft_stores_summary_and_restores_it_on_page_re_edit()
+    {
+        $page = $this->entities->page();
+        $user = $this->users->editor();
+
+        $this->actingAs($user)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => 'My updated page',
+            'html' => '<p>Summary test</p>',
+            'changelog' => 'Ensuring this remains angrycatdinosaur',
+        ])->assertOk();
+
+        $this->assertDatabaseHas('page_update_drafts', [
+            'page_id' => $page->id,
+            'created_by' => $user->id,
+            'name' => 'My updated page',
+            'summary' => 'Ensuring this remains angrycatdinosaur',
+        ]);
+
+        $edit = $this->get($page->getUrl('/edit'));
+        $edit->assertOk();
+        $this->withHtml($edit)->assertFieldHasValue('changelog', 'Ensuring this remains angrycatdinosaur');
+    }
 }
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index ad753c96647..67283f70420 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -85,7 +85,7 @@ public function test_empty_markdown_still_saves_without_error()
         $resp = $this->post($book->getUrl("/draft/{$draft->id}"), $details);
         $resp->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'markdown' => $details['markdown'],
             'id'       => $draft->id,
             'draft'    => false,
@@ -265,4 +265,40 @@ public function test_editor_type_change_to_wysiwyg_infers_type_from_request_or_u
             $this->assertEquals($test['expected'], $page->refresh()->editor, "Failed asserting global editor {$test['setting']} with request editor {$test['request']} results in {$test['expected']} set for the page");
         }
     }
+
+    public function test_editor_html_content_is_filtered_if_loaded_by_a_different_user()
+    {
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+        $page->html = '<style>hellotherethisisaturtlemonster</style>';
+        $page->updated_by = $editor->id;
+        $page->save();
+
+        $resp = $this->asAdmin()->get($page->getUrl('edit'));
+        $resp->assertOk();
+        $resp->assertDontSee('hellotherethisisaturtlemonster', false);
+
+        $resp = $this->asAdmin()->get("/ajax/page/{$page->id}");
+        $resp->assertOk();
+        $resp->assertDontSee('hellotherethisisaturtlemonster', false);
+    }
+
+    public function test_editor_html_filtered_does_not_cause_error_if_empty()
+    {
+        $emptyExamples = ['', '<p></p>', '<p>&nbsp;</p>', ' ', "\n"];
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+        $page->updated_by = $editor->id;
+
+        foreach ($emptyExamples as $emptyExample) {
+            $page->html = $emptyExample;
+            $page->save();
+
+            $resp = $this->asAdmin()->get($page->getUrl('edit'));
+            $resp->assertOk();
+
+            $resp = $this->asAdmin()->get("/ajax/page/{$page->id}");
+            $resp->assertOk();
+        }
+    }
 }
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index 9040254f78f..a350015686f 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -4,6 +4,8 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\PageRevision;
+use BookStack\Permissions\Permission;
 use Tests\TestCase;
 
 class PageRevisionTest extends TestCase
@@ -25,6 +27,22 @@ public function test_page_revision_views_viewable()
         $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p>new content</p>']);
         $pageRevision = $page->revisions->last();
 
+        $resp = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number);
+        $resp->assertStatus(200);
+        $resp->assertSee('new content');
+
+        $resp = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number . '/changes');
+        $resp->assertStatus(200);
+        $resp->assertSee('new content');
+    }
+
+    public function test_page_revision_views_accessible_at_old_id_paths()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p>new content</p>']);
+        $pageRevision = $page->revisions->last();
+
         $resp = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id);
         $resp->assertStatus(200);
         $resp->assertSee('new content');
@@ -34,6 +52,22 @@ public function test_page_revision_views_viewable()
         $resp->assertSee('new content');
     }
 
+    public function test_page_revision_views_show_revision_number_in_breadcrumbs()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p>new content</p>']);
+        $pageRevision = $page->revisions->last();
+
+        $resp = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number);
+        $resp->assertStatus(200);
+        $this->withHtml($resp)->assertElementContains('.breadcrumbs a', "Revision #{$pageRevision->revision_number}");
+
+        $resp = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number . '/changes');
+        $resp->assertStatus(200);
+        $this->withHtml($resp)->assertElementContains('.breadcrumbs a', "Revision #{$pageRevision->revision_number} changes");
+    }
+
     public function test_page_revision_preview_shows_content_of_revision()
     {
         $this->asEditor();
@@ -42,26 +76,41 @@ public function test_page_revision_preview_shows_content_of_revision()
         $pageRevision = $page->revisions->last();
         $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p>Updated content</p>']);
 
-        $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id);
+        $revisionView = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number);
         $revisionView->assertStatus(200);
         $revisionView->assertSee('new revision content');
     }
 
+    public function test_page_revision_preview_filters_html_content()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<script>dontwantthishere</script><style>dontwantthishere</style><p>expectthisthough</p>']);
+        $pageRevision = $page->revisions->last();
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p>Updated content</p>']);
+
+        $revisionView = $this->get($page->getUrl() . '/revision/' . $pageRevision->revision_number);
+        $revisionView->assertStatus(200);
+        $revisionView->assertSee('expectthisthough');
+        $revisionView->assertDontSee('dontwantthishere');
+    }
+
     public function test_page_revision_restore_updates_content()
     {
         $this->asEditor();
         $page = $this->entities->page();
         $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>']);
         $this->createRevisions($page, 1, ['name' => 'updated page again', 'html' => '<p>new content</p>']);
-        $page = Page::find($page->id);
+        $page = Page::query()->find($page->id);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee('abc123');
         $pageView->assertDontSee('def456');
 
+        /** @var PageRevision $revToRestore */
         $revToRestore = $page->revisions()->where('name', 'like', '%abc123')->first();
-        $restoreReq = $this->put($page->getUrl() . '/revisions/' . $revToRestore->id . '/restore');
-        $page = Page::find($page->id);
+        $restoreReq = $this->put($page->getUrl() . '/revision/' . $revToRestore->revision_number . '/restore');
+        $page = Page::query()->find($page->id);
 
         $restoreReq->assertStatus(302);
         $restoreReq->assertRedirect($page->getUrl());
@@ -77,21 +126,22 @@ public function test_page_revision_restore_with_markdown_retains_markdown_conten
         $page = $this->entities->page();
         $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'markdown' => '## New Content def456']);
         $this->createRevisions($page, 1, ['name' => 'updated page again', 'markdown' => '## New Content Updated']);
-        $page = Page::find($page->id);
+        $page = Page::query()->find($page->id);
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee('abc123');
         $pageView->assertDontSee('def456');
 
+        /** @var PageRevision $revToRestore */
         $revToRestore = $page->revisions()->where('name', 'like', '%abc123')->first();
-        $restoreReq = $this->put($page->getUrl() . '/revisions/' . $revToRestore->id . '/restore');
-        $page = Page::find($page->id);
+        $restoreReq = $this->put($page->getUrl() . '/revision/' . $revToRestore->revision_number . '/restore');
+        $page = Page::query()->find($page->id);
 
         $restoreReq->assertStatus(302);
         $restoreReq->assertRedirect($page->getUrl());
 
         $pageView = $this->get($page->getUrl());
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'       => $page->id,
             'markdown' => '## New Content def456',
         ]);
@@ -103,18 +153,18 @@ public function test_page_revision_restore_sets_new_revision_with_summary()
     {
         $this->asEditor();
         $page = $this->entities->page();
-        $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>', 'summary' => 'My first update']);
+        $this->createRevisions($page, 1, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>', 'changelog' => 'My first update']);
         $this->createRevisions($page, 1, ['html' => '<p>new content</p>']);
         $page->refresh();
 
+        /** @var PageRevision $revToRestore */
         $revToRestore = $page->revisions()->where('name', 'like', '%abc123')->first();
-        $this->put($page->getUrl() . '/revisions/' . $revToRestore->id . '/restore');
+        $this->put($page->getUrl() . '/revision/' . $revToRestore->revision_number . '/restore');
         $page->refresh();
 
         $this->assertDatabaseHas('page_revisions', [
             'page_id' => $page->id,
             'text'    => 'new contente def456',
-            'type'    => 'version',
             'summary' => "Restored from #{$revToRestore->id}; My first update",
         ]);
 
@@ -123,12 +173,32 @@ public function test_page_revision_restore_sets_new_revision_with_summary()
     }
 
     public function test_page_revision_count_increments_on_update()
+    {
+        $page = $this->entities->page();
+        $startCount = $page->revision_count;
+
+        $this->createRevisions($page, 1);
+        $page->refresh();
+
+        $this->assertEquals($startCount + 1, $page->revision_count);
+    }
+
+    public function test_page_revision_count_will_stay_above_max_revision_number()
     {
         $page = $this->entities->page();
         $startCount = $page->revision_count;
         $this->createRevisions($page, 1);
+        $newRevNum = $startCount + 100;
 
-        $this->assertTrue(Page::find($page->id)->revision_count === $startCount + 1);
+        /** @var PageRevision $revision */
+        $revision = $page->revisions()->first();
+        $revision->revision_number = $newRevNum;
+        $revision->save();
+
+        $this->createRevisions($page, 1);
+        $page->refresh();
+
+        $this->assertEquals($newRevNum + 1, $page->revision_count);
     }
 
     public function test_revision_count_shown_in_page_meta()
@@ -215,6 +285,63 @@ public function test_revision_changes_link_not_shown_for_oldest_revision()
         $html->assertElementContains('.item-list > .item-list-row:nth-child(2)', 'Changes');
     }
 
+    public function test_revision_changes_view_shows_diff()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p id="bkmrk-hello">Hello there dog</p>']);
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => '<p id="bkmrk-hello">Hello there cat</p>']);
+
+        /** @var PageRevision $pageRevision */
+        $pageRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $revisionView = $this->get("{$page->getUrl()}/revision/{$pageRevision->revision_number}/changes");
+        $revisionView->assertStatus(200);
+        $revisionView->assertSee('<p id="bkmrk-hello">Hello there <del class="diffmod">dog</del><ins class="diffmod">cat</ins></p>', false);
+    }
+
+    public function test_revision_changes_view_filters_html_content()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $html = '<script>dontwantthishere</script><style>dontwantthishere</style><p>expectthisthough</p>';
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => $html]);
+        $this->createRevisions($page, 1, ['name' => 'updated page', 'html' => $html]);
+
+        /** @var PageRevision $pageRevision */
+        $pageRevision = $page->revisions()->orderBy('id', 'desc')->first();
+        $revisionView = $this->get("{$page->getUrl()}/revision/{$pageRevision->revision_number}/changes");
+        $revisionView->assertStatus(200);
+        $revisionView->assertSee('expectthisthough');
+        $revisionView->assertDontSee('dontwantthishere');
+    }
+
+    public function test_access_to_revision_operation_requires_revision_view_all_permission()
+    {
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $page = $this->entities->page();
+        $this->createRevisions($page, 3);
+        /** @var PageRevision $revision */
+        $revision = $page->revisions()->orderBy('id', 'desc')->first();
+
+        $this->get($page->getUrl())->assertSee($page->getUrl('/revisions'), false);
+        $this->get($page->getUrl('/revisions'))->assertOk();
+        $this->get($revision->getUrl())->assertOk();
+        $this->get($revision->getUrl('/changes'))->assertOk();
+        $this->put($revision->getUrl('/restore'))->assertRedirect($page->getUrl());
+        $this->delete($revision->getUrl('/delete'))->assertRedirect($page->getUrl('/revisions'));
+
+        $this->permissions->removeUserRolePermissions($editor, [Permission::RevisionViewAll]);
+
+        $this->get($page->getUrl())->assertDontSee($page->getUrl('/revisions'), false);
+        $this->assertPermissionError($this->get($page->getUrl('/revisions')));
+        $this->assertPermissionError($this->get($revision->getUrl()));
+        $this->assertPermissionError($this->get($revision->getUrl('/changes')));
+        $this->assertPermissionError($this->put($revision->getUrl('/restore')));
+        $this->assertPermissionError($this->delete($revision->getUrl('/delete')));
+    }
+
     public function test_revision_restore_action_only_visible_with_permission()
     {
         $page = $this->entities->page();
@@ -251,16 +378,37 @@ public function test_revision_delete_action_only_visible_with_permission()
         $respHtml->assertElementExists('form[action$="/delete"]');
     }
 
+    public function test_revision_number_is_always_above_others()
+    {
+        $page = $this->entities->page();
+        $this->createRevisions($page, 5);
+        $page->revision_count = 1;
+        $page->save();
+
+
+        $maxNum = $page->revisions()->max('revision_number');
+        $this->assertEquals(6, $maxNum);
+
+        $this->asEditor()->put($page->getUrl(), [
+            'name' => 'Another page update',
+            'html' => '<p>Another page update</p>',
+            'changelog' => 'Updated again'
+        ]);
+
+        $maxNum = $page->revisions()->max('revision_number');
+        $this->assertEquals(7, $maxNum);
+    }
+
     protected function createRevisions(Page $page, int $times, array $attrs = [])
     {
         $user = user();
 
         for ($i = 0; $i < $times; $i++) {
-            $data = ['name' => 'Page update' . $i, 'summary' => 'Update entry' . $i];
+            $data = ['name' => 'Page update' . $i, 'changelog' => 'Update entry' . $i];
             if (!isset($attrs['markdown'])) {
                 $data['html'] = '<p>My update page</p>';
             }
-            $this->asAdmin()->put($page->getUrl(), array_merge($data, $attrs));
+            $resp = $this->asAdmin()->put($page->getUrl(), array_merge($data, $attrs));
             $page->refresh();
         }
 
diff --git a/tests/Entity/PageTemplateTest.php b/tests/Entity/PageTemplateTest.php
index 6a68c3ab18f..9c867a534fa 100644
--- a/tests/Entity/PageTemplateTest.php
+++ b/tests/Entity/PageTemplateTest.php
@@ -35,7 +35,7 @@ public function test_manage_templates_permission_required_to_change_page_templat
         ];
 
         $this->put($page->getUrl(), $pageUpdateData);
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'       => $page->id,
             'template' => false,
         ]);
@@ -43,7 +43,7 @@ public function test_manage_templates_permission_required_to_change_page_templat
         $this->permissions->grantUserRolePermissions($editor, ['templates-manage']);
 
         $this->put($page->getUrl(), $pageUpdateData);
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id'       => $page->id,
             'template' => true,
         ]);
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index d2c448bf4b7..4442269941e 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
+use BookStack\Uploads\Image;
 use Carbon\Carbon;
 use Tests\TestCase;
 
@@ -74,7 +75,7 @@ public function test_page_creation_with_markdown_content()
         $resp = $this->post($book->getUrl("/draft/{$draft->id}"), $details);
         $resp->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'markdown' => $details['markdown'],
             'name'     => $details['name'],
             'id'       => $draft->id,
@@ -97,7 +98,7 @@ public function test_page_creation_allows_summary_to_be_set()
         $details = [
             'html'    => '<h1>a title</h1>',
             'name'    => 'My page with summary',
-            'summary' => 'Here is my changelog message for a new page!',
+            'changelog' => 'Here is my changelog message for a new page!',
         ];
         $resp = $this->post($book->getUrl("/draft/{$draft->id}"), $details);
         $resp->assertRedirect();
@@ -135,142 +136,44 @@ public function test_page_delete()
     public function test_page_full_delete_removes_all_revisions()
     {
         $page = $this->entities->page();
-        $page->revisions()->create([
-            'html' => '<p>ducks</p>',
+        $page->updateDrafts()->create([
+            'html' => '<p>dogs</p>',
             'name' => 'my page revision',
-            'type' => 'draft',
         ]);
         $page->revisions()->create([
             'html' => '<p>ducks</p>',
             'name' => 'my page revision',
-            'type' => 'revision',
         ]);
 
-        $this->assertDatabaseHas('page_revisions', [
-            'page_id' => $page->id,
-        ]);
+        $this->assertDatabaseHas('page_revisions', ['page_id' => $page->id]);
+        $this->assertDatabaseHas('page_update_drafts', ['page_id' => $page->id]);
 
         $this->asEditor()->delete($page->getUrl());
         $this->asAdmin()->post('/settings/recycle-bin/empty');
 
-        $this->assertDatabaseMissing('page_revisions', [
-            'page_id' => $page->id,
-        ]);
-    }
-
-    public function test_page_copy()
-    {
-        $page = $this->entities->page();
-        $page->html = '<p>This is some test content</p>';
-        $page->save();
-
-        $currentBook = $page->book;
-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
-
-        $resp = $this->asEditor()->get($page->getUrl('/copy'));
-        $resp->assertSee('Copy Page');
-
-        $movePageResp = $this->post($page->getUrl('/copy'), [
-            'entity_selection' => 'book:' . $newBook->id,
-            'name'             => 'My copied test page',
-        ]);
-        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
-
-        $movePageResp->assertRedirect($pageCopy->getUrl());
-        $this->assertTrue($pageCopy->book->id == $newBook->id, 'Page was copied to correct book');
-        $this->assertStringContainsString('This is some test content', $pageCopy->html);
+        $this->assertDatabaseMissing('page_revisions', ['page_id' => $page->id]);
+        $this->assertDatabaseMissing('page_update_drafts', ['page_id' => $page->id]);
     }
 
-    public function test_page_copy_with_markdown_has_both_html_and_markdown()
+    public function test_page_full_delete_nulls_related_images()
     {
         $page = $this->entities->page();
-        $page->html = '<h1>This is some test content</h1>';
-        $page->markdown = '# This is some test content';
-        $page->save();
-        $newBook = Book::where('id', '!=', $page->book->id)->first();
-
-        $this->asEditor()->post($page->getUrl('/copy'), [
-            'entity_selection' => 'book:' . $newBook->id,
-            'name'             => 'My copied test page',
-        ]);
-        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
-
-        $this->assertStringContainsString('This is some test content', $pageCopy->html);
-        $this->assertEquals('# This is some test content', $pageCopy->markdown);
-    }
-
-    public function test_page_copy_with_no_destination()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-
-        $resp = $this->asEditor()->get($page->getUrl('/copy'));
-        $resp->assertSee('Copy Page');
-
-        $movePageResp = $this->post($page->getUrl('/copy'), [
-            'name' => 'My copied test page',
-        ]);
-
-        $pageCopy = Page::where('name', '=', 'My copied test page')->first();
-
-        $movePageResp->assertRedirect($pageCopy->getUrl());
-        $this->assertTrue($pageCopy->book->id == $currentBook->id, 'Page was copied to correct book');
-        $this->assertTrue($pageCopy->id !== $page->id, 'Page copy is not the same instance');
-    }
+        $image = Image::factory()->create(['type' => 'gallery', 'uploaded_to' => $page->id]);
 
-    public function test_page_can_be_copied_without_edit_permission()
-    {
-        $page = $this->entities->page();
-        $currentBook = $page->book;
-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
-        $viewer = $this->users->viewer();
-
-        $resp = $this->actingAs($viewer)->get($page->getUrl());
-        $resp->assertDontSee($page->getUrl('/copy'));
-
-        $newBook->owned_by = $viewer->id;
-        $newBook->save();
-        $this->permissions->grantUserRolePermissions($viewer, ['page-create-own']);
-        $this->permissions->regenerateForEntity($newBook);
-
-        $resp = $this->actingAs($viewer)->get($page->getUrl());
-        $resp->assertSee($page->getUrl('/copy'));
+        $this->asEditor()->delete($page->getUrl());
+        $this->asAdmin()->post('/settings/recycle-bin/empty');
 
-        $movePageResp = $this->post($page->getUrl('/copy'), [
-            'entity_selection' => 'book:' . $newBook->id,
-            'name'             => 'My copied test page',
+        $this->assertDatabaseMissing('images', [
+            'type' => 'gallery',
+            'uploaded_to' => $page->id,
         ]);
-        $movePageResp->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
-            'name'       => 'My copied test page',
-            'created_by' => $viewer->id,
-            'book_id'    => $newBook->id,
+        $this->assertDatabaseHas('images', [
+            'id' => $image->id,
+            'uploaded_to' => null,
         ]);
     }
 
-    public function test_old_page_slugs_redirect_to_new_pages()
-    {
-        $page = $this->entities->page();
-
-        // Need to save twice since revisions are not generated in seeder.
-        $this->asAdmin()->put($page->getUrl(), [
-            'name' => 'super test',
-            'html' => '<p></p>',
-        ]);
-
-        $page->refresh();
-        $pageUrl = $page->getUrl();
-
-        $this->put($pageUrl, [
-            'name' => 'super test page',
-            'html' => '<p></p>',
-        ]);
-
-        $this->get($pageUrl)
-            ->assertRedirect("/books/{$page->book->slug}/page/super-test-page");
-    }
-
     public function test_page_within_chapter_deletion_returns_to_chapter()
     {
         $chapter = $this->entities->chapter();
@@ -366,4 +269,29 @@ public function test_page_edit_without_update_permissions_but_with_view_redirect
 
         $resp->assertSessionHas('error', 'You do not have permission to access the requested page.');
     }
+
+    public function test_page_html_content_remains_stable_through_re_edit_and_does_not_create_revision()
+    {
+        $page = $this->entities->page();
+
+        $this->asEditor()->put($page->getUrl(), [
+            'name' => 'Stability Test',
+            'html' => '<table border="1" style="border-collapse: collapse; width: 100%;" border="1"><tbody><tr><td>a</td></tr></tbody></table>',
+        ]);
+        $initialRevisionCount = $page->revisions()->count();
+        $page->refresh();
+
+        // Get the page content from the edit view to ensure we're using the
+        // exact same content which would be loaded into the editor.
+        $editView = $this->get($page->getUrl('/edit'));
+        $htmlContentEncoded = $this->withHtml($editView)->getInnerHtml('textarea#html-editor');
+        $htmlContent = html_entity_decode($htmlContentEncoded);
+
+        $this->asEditor()->put($page->getUrl(), [
+            'name' => 'Stability Test',
+            'html' => $htmlContent,
+        ]);
+
+        $this->assertEquals($initialRevisionCount, $page->revisions()->count());
+    }
 }
diff --git a/tests/Entity/SlugTest.php b/tests/Entity/SlugTest.php
new file mode 100644
index 00000000000..51cf34e5dfe
--- /dev/null
+++ b/tests/Entity/SlugTest.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Tests\Entity;
+
+use BookStack\Entities\Models\SlugHistory;
+use Tests\TestCase;
+
+class SlugTest extends TestCase
+{
+    public function test_slug_multi_byte_url_safe()
+    {
+        $book = $this->entities->newBook([
+            'name' => 'информация',
+        ]);
+
+        $this->assertEquals('informaciia', $book->slug);
+
+        $book = $this->entities->newBook([
+            'name' => '¿Qué?',
+        ]);
+
+        $this->assertEquals('que', $book->slug);
+    }
+
+    public function test_slug_format()
+    {
+        $book = $this->entities->newBook([
+            'name' => 'PartA / PartB / PartC',
+        ]);
+
+        $this->assertEquals('parta-partb-partc', $book->slug);
+    }
+
+    public function test_old_page_slugs_redirect_to_new_pages()
+    {
+        $page = $this->entities->page();
+        $pageUrl = $page->getUrl();
+
+        $this->asAdmin()->put($pageUrl, [
+            'name' => 'super test page',
+            'html' => '<p></p>',
+        ]);
+
+        $this->get($pageUrl)
+            ->assertRedirect("/books/{$page->book->slug}/page/super-test-page");
+    }
+
+    public function test_old_shelf_slugs_redirect_to_new_shelf()
+    {
+        $shelf = $this->entities->shelf();
+        $shelfUrl = $shelf->getUrl();
+
+        $this->asAdmin()->put($shelf->getUrl(), [
+            'name' => 'super test shelf',
+        ]);
+
+        $this->get($shelfUrl)
+            ->assertRedirect("/shelves/super-test-shelf");
+    }
+
+    public function test_old_book_slugs_redirect_to_new_book()
+    {
+        $book = $this->entities->book();
+        $bookUrl = $book->getUrl();
+
+        $this->asAdmin()->put($book->getUrl(), [
+            'name' => 'super test book',
+        ]);
+
+        $this->get($bookUrl)
+            ->assertRedirect("/books/super-test-book");
+    }
+
+    public function test_old_chapter_slugs_redirect_to_new_chapter()
+    {
+        $chapter = $this->entities->chapter();
+        $chapterUrl = $chapter->getUrl();
+
+        $this->asAdmin()->put($chapter->getUrl(), [
+            'name' => 'super test chapter',
+        ]);
+
+        $this->get($chapterUrl)
+            ->assertRedirect("/books/{$chapter->book->slug}/chapter/super-test-chapter");
+    }
+
+    public function test_old_book_slugs_in_page_urls_redirect_to_current_page_url()
+    {
+        $page = $this->entities->page();
+        $book = $page->book;
+        $pageUrl = $page->getUrl();
+
+        $this->asAdmin()->put($book->getUrl(), [
+            'name' => 'super test book',
+        ]);
+
+        $this->get($pageUrl)
+            ->assertRedirect("/books/super-test-book/page/{$page->slug}");
+    }
+
+    public function test_old_book_slugs_in_chapter_urls_redirect_to_current_chapter_url()
+    {
+        $chapter = $this->entities->chapter();
+        $book = $chapter->book;
+        $chapterUrl = $chapter->getUrl();
+
+        $this->asAdmin()->put($book->getUrl(), [
+            'name' => 'super test book',
+        ]);
+
+        $this->get($chapterUrl)
+            ->assertRedirect("/books/super-test-book/chapter/{$chapter->slug}");
+    }
+
+    public function test_slug_lookup_controlled_by_permissions()
+    {
+        $editor = $this->users->editor();
+        $pageA = $this->entities->page();
+        $pageB = $this->entities->page();
+
+        SlugHistory::factory()->create(['sluggable_id' => $pageA->id, 'sluggable_type' => 'page', 'slug' => 'monkey', 'parent_slug' => 'animals', 'created_at' => now()]);
+        SlugHistory::factory()->create(['sluggable_id' => $pageB->id, 'sluggable_type' => 'page', 'slug' => 'monkey', 'parent_slug' => 'animals', 'created_at' => now()->subDay()]);
+
+        // Defaults to latest where visible
+        $this->actingAs($editor)->get("/books/animals/page/monkey")->assertRedirect($pageA->getUrl());
+
+        $this->permissions->disableEntityInheritedPermissions($pageA);
+
+        // Falls back to other entry where the latest is not visible
+        $this->actingAs($editor)->get("/books/animals/page/monkey")->assertRedirect($pageB->getUrl());
+
+        // Original still accessible where permissions allow
+        $this->asAdmin()->get("/books/animals/page/monkey")->assertRedirect($pageA->getUrl());
+    }
+
+    public function test_slugs_recorded_in_history_on_page_update()
+    {
+        $page = $this->entities->page();
+        $this->asAdmin()->put($page->getUrl(), [
+            'name' => 'new slug',
+            'html' => '<p></p>',
+        ]);
+
+        $oldSlug = $page->slug;
+        $page->refresh();
+        $this->assertNotEquals($oldSlug, $page->slug);
+
+        $this->assertDatabaseHas('slug_history', [
+            'sluggable_id' => $page->id,
+            'sluggable_type' => 'page',
+            'slug' => $oldSlug,
+            'parent_slug' => $page->book->slug,
+        ]);
+    }
+
+    public function test_slugs_recorded_in_history_on_chapter_update()
+    {
+        $chapter = $this->entities->chapter();
+        $this->asAdmin()->put($chapter->getUrl(), [
+            'name' => 'new slug',
+        ]);
+
+        $oldSlug = $chapter->slug;
+        $chapter->refresh();
+        $this->assertNotEquals($oldSlug, $chapter->slug);
+
+        $this->assertDatabaseHas('slug_history', [
+            'sluggable_id' => $chapter->id,
+            'sluggable_type' => 'chapter',
+            'slug' => $oldSlug,
+            'parent_slug' => $chapter->book->slug,
+        ]);
+    }
+
+    public function test_slugs_recorded_in_history_on_book_update()
+    {
+        $book = $this->entities->book();
+        $this->asAdmin()->put($book->getUrl(), [
+            'name' => 'new slug',
+        ]);
+
+        $oldSlug = $book->slug;
+        $book->refresh();
+        $this->assertNotEquals($oldSlug, $book->slug);
+
+        $this->assertDatabaseHas('slug_history', [
+            'sluggable_id' => $book->id,
+            'sluggable_type' => 'book',
+            'slug' => $oldSlug,
+            'parent_slug' => null,
+        ]);
+    }
+
+    public function test_slugs_recorded_in_history_on_shelf_update()
+    {
+        $shelf = $this->entities->shelf();
+        $this->asAdmin()->put($shelf->getUrl(), [
+            'name' => 'new slug',
+        ]);
+
+        $oldSlug = $shelf->slug;
+        $shelf->refresh();
+        $this->assertNotEquals($oldSlug, $shelf->slug);
+
+        $this->assertDatabaseHas('slug_history', [
+            'sluggable_id' => $shelf->id,
+            'sluggable_type' => 'bookshelf',
+            'slug' => $oldSlug,
+            'parent_slug' => null,
+        ]);
+    }
+}
diff --git a/tests/ErrorTest.php b/tests/ErrorTest.php
index 642945d4388..27c83e212b6 100644
--- a/tests/ErrorTest.php
+++ b/tests/ErrorTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests;
 
-use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
 use Illuminate\Support\Facades\Log;
 
 class ErrorTest extends TestCase
@@ -44,7 +43,7 @@ public function test_404_page_shows_visible_content_within_non_visible_parent()
         $this->actingAs($editor)->get($page->getUrl())->assertOk();
 
         $this->permissions->disableEntityInheritedPermissions($book);
-        $this->permissions->addEntityPermission($page, ['view'], $editor->roles()->first());
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $editor->roles()->first());
 
         $resp = $this->actingAs($editor)->get($book->getUrl());
         $resp->assertNotFound();
diff --git a/tests/Exports/HtmlExportTest.php b/tests/Exports/HtmlExportTest.php
index e039fb2cc2b..3eb04a7ee20 100644
--- a/tests/Exports/HtmlExportTest.php
+++ b/tests/Exports/HtmlExportTest.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Permission;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 
@@ -18,7 +19,7 @@ public function test_page_html_export()
         $resp = $this->get($page->getUrl('/export/html'));
         $resp->assertStatus(200);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.html');
     }
 
     public function test_book_html_export()
@@ -31,7 +32,7 @@ public function test_book_html_export()
         $resp->assertStatus(200);
         $resp->assertSee($book->name);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.html');
     }
 
     public function test_book_html_export_shows_html_descriptions()
@@ -58,7 +59,7 @@ public function test_chapter_html_export()
         $resp->assertStatus(200);
         $resp->assertSee($chapter->name);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.html');
     }
 
     public function test_chapter_html_export_shows_html_descriptions()
@@ -165,8 +166,7 @@ public function test_page_export_contained_html_image_fetches_only_run_when_url_
         $storageDisk->delete('uploads/svg_test.svg');
 
         $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test.svg', false);
-        $resp->assertSee('http://localhost/uploads/svg_test.svg');
-        $resp->assertSee('src="/uploads/svg_test.svg"', false);
+        $resp->assertSee('src="http://localhost/uploads/svg_test.svg"', false);
     }
 
     public function test_page_export_contained_html_does_not_allow_upward_traversal_with_local()
@@ -229,6 +229,20 @@ public function test_page_export_with_deleted_creator_and_updater()
         $resp->assertDontSee('ExportWizardTheFifth');
     }
 
+    public function test_page_export_only_includes_revision_count_if_user_has_revision_view_permissions()
+    {
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $resp = $this->actingAs($editor)->get($page->getUrl('/export/html'));
+        $resp->assertSee('Revision #');
+
+        $this->permissions->removeUserRolePermissions($editor, [Permission::RevisionViewAll]);
+
+        $resp = $this->actingAs($editor)->get($page->getUrl('/export/html'));
+        $resp->assertDontSee('Revision #');
+    }
+
     public function test_html_exports_contain_csp_meta_tag()
     {
         $entities = [
diff --git a/tests/Exports/MarkdownExportTest.php b/tests/Exports/MarkdownExportTest.php
index 3bccd468270..ac1e283f34f 100644
--- a/tests/Exports/MarkdownExportTest.php
+++ b/tests/Exports/MarkdownExportTest.php
@@ -14,7 +14,7 @@ public function test_page_markdown_export()
         $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
         $resp->assertStatus(200);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.md"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.md');
     }
 
     public function test_page_markdown_export_uses_existing_markdown_if_apparent()
@@ -56,6 +56,20 @@ public function test_chapter_markdown_export()
         $resp->assertSee('My **chapter** description');
     }
 
+    public function test_chapter_markdown_export_pages_are_permission_controlled()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        $page = $chapter->pages()->first();
+        $page->name = 'MyPageWhichShouldNotBeFound';
+        $page->save();
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown'));
+
+        $resp->assertSee('# ' . $chapter->name);
+        $resp->assertDontSee('MyPageWhichShouldNotBeFound');
+    }
+
     public function test_book_markdown_export()
     {
         $book = Book::query()->whereHas('pages')->whereHas('chapters')->first();
@@ -76,6 +90,38 @@ public function test_book_markdown_export()
         $resp->assertSee('My **chapter** description');
     }
 
+    public function test_book_markdown_export_chapters_are_permission_controlled()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $chapter = $book->chapters()->first();
+        $page = $chapter->pages()->first();
+        $page->name = 'MyPageWhichShouldNotBeFound';
+        $page->save();
+        $chapter->name = 'MyChapterWhichShouldNotBeFound';
+        $chapter->save();
+        $this->permissions->disableEntityInheritedPermissions($chapter);
+
+        $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));
+
+        $resp->assertSee('# ' . $book->name);
+        $resp->assertDontSee('MyChapterWhichShouldNotBeFound');
+        $resp->assertDontSee('MyPageWhichShouldNotBeFound');
+    }
+
+    public function test_book_markdown_export_direct_pages_are_permission_controlled()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        $page = $book->directPages()->first();
+        $page->name = 'MyPageWhichShouldNotBeFound';
+        $page->save();
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));
+
+        $resp->assertSee('# ' . $book->name);
+        $resp->assertDontSee('MyPageWhichShouldNotBeFound');
+    }
+
     public function test_book_markdown_export_concats_immediate_pages_with_newlines()
     {
         /** @var Book $book */
@@ -84,7 +130,7 @@ public function test_book_markdown_export_concats_immediate_pages_with_newlines(
         $this->asEditor()->get($book->getUrl('/create-page'));
         $this->get($book->getUrl('/create-page'));
 
-        [$pageA, $pageB] = $book->pages()->where('chapter_id', '=', 0)->get();
+        [$pageA, $pageB] = $book->pages()->whereNull('chapter_id')->get();
         $pageA->html = '<p>hello tester</p>';
         $pageA->save();
         $pageB->name = 'The second page in this test';
diff --git a/tests/Exports/PdfExportTest.php b/tests/Exports/PdfExportTest.php
index e4de87d0d2f..739406e8daa 100644
--- a/tests/Exports/PdfExportTest.php
+++ b/tests/Exports/PdfExportTest.php
@@ -17,7 +17,7 @@ public function test_page_pdf_export()
 
         $resp = $this->get($page->getUrl('/export/pdf'));
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.pdf');
     }
 
     public function test_book_pdf_export()
@@ -28,7 +28,7 @@ public function test_book_pdf_export()
 
         $resp = $this->get($book->getUrl('/export/pdf'));
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.pdf');
     }
 
     public function test_chapter_pdf_export()
@@ -38,7 +38,7 @@ public function test_chapter_pdf_export()
 
         $resp = $this->get($chapter->getUrl('/export/pdf'));
         $resp->assertStatus(200);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.pdf');
     }
 
 
@@ -58,7 +58,7 @@ public function test_page_pdf_export_converts_iframes_to_links()
 
         $this->asEditor()->get($page->getUrl('/export/pdf'));
         $this->assertStringNotContainsString('iframe>', $pdfHtml);
-        $this->assertStringContainsString('<p><a href="https://www.youtube.com/embed/ShqUjt33uOs">https://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
+        $this->assertStringContainsString('<p><a href="http://www.youtube.com/embed/ShqUjt33uOs">http://www.youtube.com/embed/ShqUjt33uOs</a></p>', $pdfHtml);
     }
 
     public function test_page_pdf_export_opens_details_blocks()
@@ -79,6 +79,39 @@ public function test_page_pdf_export_opens_details_blocks()
         $this->assertStringContainsString('<details open="open"', $pdfHtml);
     }
 
+    public function test_custom_fonts_loaded_for_dom_pdf_when_used()
+    {
+        // Set up custom font usage
+        $page = $this->entities->page()->forceFill([
+            'html'     => '<p><strong>Bold</strong>text</p>',
+        ]);
+        $page->save();
+        $this->setSettings([
+            'app-custom-head' => '<style>* { font-family: "meow words"}</style>'
+        ]);
+        $normalFont = $this->files->testFilePath('fonts/Cardiff.ttf');
+        $normalFontTarget = storage_path('fonts/dompdf/MeowWords.ttf');
+        $boldFont = $this->files->testFilePath('fonts/Cardiff-Bold.ttf');
+        $boldFontTarget = storage_path('fonts/dompdf/MeowWords-Bold.ttf');
+        copy($normalFont, $normalFontTarget);
+        copy($boldFont, $boldFontTarget);
+
+        $resp = $this->asEditor()->get($page->getUrl('/export/pdf'));
+        $resp->assertStatus(200);
+
+        // Existance of UFM files indicates the metrics have been generated
+        $this->assertFileExists(storage_path('fonts/dompdf/MeowWords.ufm'));
+        $this->assertFileExists(storage_path('fonts/dompdf/MeowWords-Bold.ufm'));
+        // Existence of cache json files indicates the fonts have been used
+        $this->assertFileExists(storage_path('fonts/dompdf/cache/MeowWords.ufm.json'));
+        $this->assertFileExists(storage_path('fonts/dompdf/cache/MeowWords-Bold.ufm.json'));
+
+        $filesToCleanUp = [...glob(storage_path('fonts/dompdf/Meow*')), ...glob(storage_path('fonts/dompdf/cache/Meow*'))];
+        foreach ($filesToCleanUp as $file) {
+            unlink($file);
+        }
+    }
+
     public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true()
     {
         $page = $this->entities->page();
diff --git a/tests/Exports/TextExportTest.php b/tests/Exports/TextExportTest.php
index c593a6585cb..26298c185da 100644
--- a/tests/Exports/TextExportTest.php
+++ b/tests/Exports/TextExportTest.php
@@ -14,7 +14,7 @@ public function test_page_text_export()
         $resp = $this->get($page->getUrl('/export/plaintext'));
         $resp->assertStatus(200);
         $resp->assertSee($page->name);
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $page->slug . '.txt');
     }
 
     public function test_book_text_export()
@@ -35,7 +35,7 @@ public function test_book_text_export()
         $resp->assertSee($directPage->name);
         $resp->assertSee('My awesome page');
         $resp->assertSee('My little nested page');
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $book->slug . '.txt');
     }
 
     public function test_book_text_export_format()
@@ -52,7 +52,7 @@ public function test_book_text_export_format()
         $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
 
         $expected = "Export Book\nThis is a book with stuff to export\n\nExport chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
-        $expected .= "My wonderful page!\nMy great page Full of great stuff";
+        $expected .= "My wonderful page!\nMy great page\nFull of great stuff";
         $resp->assertSee($expected);
     }
 
@@ -68,7 +68,7 @@ public function test_chapter_text_export()
         $resp->assertSee($chapter->name);
         $resp->assertSee($page->name);
         $resp->assertSee('This is content within the page!');
-        $resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
+        $resp->assertHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . $chapter->slug . '.txt');
     }
 
     public function test_chapter_text_export_format()
@@ -82,7 +82,7 @@ public function test_chapter_text_export_format()
         $resp = $this->asEditor()->get($entities['book']->getUrl('/export/plaintext'));
 
         $expected = "Export chapter\nA test chapter to be exported\nIt has loads of info within\n\n";
-        $expected .= "My wonderful page!\nMy great page Full of great stuff";
+        $expected .= "My wonderful page!\nMy great page\nFull of great stuff";
         $resp->assertSee($expected);
     }
 }
diff --git a/tests/Exports/ZipExportTest.php b/tests/Exports/ZipExportTest.php
index 1310dcc2456..063f6d9425a 100644
--- a/tests/Exports/ZipExportTest.php
+++ b/tests/Exports/ZipExportTest.php
@@ -227,7 +227,7 @@ public function test_book_export()
         $bookData = $zip->data['book'];
         $this->assertEquals($book->id, $bookData['id']);
         $this->assertEquals($book->name, $bookData['name']);
-        $this->assertEquals($book->descriptionHtml(), $bookData['description_html']);
+        $this->assertEquals($book->descriptionInfo()->getHtml(), $bookData['description_html']);
         $this->assertCount(2, $bookData['tags']);
         $this->assertCount($book->directPages()->count(), $bookData['pages']);
         $this->assertCount($book->chapters()->count(), $bookData['chapters']);
@@ -240,7 +240,7 @@ public function test_book_export_with_cover_image()
         $bookRepo = $this->app->make(BookRepo::class);
         $coverImageFile = $this->files->uploadedImage('cover.png');
         $bookRepo->updateCoverImage($book, $coverImageFile);
-        $coverImage = $book->cover()->first();
+        $coverImage = $book->coverInfo()->getImage();
 
         $zipResp = $this->asEditor()->get($book->getUrl("/export/zip"));
         $zip = ZipTestHelper::extractFromZipResponse($zipResp);
@@ -264,7 +264,7 @@ public function test_chapter_export()
         $chapterData = $zip->data['chapter'];
         $this->assertEquals($chapter->id, $chapterData['id']);
         $this->assertEquals($chapter->name, $chapterData['name']);
-        $this->assertEquals($chapter->descriptionHtml(), $chapterData['description_html']);
+        $this->assertEquals($chapter->descriptionInfo()->getHtml(), $chapterData['description_html']);
         $this->assertCount(2, $chapterData['tags']);
         $this->assertEquals($chapter->priority, $chapterData['priority']);
         $this->assertCount($chapter->pages()->count(), $chapterData['pages']);
@@ -374,6 +374,54 @@ public function test_image_links_are_handled_when_using_external_storage_url()
         $this->assertStringContainsString("<a href=\"{$ref}\">Original URL</a><a href=\"{$ref}\">Storage URL</a>", $pageData['html']);
     }
 
+    public function test_orphaned_images_can_be_used_on_default_local_storage()
+    {
+        $this->asEditor();
+        $page = $this->entities->page();
+        $result = $this->files->uploadGalleryImageToPage($this, $page);
+        $displayThumb = $result['response']->thumbs->gallery ?? '';
+        $page->html = '<p><img src="' . $displayThumb . '" alt="My image"></p>';
+        $page->save();
+
+        $image = Image::findOrFail($result['response']->id);
+        $image->uploaded_to = null;
+        $image->save();
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zipResp->assertOk();
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $this->assertCount(1, $pageData['images']);
+        $imageData = $pageData['images'][0];
+        $this->assertEquals($image->id, $imageData['id']);
+
+        $this->assertEquals('<p><img src="[[bsexport:image:' . $imageData['id'] . ']]" alt="My image"></p>', $pageData['html']);
+    }
+
+    public function test_orphaned_images_cannot_be_used_on_local_secure_restricted()
+    {
+        config()->set('filesystems.images', 'local_secure_restricted');
+
+        $this->asEditor();
+        $page = $this->entities->page();
+        $result = $this->files->uploadGalleryImageToPage($this, $page);
+        $displayThumb = $result['response']->thumbs->gallery ?? '';
+        $page->html = '<p><img src="' . $displayThumb . '" alt="My image"></p>';
+        $page->save();
+
+        $image = Image::findOrFail($result['response']->id);
+        $image->uploaded_to = null;
+        $image->save();
+
+        $zipResp = $this->asEditor()->get($page->getUrl("/export/zip"));
+        $zipResp->assertOk();
+        $zip = ZipTestHelper::extractFromZipResponse($zipResp);
+        $pageData = $zip->data['page'];
+
+        $this->assertCount(0, $pageData['images']);
+    }
+
     public function test_cross_reference_links_external_to_export_are_not_converted()
     {
         $page = $this->entities->page();
diff --git a/tests/Exports/ZipExportValidatorTest.php b/tests/Exports/ZipExportValidatorTest.php
index c453ef294d4..0d19e6f079b 100644
--- a/tests/Exports/ZipExportValidatorTest.php
+++ b/tests/Exports/ZipExportValidatorTest.php
@@ -72,7 +72,7 @@ public function test_ids_have_to_be_unique()
         $this->assertEquals($expectedMessage, $results['book.chapters.1.id']);
     }
 
-    public function test_image_files_need_to_be_a_valid_detected_image_file()
+    public function test_page_image_files_need_to_be_a_valid_detected_image_file()
     {
         $validator = $this->getValidatorForData([
             'page' => [
@@ -88,6 +88,47 @@ public function test_image_files_need_to_be_a_valid_detected_image_file()
         $results = $validator->validate();
         $this->assertCount(1, $results);
 
-        $this->assertEquals('The file needs to reference a file of type image/png,image/jpeg,image/gif,image/webp, found text/plain.', $results['page.images.0.file']);
+        $this->assertEquals('The file needs to reference a file of type image/jpg,image/jpeg,image/png,image/gif,image/webp,image/avif, found text/plain.', $results['page.images.0.file']);
+    }
+
+    public function test_page_link_attachments_cant_be_data_or_js()
+    {
+        $validateResultCountByLink = [
+            'data:text/html,<p>hi</p>' => 1,
+            'javascript:alert(\'hi\')' => 1,
+            'mailto:email@example.com' => 0,
+        ];
+
+        foreach ($validateResultCountByLink as $link => $count) {
+            $validator = $this->getValidatorForData([
+                'page' => [
+                    'id' => 4,
+                    'name' => 'My page',
+                    'markdown' => 'hello',
+                    'attachments' => [
+                        ['id' => 4, 'name' => 'Attachment A', 'link' => $link],
+                    ],
+                ]
+            ]);
+
+            $results = $validator->validate();
+            $this->assertCount($count, $results);
+        }
+    }
+
+    public function test_book_cover_image_files_need_to_be_a_valid_detected_image_file()
+    {
+        $validator = $this->getValidatorForData([
+            'book' => [
+                'id' => 5,
+                'name' => 'My book',
+                'cover' => 'cat.png',
+            ]
+        ], ['cat.png' => $this->files->testFilePath('test-file.txt')]);
+
+        $results = $validator->validate();
+        $this->assertCount(1, $results);
+
+        $this->assertEquals('The cover needs to reference a file of type image/jpg,image/jpeg,image/png,image/gif,image/webp,image/avif, found text/plain.', $results['book.cover']);
     }
 }
diff --git a/tests/Exports/ZipImportRunnerTest.php b/tests/Exports/ZipImportRunnerTest.php
index 68ffb4231bd..42fdc50a4c8 100644
--- a/tests/Exports/ZipImportRunnerTest.php
+++ b/tests/Exports/ZipImportRunnerTest.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Exceptions\ZipImportException;
 use BookStack\Exports\ZipExports\ZipImportRunner;
 use BookStack\Uploads\Image;
 use Tests\TestCase;
@@ -109,7 +110,7 @@ public function test_book_import()
 
         // Book checks
         $this->assertEquals('Import test', $book->name);
-        $this->assertFileExists(public_path($book->cover->path));
+        $this->assertFileExists(public_path($book->coverInfo()->getImage()->path));
         $this->assertCount(2, $book->tags);
         $this->assertEquals('Cat', $book->tags()->first()->value);
         $this->assertCount(2, $book->chapters);
@@ -431,4 +432,116 @@ public function test_drawing_references_are_updated_within_content()
 
         ZipTestHelper::deleteZipForImport($import);
     }
+
+    public function test_book_covers_are_saved_with_a_valid_image_extension()
+    {
+        $testImagePath = $this->files->testFilePath('test-image.png');
+
+        $import = ZipTestHelper::importFromData([], [
+            'book' => [
+                'name' => 'Page A',
+                'cover' => 'my-book-import-ext-test.txt',
+            ],
+        ], [
+            'my-book-import-ext-test.txt' => $testImagePath,
+        ]);
+
+        $this->asAdmin();
+
+        $this->runner->run($import);
+        ZipTestHelper::deleteZipForImport($import);
+
+        $this->assertDatabaseHas('images', [
+            'name' => 'my-book-import-ext-test.txt.png',
+        ]);
+    }
+
+    public function test_error_thrown_if_zip_item_exceeds_app_file_upload_limit()
+    {
+        $tempFile = tempnam(sys_get_temp_dir(), 'bs-zip-test');
+        file_put_contents($tempFile, str_repeat('a', 2500000));
+        $parent = $this->entities->chapter();
+        config()->set('app.upload_limit', 1);
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<p>Hello</p>',
+                'attachments' => [
+                    [
+                        'name' => 'Text attachment',
+                        'file' => 'file_attachment'
+                    ]
+                ],
+            ],
+        ], [
+            'file_attachment' => $tempFile,
+        ]);
+
+        $this->asAdmin();
+
+        $this->expectException(ZipImportException::class);
+        $this->expectExceptionMessage('The file file_attachment must not exceed 1 MB.');
+
+        $this->runner->run($import, $parent);
+        ZipTestHelper::deleteZipForImport($import);
+    }
+
+    public function test_error_thrown_if_zip_item_file_stream_exceeds_its_reported_length_in_zip_archive()
+    {
+        $tempFile = tempnam(sys_get_temp_dir(), 'bs-zip-test');
+        file_put_contents($tempFile, str_repeat('a', 100));
+        $parent = $this->entities->chapter();
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<p>Hello</p>',
+                'attachments' => [
+                    [
+                        'name' => 'Text attachment',
+                        'file' => 'file_attachment'
+                    ]
+                ],
+            ],
+        ], [
+            'file_attachment' => $tempFile,
+        ]);
+
+        $zipPath = storage_path($import->path);
+        // Patch the size fields in the ZIP bytes to 99
+        $bytes = file_get_contents($zipPath);
+        $bytes = substr_replace($bytes, pack('V', 99), 0x103, 4); // central directory usz
+        $bytes = substr_replace($bytes, pack('V', 99), 0x91, 4); // local header usz
+        file_put_contents($zipPath, $bytes);
+
+        $this->asAdmin();
+
+        $this->expectException(ZipImportException::class);
+        $this->expectExceptionMessage('File file_attachment exceeded the file size reported in the ZIP archive.');
+
+        $this->runner->run($import, $parent);
+        ZipTestHelper::deleteZipForImport($import);
+    }
+
+    public function test_error_thrown_if_zip_data_exceeds_app_file_upload_limit()
+    {
+        $parent = $this->entities->chapter();
+        config()->set('app.upload_limit', 1);
+
+        $import = ZipTestHelper::importFromData([], [
+            'page' => [
+                'name' => 'Page A',
+                'html' => '<p>' . str_repeat('a', 2500000) . '</p>',
+            ],
+        ]);
+
+        $this->asAdmin();
+
+        $this->expectException(ZipImportException::class);
+        $this->expectExceptionMessage('ZIP data.json content exceeds the configured application maximum upload size.');
+
+        $this->runner->run($import, $parent);
+        ZipTestHelper::deleteZipForImport($import);
+    }
 }
diff --git a/tests/Helpers/EntityProvider.php b/tests/Helpers/EntityProvider.php
index c794f9478ab..d4cdce51285 100644
--- a/tests/Helpers/EntityProvider.php
+++ b/tests/Helpers/EntityProvider.php
@@ -50,7 +50,7 @@ public function pageWithinChapter(): Page
 
     public function pageNotWithinChapter(): Page
     {
-        return $this->page(fn(Builder $query) => $query->where('chapter_id', '=', 0));
+        return $this->page(fn(Builder $query) => $query->whereNull('chapter_id'));
     }
 
     public function templatePage(): Page
@@ -110,6 +110,14 @@ public function shelf(callable|null $queryFilter = null): Bookshelf
         return $shelf;
     }
 
+    /**
+     * Get a shelf that has books assigned.
+     */
+    public function shelfHasBooks(): Bookshelf
+    {
+        return $this->shelf(fn(Builder $query) => $query->whereHas('books'));
+    }
+
     /**
      * Get all entity types from the system.
      * @return array{page: Page, chapter: Chapter, book: Book, bookshelf: Bookshelf}
diff --git a/tests/Helpers/PermissionsProvider.php b/tests/Helpers/PermissionsProvider.php
index c9ae309196e..9b12ee985b3 100644
--- a/tests/Helpers/PermissionsProvider.php
+++ b/tests/Helpers/PermissionsProvider.php
@@ -101,8 +101,9 @@ public function setEntityPermissions(Entity $entity, array $actions = [], array
         $this->addEntityPermissionEntries($entity, $permissions);
     }
 
-    public function addEntityPermission(Entity $entity, array $actionList, Role $role)
+    public function setEntityPermissionsForRole(Entity $entity, array $actionList, Role $role)
     {
+        $entity->permissions()->where('role_id', '=', $role->id)->delete();
         $permissionData = $this->actionListToEntityPermissionData($actionList, $role->id);
         $this->addEntityPermissionEntries($entity, [$permissionData]);
     }
diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index 28491c3af9d..4a3d7ff08d9 100644
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\ActivityType;
 use BookStack\Translation\LocaleManager;
+use PHPUnit\Framework\Attributes\Group;
 
 class LanguageTest extends TestCase
 {
@@ -27,10 +28,9 @@ public function test_locales_list_set_properly()
     }
 
     // Not part of standard phpunit test runs since we sometimes expect non-added langs.
+    #[Group('lang')]
     public function test_locales_all_have_language_dropdown_entry()
     {
-        $this->markTestSkipped('Only used when checking language inclusion');
-
         $dropdownLocales = array_keys(trans('settings.language_select', [], 'en'));
         sort($dropdownLocales);
         sort($this->langs);
diff --git a/tests/Meta/OpenGraphTest.php b/tests/Meta/OpenGraphTest.php
index 96e622da052..b3571635996 100644
--- a/tests/Meta/OpenGraphTest.php
+++ b/tests/Meta/OpenGraphTest.php
@@ -49,7 +49,7 @@ public function test_book_tags()
         $resp = $this->asEditor()->get($book->getUrl());
         $tags = $this->getOpenGraphTags($resp);
 
-        $this->assertEquals($book->getBookCover(), $tags['image']);
+        $this->assertEquals($book->coverInfo()->getUrl(), $tags['image']);
     }
 
     public function test_shelf_tags()
@@ -69,7 +69,7 @@ public function test_shelf_tags()
         $resp = $this->asEditor()->get($shelf->getUrl());
         $tags = $this->getOpenGraphTags($resp);
 
-        $this->assertEquals($shelf->getBookCover(), $tags['image']);
+        $this->assertEquals($shelf->coverInfo()->getUrl(), $tags['image']);
     }
 
     /**
diff --git a/tests/Permissions/EntityOwnerChangeTest.php b/tests/Permissions/EntityOwnerChangeTest.php
index f002549220b..fd3f2797256 100644
--- a/tests/Permissions/EntityOwnerChangeTest.php
+++ b/tests/Permissions/EntityOwnerChangeTest.php
@@ -13,7 +13,7 @@ public function test_changing_page_owner()
         $user = User::query()->where('id', '!=', $page->owned_by)->first();
 
         $this->asAdmin()->put($page->getUrl('permissions'), ['owned_by' => $user->id]);
-        $this->assertDatabaseHas('pages', ['owned_by' => $user->id, 'id' => $page->id]);
+        $this->assertDatabaseHasEntityData('page', ['owned_by' => $user->id, 'id' => $page->id]);
     }
 
     public function test_changing_chapter_owner()
@@ -22,7 +22,7 @@ public function test_changing_chapter_owner()
         $user = User::query()->where('id', '!=', $chapter->owned_by)->first();
 
         $this->asAdmin()->put($chapter->getUrl('permissions'), ['owned_by' => $user->id]);
-        $this->assertDatabaseHas('chapters', ['owned_by' => $user->id, 'id' => $chapter->id]);
+        $this->assertDatabaseHasEntityData('chapter', ['owned_by' => $user->id, 'id' => $chapter->id]);
     }
 
     public function test_changing_book_owner()
@@ -31,7 +31,7 @@ public function test_changing_book_owner()
         $user = User::query()->where('id', '!=', $book->owned_by)->first();
 
         $this->asAdmin()->put($book->getUrl('permissions'), ['owned_by' => $user->id]);
-        $this->assertDatabaseHas('books', ['owned_by' => $user->id, 'id' => $book->id]);
+        $this->assertDatabaseHasEntityData('book', ['owned_by' => $user->id, 'id' => $book->id]);
     }
 
     public function test_changing_shelf_owner()
@@ -40,6 +40,6 @@ public function test_changing_shelf_owner()
         $user = User::query()->where('id', '!=', $shelf->owned_by)->first();
 
         $this->asAdmin()->put($shelf->getUrl('permissions'), ['owned_by' => $user->id]);
-        $this->assertDatabaseHas('bookshelves', ['owned_by' => $user->id, 'id' => $shelf->id]);
+        $this->assertDatabaseHasEntityData('bookshelf', ['owned_by' => $user->id, 'id' => $shelf->id]);
     }
 }
diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index ec2756b1213..817ac3a89bb 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -629,10 +629,8 @@ public function test_page_visible_if_has_permissions_when_book_not_visible()
 
     public function test_book_sort_view_permission()
     {
-        /** @var Book $firstBook */
-        $firstBook = Book::query()->first();
-        /** @var Book $secondBook */
-        $secondBook = Book::query()->find(2);
+        $firstBook = $this->entities->book();
+        $secondBook = $this->entities->book();
 
         $this->setRestrictionsForTestRoles($firstBook, ['view', 'update']);
         $this->setRestrictionsForTestRoles($secondBook, ['view']);
@@ -713,4 +711,31 @@ public function test_book_permissions_can_be_generated_without_error_if_child_ch
 
         $this->assertNull($error);
     }
+
+    public function test_chapter_permissions_change_updates_permissions_for_pages_in_recycle_bin()
+    {
+        $chapter = $this->entities->chapterHasPages();
+        /** @var Page $page */
+        $page = $chapter->pages()->first();
+        $editor = $this->users->editor();
+        $editorRole = $editor->roles->first();
+
+        $this->asAdmin()->delete($page->getUrl());
+        $this->assertTrue($page->refresh()->trashed());
+
+        $this->put($chapter->getUrl('/permissions'), [
+            'permissions' => [
+                '0' => [
+                    'active' => 'true',
+                ],
+            ],
+        ]);
+
+        $this->assertDatabaseHas('joint_permissions', [
+            'entity_type' => 'page',
+            'entity_id'   => $page->id,
+            'role_id'     => $editorRole->id,
+            'status'      => 0,
+        ]);
+    }
 }
diff --git a/tests/Permissions/Scenarios/EntityRolePermissionsTest.php b/tests/Permissions/Scenarios/EntityRolePermissionsTest.php
index 55761e08c58..fa89d365c0a 100644
--- a/tests/Permissions/Scenarios/EntityRolePermissionsTest.php
+++ b/tests/Permissions/Scenarios/EntityRolePermissionsTest.php
@@ -29,8 +29,8 @@ public function test_03_same_level_conflicting()
         $page = $this->entities->page();
 
         $this->permissions->disableEntityInheritedPermissions($page);
-        $this->permissions->addEntityPermission($page, [], $roleA);
-        $this->permissions->addEntityPermission($page, ['view'], $roleB);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleB);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -42,7 +42,7 @@ public function test_20_inherit_allow()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -54,7 +54,7 @@ public function test_21_inherit_deny()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -67,8 +67,8 @@ public function test_22_same_level_conflict_inherit()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleB);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleB);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -80,8 +80,8 @@ public function test_30_child_inherit_override_allow()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
-        $this->permissions->addEntityPermission($page, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -93,8 +93,8 @@ public function test_31_child_inherit_override_deny()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
-        $this->permissions->addEntityPermission($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -107,8 +107,8 @@ public function test_40_multi_role_inherit_conflict_override_deny()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($page, [], $roleA);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleB);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleB);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -121,8 +121,8 @@ public function test_41_multi_role_inherit_conflict_retain_allow()
         $chapter = $page->chapter;
 
         $this->permissions->disableEntityInheritedPermissions($chapter);
-        $this->permissions->addEntityPermission($page, ['view'], $roleA);
-        $this->permissions->addEntityPermission($chapter, [], $roleB);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleB);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -131,7 +131,7 @@ public function test_50_role_override_allow()
     {
         [$user, $roleA] = $this->users->newUserWithRole();
         $page = $this->entities->page();
-        $this->permissions->addEntityPermission($page, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -140,7 +140,7 @@ public function test_51_role_override_deny()
     {
         [$user, $roleA] = $this->users->newUserWithRole([], ['page-view-all']);
         $page = $this->entities->page();
-        $this->permissions->addEntityPermission($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -150,7 +150,7 @@ public function test_60_inherited_role_override_allow()
         [$user, $roleA] = $this->users->newUserWithRole([], []);
         $page = $this->entities->pageWithinChapter();
         $chapter = $page->chapter;
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -160,7 +160,7 @@ public function test_61_inherited_role_override_deny()
         [$user, $roleA] = $this->users->newUserWithRole([], ['page-view-all']);
         $page = $this->entities->pageWithinChapter();
         $chapter = $page->chapter;
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -170,7 +170,7 @@ public function test_62_inherited_role_override_deny_on_own()
         [$user, $roleA] = $this->users->newUserWithRole([], ['page-view-own']);
         $page = $this->entities->pageWithinChapter();
         $chapter = $page->chapter;
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
         $this->permissions->changeEntityOwner($page, $user);
 
         $this->assertNotVisibleToUser($page, $user);
@@ -182,7 +182,7 @@ public function test_70_multi_role_inheriting_deny()
         $roleB = $this->users->attachNewRole($user);
         $page = $this->entities->page();
 
-        $this->permissions->addEntityPermission($page, [], $roleB);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleB);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -194,7 +194,7 @@ public function test_71_multi_role_inheriting_deny_on_own()
         $page = $this->entities->page();
         $this->permissions->changeEntityOwner($page, $user);
 
-        $this->permissions->addEntityPermission($page, [], $roleB);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleB);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -207,7 +207,7 @@ public function test_75_multi_role_inherited_deny_via_parent()
         $page = $this->entities->pageWithinChapter();
         $chapter = $page->chapter;
 
-        $this->permissions->addEntityPermission($chapter, [], $roleB);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleB);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -220,7 +220,7 @@ public function test_76_multi_role_inherited_deny_via_parent_on_own()
         $chapter = $page->chapter;
         $this->permissions->changeEntityOwner($page, $user);
 
-        $this->permissions->addEntityPermission($chapter, [], $roleB);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleB);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -231,7 +231,7 @@ public function test_80_fallback_override_allow()
         $page = $this->entities->page();
 
         $this->permissions->setFallbackPermissions($page, []);
-        $this->permissions->addEntityPermission($page, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -241,7 +241,7 @@ public function test_81_fallback_override_deny()
         $page = $this->entities->page();
 
         $this->permissions->setFallbackPermissions($page, ['view']);
-        $this->permissions->addEntityPermission($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -253,7 +253,7 @@ public function test_84_fallback_override_allow_multi_role()
         $page = $this->entities->page();
 
         $this->permissions->setFallbackPermissions($page, []);
-        $this->permissions->addEntityPermission($page, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -265,7 +265,7 @@ public function test_85_fallback_override_deny_multi_role()
         $page = $this->entities->page();
 
         $this->permissions->setFallbackPermissions($page, ['view']);
-        $this->permissions->addEntityPermission($page, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($page, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -277,7 +277,7 @@ public function test_86_fallback_override_allow_inherit()
         $chapter = $page->chapter;
 
         $this->permissions->setFallbackPermissions($chapter, []);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -289,7 +289,7 @@ public function test_87_fallback_override_deny_inherit()
         $chapter = $page->chapter;
 
         $this->permissions->setFallbackPermissions($chapter, ['view']);
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -302,7 +302,7 @@ public function test_88_fallback_override_allow_multi_role_inherit()
         $chapter = $page->chapter;
 
         $this->permissions->setFallbackPermissions($chapter, []);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
 
         $this->assertVisibleToUser($page, $user);
     }
@@ -315,7 +315,7 @@ public function test_89_fallback_override_deny_multi_role_inherit()
         $chapter = $page->chapter;
 
         $this->permissions->setFallbackPermissions($chapter, ['view']);
-        $this->permissions->addEntityPermission($chapter, [], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, [], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -328,7 +328,7 @@ public function test_90_fallback_overrides_parent_entity_role_deny()
 
         $this->permissions->setFallbackPermissions($chapter, []);
         $this->permissions->setFallbackPermissions($page, []);
-        $this->permissions->addEntityPermission($chapter, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($chapter, ['view'], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
@@ -342,7 +342,7 @@ public function test_91_fallback_overrides_parent_entity_role_inherit()
 
         $this->permissions->setFallbackPermissions($book, []);
         $this->permissions->setFallbackPermissions($chapter, []);
-        $this->permissions->addEntityPermission($book, ['view'], $roleA);
+        $this->permissions->setEntityPermissionsForRole($book, ['view'], $roleA);
 
         $this->assertNotVisibleToUser($page, $user);
     }
diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 76745aaac72..5b0f5353a7f 100644
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -6,7 +6,6 @@
 use BookStack\Entities\Models\Chapter;
 use BookStack\Permissions\Models\RolePermission;
 use BookStack\Users\Models\Role;
-use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
 
@@ -104,7 +103,7 @@ public function test_public_page_creation()
         $resp->assertRedirect($chapter->book->getUrl('/page/my-guest-page/edit'));
 
         $user = $this->users->guest();
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'name'       => 'My guest page',
             'chapter_id' => $chapter->id,
             'created_by' => $user->id,
@@ -173,7 +172,7 @@ public function test_public_view_can_take_on_other_roles()
         $newRole = $this->users->attachNewRole($this->users->guest(), []);
         $page = $this->entities->page();
         $this->permissions->disableEntityInheritedPermissions($page);
-        $this->permissions->addEntityPermission($page, ['view', 'update'], $newRole);
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $newRole);
 
         $resp = $this->get($page->getUrl());
         $resp->assertOk();
diff --git a/tests/References/ReferencesTest.php b/tests/References/ReferencesTest.php
index f8698d02885..389f164a9ef 100644
--- a/tests/References/ReferencesTest.php
+++ b/tests/References/ReferencesTest.php
@@ -259,7 +259,7 @@ public function test_description_links_from_book_chapter_shelf_updated_on_url_ch
         }
 
         $oldUrl = $shelf->getUrl();
-        $this->put($shelf->getUrl(), ['name' => 'My updated shelf link']);
+        $this->put($shelf->getUrl(), ['name' => 'My updated shelf link'])->assertRedirect();
         $shelf->refresh();
         $this->assertNotEquals($oldUrl, $shelf->getUrl());
 
diff --git a/tests/Search/EntitySearchTest.php b/tests/Search/EntitySearchTest.php
index d3d85998615..7d497b51d86 100644
--- a/tests/Search/EntitySearchTest.php
+++ b/tests/Search/EntitySearchTest.php
@@ -4,6 +4,7 @@
 
 use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class EntitySearchTest extends TestCase
@@ -27,6 +28,20 @@ public function test_bookshelf_search()
         $search->assertSeeText($shelf->name, true);
     }
 
+    public function test_search_shows_pagination()
+    {
+        $search = $this->asEditor()->get('/search?term=a');
+        $this->withHtml($search)->assertLinkExists(url('/search?term=a&page=2'), '2');
+    }
+
+    public function test_pagination_considers_sub_path_url_handling()
+    {
+        $this->runWithEnv(['APP_URL' => 'https://example.com/subpath'], function () {
+            $search = $this->asEditor()->get('https://example.com/search?term=a');
+            $this->withHtml($search)->assertLinkExists('https://example.com/subpath/search?term=a&page=2', '2');
+        });
+    }
+
     public function test_invalid_page_search()
     {
         $resp = $this->asEditor()->get('/search?term=' . urlencode('<p>test</p>'));
@@ -122,17 +137,21 @@ public function test_negated_searches()
         $page->tags()->saveMany([new Tag(['name' => 'DonkCount', 'value' => '500'])]);
         $page->created_by = $this->users->admin()->id;
         $page->save();
+        $otherPage = $this->entities->newPage(['name' => 'A different page in negation tests', 'html' => '<p>A different page in negation tests</p>']);
 
         $editor = $this->users->editor();
         $this->actingAs($editor);
 
         $exactSearch = $this->get('/search?term=' . urlencode('negation -"tortoise"'));
         $exactSearch->assertStatus(200)->assertDontSeeText($page->name);
+        $exactSearch->assertSeeText($otherPage->name);
 
         $tagSearchA = $this->get('/search?term=' . urlencode('negation [DonkCount=500]'));
         $tagSearchA->assertStatus(200)->assertSeeText($page->name);
+        $tagSearchA->assertDontSeeText($otherPage->name);
         $tagSearchB = $this->get('/search?term=' . urlencode('negation -[DonkCount=500]'));
         $tagSearchB->assertStatus(200)->assertDontSeeText($page->name);
+        $tagSearchB->assertSeeText($otherPage->name);
 
         $filterSearchA = $this->get('/search?term=' . urlencode('negation -{created_by:me}'));
         $filterSearchA->assertStatus(200)->assertSeeText($page->name);
@@ -215,6 +234,18 @@ public function test_search_filters()
         $this->get('/search?term=' . urlencode('danzorbhsing {created_before:2037-01-01}'))->assertDontSee($page->name);
     }
 
+    public function test_search_tags_with_unexpected_numeric_values_does_not_cause_error()
+    {
+        $pageA = $this->entities->page();
+        $pageA->name = 'MyTestPageWithAwkwardNumericTagValue';
+        $pageA->save();
+        $pageA->tags()->save(new Tag(['name' => 'Count', 'value' => '1E999']));
+
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('[Count=1E999]'));
+        $resp->assertStatus(200);
+        $resp->assertSee('MyTestPageWithAwkwardNumericTagValue');
+    }
+
     public function test_entity_selector_search()
     {
         $page = $this->entities->newPage(['name' => 'my ajax search test', 'html' => 'ajax test']);
@@ -372,6 +403,21 @@ public function test_match_highlighting_works_with_multibyte_content()
         $search->assertSee('<strong>На</strong> <strong>мен</strong> <strong>ми</strong> <strong>трябва</strong> <strong>нещо</strong> <strong>добро</strong> test', false);
     }
 
+    public function test_match_highlighting_is_efficient_with_large_frequency_in_content()
+    {
+        $content = str_repeat('superbeans ', 10000);
+        $this->entities->newPage([
+            'name' => 'Test Page',
+            'html' => "<p>{$content}</p>",
+        ]);
+
+        $time = microtime(true);
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('superbeans'));
+        $this->assertLessThan(0.5, microtime(true) - $time);
+
+        $resp->assertSee('<strong>superbeans</strong>', false);
+    }
+
     public function test_html_entities_in_item_details_remains_escaped_in_search_results()
     {
         $this->entities->newPage(['name' => 'My <cool> TestPageContent', 'html' => '<p>My supercool &lt;great&gt; TestPageContent page</p>']);
@@ -453,4 +499,16 @@ public function test_search_suggestion_endpoint()
         $this->withHtml($resp)->assertElementCount('a', 0);
         $resp->assertSee('No items available');
     }
+
+    public function test_draft_pages_not_visible_to_others_in_results()
+    {
+        $editor = $this->users->editor();
+        $creator = $this->users->newUser();
+        $creator->roles()->sync([$editor->roles()->first()->id]);
+        $this->actingAs($creator);
+        $page = $this->entities->newDraftPage(['name' => 'Editors draft page', 'html' => '<p>My supercool draft page</p>']);
+
+        $resp = $this->actingAs($editor)->get('/search?term=' . urlencode("{type:page} {created_by:{$creator->slug}}"));
+        $resp->assertDontSee('Editors draft page');
+    }
 }
diff --git a/tests/Search/SearchIndexingTest.php b/tests/Search/SearchIndexingTest.php
index d2bbb2905b4..080ebe08d4b 100644
--- a/tests/Search/SearchIndexingTest.php
+++ b/tests/Search/SearchIndexingTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Search;
 
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
 class SearchIndexingTest extends TestCase
@@ -31,10 +32,9 @@ public function test_terms_in_headers_have_an_adjusted_index_score()
         $this->assertEquals(2, $scoreByTerm->get('TermG'));
     }
 
+    #[Group('slow')]
     public function test_indexing_works_as_expected_for_page_with_lots_of_terms()
     {
-        $this->markTestSkipped('Time consuming test');
-
         $count = 100000;
         $text = '';
         $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_#';
diff --git a/tests/Search/SearchOptionsTest.php b/tests/Search/SearchOptionsTest.php
index 2ebf273dd55..ffd20993560 100644
--- a/tests/Search/SearchOptionsTest.php
+++ b/tests/Search/SearchOptionsTest.php
@@ -35,9 +35,14 @@ public function test_from_string_parses_negations()
 
     public function test_from_string_properly_parses_escaped_quotes()
     {
-        $options = SearchOptions::fromString('"\"cat\"" surprise "\"\"" "\"donkey" "\"" "\\\\"');
+        $options = SearchOptions::fromString('"\"cat\"" surprise');
+        $this->assertEquals(['"cat"'], $options->exacts->toValueArray());
 
-        $this->assertEquals(['"cat"', '""', '"donkey', '"', '\\'], $options->exacts->toValueArray());
+        $options = SearchOptions::fromString('"\"\"" "\"donkey"');
+        $this->assertEquals(['""', '"donkey'], $options->exacts->toValueArray());
+
+        $options = SearchOptions::fromString('"\"" "\\\\"');
+        $this->assertEquals(['"', '\\'], $options->exacts->toValueArray());
     }
 
     public function test_to_string_includes_all_items_in_the_correct_format()
@@ -104,6 +109,7 @@ public function test_it_cannot_parse_out_empty_exacts()
 
     public function test_from_request_properly_parses_exacts_from_search_terms()
     {
+        $this->asEditor();
         $request = new Request([
             'search' => 'biscuits "cheese" "" "baked beans"'
         ]);
@@ -142,4 +148,53 @@ public function test_from_request_properly_parses_out_extras_as_string()
         $this->assertEquals('dino', $options->exacts->all()[0]->value);
         $this->assertTrue($options->exacts->all()[0]->negated);
     }
+
+    public function test_from_string_results_are_count_limited_and_larger_for_logged_in_users()
+    {
+        $terms = [
+            ...array_fill(0, 40, 'cat'),
+            ...array_fill(0, 50, '"bees"'),
+            ...array_fill(0, 50, '{is_template}'),
+            ...array_fill(0, 50, '[a=b]'),
+        ];
+
+        $options = SearchOptions::fromString(implode(' ', $terms));
+
+        $this->assertCount(5, $options->searches->all());
+        $this->assertCount(2, $options->exacts->all());
+        $this->assertCount(4, $options->tags->all());
+        $this->assertCount(5, $options->filters->all());
+
+        $this->asEditor();
+        $options = SearchOptions::fromString(implode(' ', $terms));
+
+        $this->assertCount(10, $options->searches->all());
+        $this->assertCount(4, $options->exacts->all());
+        $this->assertCount(8, $options->tags->all());
+        $this->assertCount(10, $options->filters->all());
+    }
+
+    public function test_from_request_results_are_count_limited_and_larger_for_logged_in_users()
+    {
+        $request = new Request([
+            'search' => str_repeat('hello ', 20),
+            'tags' => array_fill(0, 20, 'a=b'),
+            'extras' => str_repeat('-[b=c] -{viewed_by_me} -"dino"', 20),
+        ]);
+
+        $options = SearchOptions::fromRequest($request);
+
+        $this->assertCount(5, $options->searches->all());
+        $this->assertCount(2, $options->exacts->all());
+        $this->assertCount(4, $options->tags->all());
+        $this->assertCount(5, $options->filters->all());
+
+        $this->asEditor();
+        $options = SearchOptions::fromRequest($request);
+
+        $this->assertCount(10, $options->searches->all());
+        $this->assertCount(4, $options->exacts->all());
+        $this->assertCount(8, $options->tags->all());
+        $this->assertCount(10, $options->filters->all());
+    }
 }
diff --git a/tests/SecurityHeaderTest.php b/tests/SecurityHeaderTest.php
index fe98e32080b..c62dbf35bf9 100644
--- a/tests/SecurityHeaderTest.php
+++ b/tests/SecurityHeaderTest.php
@@ -93,14 +93,14 @@ public function test_script_csp_nonce_changes_per_request()
         $this->assertNotEquals($firstHeader, $secondHeader);
     }
 
-    public function test_allow_content_scripts_settings_controls_csp_script_headers()
+    public function test_content_filtering_config_controls_csp_script_headers()
     {
-        config()->set('app.allow_content_scripts', true);
+        config()->set('app.content_filtering', '');
         $resp = $this->get('/');
         $scriptHeader = $this->getCspHeader($resp, 'script-src');
         $this->assertEmpty($scriptHeader);
 
-        config()->set('app.allow_content_scripts', false);
+        config()->set('app.content_filtering', 'j');
         $resp = $this->get('/');
         $scriptHeader = $this->getCspHeader($resp, 'script-src');
         $this->assertNotEmpty($scriptHeader);
@@ -151,6 +151,96 @@ public function test_frame_src_csp_header_drawio_host_includes_port_if_existing(
         $this->assertEquals('frame-src \'self\' https://example.com https://diagrams.example.com:8080', $scriptHeader);
     }
 
+    public function test_style_src_csp_header_set_to_permissive_defaults_when_not_configured()
+    {
+        config()->set('app.style_sources', null);
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'style-src');
+
+        $this->assertEquals("style-src 'self' 'unsafe-inline' http: https:", $header);
+    }
+
+    public function test_style_src_csp_header_can_be_overridden_by_config()
+    {
+        config()->set('app.style_sources', 'https://fonts.example.com');
+
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'style-src');
+
+        $this->assertEquals("style-src 'self' https://fonts.example.com", $header);
+    }
+
+    public function test_style_src_csp_header_unsafe_inline_value_will_be_auto_quoted()
+    {
+        config()->set('app.style_sources', 'unsafe-inline https://css.example.com');
+
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'style-src');
+
+        $this->assertEquals("style-src 'self' 'unsafe-inline' https://css.example.com", $header);
+    }
+
+    public function test_style_src_can_be_blank_to_set_no_additions()
+    {
+        config()->set('app.style_sources', '');
+
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'style-src');
+
+        $this->assertEquals("style-src 'self'", $header);
+    }
+
+    public function test_img_src_csp_header_set_to_permissive_defaults_when_not_configured()
+    {
+        config()->set('app.image_sources', null);
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'img-src');
+
+        $this->assertEquals("img-src 'self' data: blob: http: https:", $header);
+    }
+
+    public function test_img_src_csp_header_can_be_overridden_by_config()
+    {
+        config()->set('app.image_sources', 'https://images.example.com');
+
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'img-src');
+
+        $this->assertEquals("img-src 'self' blob: data: https://images.example.com", $header);
+    }
+
+    public function test_img_src_can_be_blank_to_set_no_additions()
+    {
+        config()->set('app.image_sources', '');
+        $resp = $this->get('/');
+        $header = $this->getCspHeader($resp, 'img-src');
+
+        $this->assertEquals("img-src 'self' blob: data:", $header);
+    }
+
+    public function test_csp_headers_are_set_on_api_responses()
+    {
+        $resp = $this->asEditor()->get('/api/books');
+        $header = $this->getCspHeader($resp, 'script-src');
+
+        $this->assertStringContainsString('nonce', $header);
+    }
+
+    public function test_csp_headers_for_api_dont_alter_session_config()
+    {
+        $this->runWithEnv(['ALLOWED_IFRAME_HOSTS' => 'http://example.com'], function () {
+            $resp = $this->asEditor()->withCookie('bookstack_session', 'a')->get('/api/books');
+            $cookies = $resp->headers->getCookies();
+            $this->assertGreaterThan(0, count($cookies));
+            foreach ($cookies as $cookie) {
+                $this->assertEquals('lax', $cookie->getSameSite());
+            }
+
+            $header = $this->getCspHeader($resp, 'script-src');
+            $this->assertStringContainsString('nonce', $header);
+        });
+    }
+
     public function test_cache_control_headers_are_set_on_responses()
     {
         // Public access
@@ -173,7 +263,7 @@ protected function getCspHeader(TestResponse $resp, string $type): string
         $cspHeaders = explode('; ', $resp->headers->get('Content-Security-Policy'));
 
         foreach ($cspHeaders as $cspHeader) {
-            if (strpos($cspHeader, $type) === 0) {
+            if (str_starts_with($cspHeader, $type)) {
                 return $cspHeader;
             }
         }
diff --git a/tests/SessionTest.php b/tests/SessionTest.php
new file mode 100644
index 00000000000..3a1300722ff
--- /dev/null
+++ b/tests/SessionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests;
+
+class SessionTest extends TestCase
+{
+    public function test_secure_images_not_tracked_in_session_history()
+    {
+        config()->set('filesystems.images', 'local_secure');
+        $this->asEditor();
+        $page = $this->entities->page();
+        $result = $this->files->uploadGalleryImageToPage($this, $page);
+        $expectedPath = storage_path($result['path']);
+        $this->assertFileExists($expectedPath);
+
+        $this->get('/books');
+        $this->assertEquals(url('/books'), session()->previousUrl());
+
+        $resp = $this->get($result['path']);
+        $resp->assertOk();
+        $resp->assertHeader('Content-Type', 'image/png');
+
+        $this->assertEquals(url('/books'), session()->previousUrl());
+
+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }
+    }
+
+    public function test_pwa_manifest_is_not_tracked_in_session_history()
+    {
+        $this->asEditor()->get('/books');
+        $this->get('/manifest.json');
+
+        $this->assertEquals(url('/books'), session()->previousUrl());
+    }
+
+    public function test_dist_dir_access_is_not_tracked_in_session_history()
+    {
+        $this->asEditor()->get('/books');
+        $this->get('/dist/sub/hello.txt');
+
+        $this->assertEquals(url('/books'), session()->previousUrl());
+    }
+
+    public function test_opensearch_is_not_tracked_in_session_history()
+    {
+        $this->asEditor()->get('/books');
+        $this->get('/opensearch.xml');
+
+        $this->assertEquals(url('/books'), session()->previousUrl());
+    }
+}
diff --git a/tests/Settings/PageListLimitsTest.php b/tests/Settings/PageListLimitsTest.php
new file mode 100644
index 00000000000..0d3dea3e1ea
--- /dev/null
+++ b/tests/Settings/PageListLimitsTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Settings;
+
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use Tests\TestCase;
+
+class PageListLimitsTest extends TestCase
+{
+    public function test_saving_setting_and_loading()
+    {
+        $resp = $this->asAdmin()->post('/settings/sorting', [
+            'setting-lists-page-count-shelves' => '3',
+            'setting-lists-page-count-books' => '6',
+            'setting-lists-page-count-search' => '9',
+        ]);
+        $resp->assertRedirect('/settings/sorting');
+
+        $this->assertEquals(3, setting()->getInteger('lists-page-count-shelves', 18));
+        $this->assertEquals(6, setting()->getInteger('lists-page-count-books', 18));
+        $this->assertEquals(9, setting()->getInteger('lists-page-count-search', 18));
+
+        $resp = $this->get('/settings/sorting');
+        $html = $this->withHtml($resp);
+
+        $html->assertFieldHasValue('setting-lists-page-count-shelves', '3');
+        $html->assertFieldHasValue('setting-lists-page-count-books', '6');
+        $html->assertFieldHasValue('setting-lists-page-count-search', '9');
+    }
+
+    public function test_invalid_counts_will_use_default_when_fetched_as_an_integer()
+    {
+        $this->asAdmin()->post('/settings/sorting', [
+            'setting-lists-page-count-shelves' => 'cat',
+        ]);
+
+        $this->assertEquals(18, setting()->getInteger('lists-page-count-shelves', 18));
+    }
+
+    public function test_shelf_count_is_used_on_shelves_view()
+    {
+        $resp = $this->asAdmin()->get('/shelves');
+        $defaultCount = min(Bookshelf::query()->count(), 18);
+        $this->withHtml($resp)->assertElementCount('main [data-entity-type="bookshelf"]', $defaultCount);
+
+        $this->post('/settings/sorting', [
+            'setting-lists-page-count-shelves' => '1',
+        ]);
+
+        $resp = $this->get('/shelves');
+        $this->withHtml($resp)->assertElementCount('main [data-entity-type="bookshelf"]', 1);
+    }
+
+    public function test_book_count_is_used_on_books_view()
+    {
+        $resp = $this->asAdmin()->get('/books');
+        $defaultCount = min(Book::query()->count(), 18);
+        $this->withHtml($resp)->assertElementCount('main [data-entity-type="book"]', $defaultCount);
+
+        $this->post('/settings/sorting', [
+            'setting-lists-page-count-books' => '1',
+        ]);
+
+        $resp = $this->get('/books');
+        $this->withHtml($resp)->assertElementCount('main [data-entity-type="book"]', 1);
+    }
+
+    public function test_search_count_is_used_on_search_view()
+    {
+        $resp = $this->asAdmin()->get('/search');
+        $this->withHtml($resp)->assertElementCount('.entity-list [data-entity-id]', 18);
+
+        $this->post('/settings/sorting', [
+            'setting-lists-page-count-search' => '1',
+        ]);
+
+        $resp = $this->get('/search');
+        $this->withHtml($resp)->assertElementCount('.entity-list [data-entity-id]', 1);
+    }
+}
diff --git a/tests/Settings/RecycleBinTest.php b/tests/Settings/RecycleBinTest.php
index 33284b4b3ff..9a3dc4cdab3 100644
--- a/tests/Settings/RecycleBinTest.php
+++ b/tests/Settings/RecycleBinTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Settings;
 
 use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Models\Page;
 use Illuminate\Support\Carbon;
@@ -82,10 +83,12 @@ public function test_recycle_bin_empty()
         $emptyReq->assertRedirect('/settings/recycle-bin');
 
         $this->assertTrue(Deletion::query()->count() === 0);
-        $this->assertDatabaseMissing('books', ['id' => $book->id]);
-        $this->assertDatabaseMissing('pages', ['id' => $page->id]);
-        $this->assertDatabaseMissing('pages', ['id' => $book->pages->first()->id]);
-        $this->assertDatabaseMissing('chapters', ['id' => $book->chapters->first()->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $book->id, 'type' => 'book']);
+        $this->assertDatabaseMissing('entity_container_data', ['entity_id' => $book->id, 'entity_type' => 'book']);
+        $this->assertDatabaseMissing('entities', ['id' => $book->pages->first()->id, 'type' => 'page']);
+        $this->assertDatabaseMissing('entity_page_data', ['page_id' => $book->pages->first()->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $book->chapters->first()->id, 'type' => 'chapter']);
+        $this->assertDatabaseMissing('entity_container_data', ['entity_id' => $book->chapters->first()->id, 'entity_type' => 'chapter']);
 
         $itemCount = 2 + $book->pages->count() + $book->chapters->count();
         $redirectReq = $this->get('/settings/recycle-bin');
@@ -95,18 +98,18 @@ public function test_recycle_bin_empty()
     public function test_entity_restore()
     {
         $book = $this->entities->bookHasChaptersAndPages();
-        $this->asEditor()->delete($book->getUrl());
+        $this->asEditor()->delete($book->getUrl())->assertRedirect();
         $deletion = Deletion::query()->firstOrFail();
 
-        $this->assertEquals($book->pages->count(), DB::table('pages')->where('book_id', '=', $book->id)->whereNotNull('deleted_at')->count());
-        $this->assertEquals($book->chapters->count(), DB::table('chapters')->where('book_id', '=', $book->id)->whereNotNull('deleted_at')->count());
+        $this->assertEquals($book->pages->count(), Page::query()->withTrashed()->where('book_id', '=', $book->id)->whereNotNull('deleted_at')->count());
+        $this->assertEquals($book->chapters->count(), Chapter::query()->withTrashed()->where('book_id', '=', $book->id)->whereNotNull('deleted_at')->count());
 
         $restoreReq = $this->asAdmin()->post("/settings/recycle-bin/{$deletion->id}/restore");
         $restoreReq->assertRedirect('/settings/recycle-bin');
         $this->assertTrue(Deletion::query()->count() === 0);
 
-        $this->assertEquals($book->pages->count(), DB::table('pages')->where('book_id', '=', $book->id)->whereNull('deleted_at')->count());
-        $this->assertEquals($book->chapters->count(), DB::table('chapters')->where('book_id', '=', $book->id)->whereNull('deleted_at')->count());
+        $this->assertEquals($book->pages->count(), Page::query()->where('book_id', '=', $book->id)->whereNull('deleted_at')->count());
+        $this->assertEquals($book->chapters->count(), Chapter::query()->where('book_id', '=', $book->id)->whereNull('deleted_at')->count());
 
         $itemCount = 1 + $book->pages->count() + $book->chapters->count();
         $redirectReq = $this->get('/settings/recycle-bin');
@@ -123,9 +126,12 @@ public function test_permanent_delete()
         $deleteReq->assertRedirect('/settings/recycle-bin');
         $this->assertTrue(Deletion::query()->count() === 0);
 
-        $this->assertDatabaseMissing('books', ['id' => $book->id]);
-        $this->assertDatabaseMissing('pages', ['id' => $book->pages->first()->id]);
-        $this->assertDatabaseMissing('chapters', ['id' => $book->chapters->first()->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $book->id, 'type' => 'book']);
+        $this->assertDatabaseMissing('entity_container_data', ['entity_id' => $book->id, 'entity_type' => 'book']);
+        $this->assertDatabaseMissing('entities', ['id' => $book->pages->first()->id, 'type' => 'page']);
+        $this->assertDatabaseMissing('entity_page_data', ['page_id' => $book->pages->first()->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $book->chapters->first()->id, 'type' => 'chapter']);
+        $this->assertDatabaseMissing('entity_container_data', ['entity_id' => $book->chapters->first()->id, 'entity_type' => 'chapter']);
 
         $itemCount = 1 + $book->pages->count() + $book->chapters->count();
         $redirectReq = $this->get('/settings/recycle-bin');
@@ -173,6 +179,34 @@ public function test_permanent_entity_delete_updates_existing_activity_with_enti
         ]);
     }
 
+    public function test_permanent_book_delete_removes_shelf_relation_data()
+    {
+        $book = $this->entities->book();
+        $shelf = $this->entities->shelf();
+        $shelf->books()->attach($book);
+        $this->assertDatabaseHas('bookshelves_books', ['book_id' => $book->id]);
+
+        $this->asEditor()->delete($book->getUrl());
+        $deletion = $book->deletions()->firstOrFail();
+        $this->asAdmin()->delete("/settings/recycle-bin/{$deletion->id}")->assertRedirect();
+
+        $this->assertDatabaseMissing('bookshelves_books', ['book_id' => $book->id]);
+    }
+
+    public function test_permanent_shelf_delete_removes_book_relation_data()
+    {
+        $book = $this->entities->book();
+        $shelf = $this->entities->shelf();
+        $shelf->books()->attach($book);
+        $this->assertDatabaseHas('bookshelves_books', ['bookshelf_id' => $shelf->id]);
+
+        $this->asEditor()->delete($shelf->getUrl());
+        $deletion = $shelf->deletions()->firstOrFail();
+        $this->asAdmin()->delete("/settings/recycle-bin/{$deletion->id}")->assertRedirect();
+
+        $this->assertDatabaseMissing('bookshelves_books', ['bookshelf_id' => $shelf->id]);
+    }
+
     public function test_auto_clear_functionality_works()
     {
         config()->set('app.recycle_bin_lifetime', 5);
@@ -180,14 +214,14 @@ public function test_auto_clear_functionality_works()
         $otherPage = $this->entities->page();
 
         $this->asEditor()->delete($page->getUrl());
-        $this->assertDatabaseHas('pages', ['id' => $page->id]);
+        $this->assertDatabaseHasEntityData('page', ['id' => $page->id]);
         $this->assertEquals(1, Deletion::query()->count());
 
         Carbon::setTestNow(Carbon::now()->addDays(6));
         $this->asEditor()->delete($otherPage->getUrl());
         $this->assertEquals(1, Deletion::query()->count());
 
-        $this->assertDatabaseMissing('pages', ['id' => $page->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $page->id, 'type' => 'page']);
     }
 
     public function test_auto_clear_functionality_with_negative_time_keeps_forever()
@@ -203,7 +237,7 @@ public function test_auto_clear_functionality_with_negative_time_keeps_forever()
         $this->asEditor()->delete($otherPage->getUrl());
         $this->assertEquals(2, Deletion::query()->count());
 
-        $this->assertDatabaseHas('pages', ['id' => $page->id]);
+        $this->assertDatabaseHasEntityData('page', ['id' => $page->id]);
     }
 
     public function test_auto_clear_functionality_with_zero_time_deletes_instantly()
@@ -212,7 +246,7 @@ public function test_auto_clear_functionality_with_zero_time_deletes_instantly()
         $page = $this->entities->page();
 
         $this->asEditor()->delete($page->getUrl());
-        $this->assertDatabaseMissing('pages', ['id' => $page->id]);
+        $this->assertDatabaseMissing('entities', ['id' => $page->id, 'type' => 'page']);
         $this->assertEquals(0, Deletion::query()->count());
     }
 
@@ -262,4 +296,24 @@ public function test_restore_page_shows_link_to_parent_restore_if_parent_also_de
         $pageRestoreView->assertSee('The parent of this item has also been deleted.');
         $this->withHtml($pageRestoreView)->assertElementContains('a[href$="/settings/recycle-bin/' . $bookDeletion->id . '/restore"]', 'Restore Parent');
     }
+
+    public function test_restore_action_rebuilds_permissions_for_entity()
+    {
+        $book = $this->entities->bookHasChaptersAndPages();
+        /** @var Page $page */
+        $page = $book->pages()->first();
+
+        $this->asEditor()->delete($book->getUrl());
+        $bookDeletion = $book->deletions()->first();
+
+        DB::table('joint_permissions')->where('entity_id', '=', $book->id)
+            ->where('entity_type', '=', 'book')->delete();
+        DB::table('joint_permissions')->where('entity_id', '=', $page->id)
+            ->where('entity_type', '=', 'page')->delete();
+
+        $this->asAdmin()->post("/settings/recycle-bin/{$bookDeletion->id}/restore");
+
+        $this->assertDatabaseHas('joint_permissions', ['entity_id' => $book->id, 'entity_type' => 'book']);
+        $this->assertDatabaseHas('joint_permissions', ['entity_id' => $page->id, 'entity_type' => 'page']);
+    }
 }
diff --git a/tests/Settings/SettingsTest.php b/tests/Settings/SettingsTest.php
index 9d45706e77b..a3e65b483c9 100644
--- a/tests/Settings/SettingsTest.php
+++ b/tests/Settings/SettingsTest.php
@@ -101,4 +101,17 @@ public function test_updating_and_removing_app_icon()
             file_get_contents(public_path('favicon.ico')),
         );
     }
+
+    public function test_both_light_and_dark_colors_are_used_in_the_base_view()
+    {
+        // To allow for dynamic color changes on the front-end where desired.
+        $this->setSettings(['page-color' => 'superlightblue', 'page-color-dark' => 'superdarkblue']);
+
+        $resp = $this->get('/login');
+
+        $resp->assertSee(':root {');
+        $resp->assertSee('superlightblue');
+        $resp->assertSee(':root.dark-mode {');
+        $resp->assertSee('superdarkblue');
+    }
 }
diff --git a/tests/Sorting/BookSortTest.php b/tests/Sorting/BookSortTest.php
index 4737ec231b6..33a10609a05 100644
--- a/tests/Sorting/BookSortTest.php
+++ b/tests/Sorting/BookSortTest.php
@@ -66,7 +66,7 @@ public function test_book_sort()
         $sortResp = $this->asEditor()->put($newBook->getUrl() . '/sort', ['sort-tree' => json_encode($reqData)]);
         $sortResp->assertRedirect($newBook->getUrl());
         $sortResp->assertStatus(302);
-        $this->assertDatabaseHas('chapters', [
+        $this->assertDatabaseHasEntityData('chapter', [
             'id'       => $chapterToMove->id,
             'book_id'  => $newBook->id,
             'priority' => 0,
@@ -93,7 +93,7 @@ public function test_book_sort_makes_no_changes_if_new_chapter_does_not_align_wi
         ];
         $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -114,7 +114,7 @@ public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_ch
         ];
         $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -136,7 +136,7 @@ public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_bo
         ];
         $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -158,7 +158,7 @@ public function test_book_sort_makes_no_changes_if_no_update_or_create_permissio
         ];
         $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -180,7 +180,7 @@ public function test_book_sort_makes_no_changes_if_no_update_permissions_on_move
         ];
         $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -202,7 +202,7 @@ public function test_book_sort_makes_no_changes_if_no_delete_permissions_on_move
         ];
         $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
         ]);
     }
@@ -211,7 +211,7 @@ public function test_book_sort_does_not_change_timestamps_on_just_order_changes(
     {
         $book = $this->entities->bookHasChaptersAndPages();
         $chapter = $book->chapters()->first();
-        \DB::table('chapters')->where('id', '=', $chapter->id)->update([
+        Chapter::query()->where('id', '=', $chapter->id)->update([
             'priority' => 10001,
             'updated_at' => \Carbon\Carbon::now()->subYear(5),
         ]);
@@ -271,6 +271,21 @@ public function test_auto_sort_options_shown_on_sort_page()
         $this->withHtml($resp)->assertElementExists('select[name="auto-sort"] option[value="' . $sort->id . '"]');
     }
 
+    public function test_auto_sort_rule_create_hint_shown_on_sort_page()
+    {
+        $book = $this->entities->book();
+        $hintText = 'Auto sort option rules can be created in the "Lists & Sorting" settings area by a user with the relevant permissions.';
+
+        // Admin users see link for creating new rule
+        $resp = $this->asAdmin()->get($book->getUrl('/sort'));
+        $this->withHtml($resp)->assertLinkExists(url('/settings/sorting/rules/new'), 'Create Sort Rule');
+        $resp->assertDontSee($hintText);
+
+        // Non-admin users see help text
+        $resp = $this->asEditor()->get($book->getUrl('/sort'));
+        $resp->assertSee($hintText);
+    }
+
     public function test_auto_sort_option_submit_saves_to_book()
     {
         $sort = SortRule::factory()->create();
@@ -299,7 +314,7 @@ public function test_pages_in_book_show_sorted_by_priority()
         $book = $this->entities->bookHasChaptersAndPages();
         $book->chapters()->forceDelete();
         /** @var Page[] $pages */
-        $pages = $book->pages()->where('chapter_id', '=', 0)->take(2)->get();
+        $pages = $book->pages()->whereNull('chapter_id')->take(2)->get();
         $book->pages()->whereNotIn('id', $pages->pluck('id'))->delete();
 
         $resp = $this->asEditor()->get($book->getUrl());
diff --git a/tests/Sorting/MoveTest.php b/tests/Sorting/MoveTest.php
index 606b23c680f..5a341026bf2 100644
--- a/tests/Sorting/MoveTest.php
+++ b/tests/Sorting/MoveTest.php
@@ -20,7 +20,7 @@ public function test_page_move_into_book()
 
         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
-        ]);
+        ])->assertRedirect();
         $page->refresh();
 
         $movePageResp->assertRedirect($page->getUrl());
diff --git a/tests/Sorting/SortRuleTest.php b/tests/Sorting/SortRuleTest.php
index 4a9d3a7b33f..a6be9beef1f 100644
--- a/tests/Sorting/SortRuleTest.php
+++ b/tests/Sorting/SortRuleTest.php
@@ -142,7 +142,7 @@ public function test_delete_requires_confirmation_if_books_assigned()
         $resp = $this->delete("settings/sorting/rules/{$rule->id}", ['confirm' => 'true']);
         $resp->assertRedirect('/settings/sorting');
         $this->assertDatabaseMissing('sort_rules', ['id' => $rule->id]);
-        $this->assertDatabaseMissing('books', ['sort_rule_id' => $rule->id]);
+        $this->assertDatabaseMissing('entity_container_data', ['sort_rule_id' => $rule->id]);
     }
 
     public function test_page_create_triggers_book_sort()
@@ -159,7 +159,7 @@ public function test_page_create_triggers_book_sort()
         ]);
         $resp->assertOk();
 
-        $this->assertDatabaseHas('pages', [
+        $this->assertDatabaseHasEntityData('page', [
             'book_id' => $book->id,
             'name' => '1111 page',
             'priority' => $book->chapters()->count() + 1,
@@ -217,7 +217,7 @@ public function test_name_alphabetical_ordering()
         }
 
         foreach ($namesToAdd as $index => $name) {
-            $this->assertDatabaseHas('pages', [
+            $this->assertDatabaseHasEntityData('page', [
                 'book_id' => $book->id,
                 'name' => $name,
                 'priority' => $index + 1,
@@ -251,7 +251,7 @@ public function test_name_numeric_ordering()
         }
 
         foreach ($namesToAdd as $index => $name) {
-            $this->assertDatabaseHas('pages', [
+            $this->assertDatabaseHasEntityData('page', [
                 'book_id' => $book->id,
                 'name' => $name,
                 'priority' => $index + 1,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index a8636fb158e..12ad917d513 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,15 +6,19 @@
 use BookStack\Http\HttpClientHistory;
 use BookStack\Http\HttpRequestService;
 use BookStack\Settings\SettingService;
-use BookStack\Users\Models\User;
+use Exception;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Testing\Assert as PHPUnit;
+use Illuminate\Testing\Constraints\HasInDatabase;
+use Mockery;
+use Mockery\MockInterface;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Ssddanbrown\AssertHtml\TestsHtml;
@@ -104,6 +108,19 @@ protected function setSettings(array $settingsArray): void
         }
     }
 
+    /**
+     * Creates a partial mock of the given service class from a default
+     * container resolved instance. Compared to the default $this->partialMock function,
+     * this resolves mock of a service with its dependencies resolved from the container.
+     */
+    protected function partialMockService(string $service): MockInterface
+    {
+        $realService = app($service);
+        $serviceMock = Mockery::mock($realService)->makePartial();
+        $this->instance($service, $serviceMock);
+        return $serviceMock;
+    }
+
     /**
      * Mock the http client used in BookStack http calls.
      */
@@ -156,6 +173,23 @@ protected function runWithEnv(array $valuesByKey, callable $callback, bool $hand
         }
     }
 
+    protected function usingThemeFolder(callable $callback): void
+    {
+        // Create a folder and configure a theme
+        $themeFolderName = 'testing_theme_' . str_shuffle(rtrim(base64_encode(time()), '='));
+        config()->set('view.theme', $themeFolderName);
+        $themeFolderPath = theme_path('');
+
+        // Create a theme folder and clean it up on application tear-down
+        File::makeDirectory($themeFolderPath);
+        $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));
+
+        // Run provided callback with the theme env option set
+        $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {
+            call_user_func($callback, $themeFolderName);
+        });
+    }
+
     /**
      * Check the keys and properties in the given map to include
      * exist, albeit not exclusively, within the map to check.
@@ -198,7 +232,7 @@ private function isPermissionError($response): bool
     {
         if ($response->status() === 403 && $response instanceof JsonResponse) {
             $errMessage = $response->getData(true)['error']['message'] ?? '';
-            return $errMessage === 'You do not have permission to perform the requested action.';
+            return str_contains($errMessage, 'do not have permission');
         }
 
         return $response->status() === 302
@@ -267,4 +301,42 @@ protected function assertActivityExists(string $type, ?Entity $entity = null, st
 
         $this->assertDatabaseHas('activities', $detailsToCheck);
     }
+
+    /**
+     * Assert the database has the given data for an entity type.
+     */
+    protected function assertDatabaseHasEntityData(string $type, array $data = []): self
+    {
+        $entityFields = array_intersect_key($data, array_flip(Entity::$commonFields));
+        $extraFields = array_diff_key($data, $entityFields);
+        $extraTable = $type === 'page' ? 'entity_page_data' : 'entity_container_data';
+        $entityFields['type'] = $type;
+
+        $this->assertThat(
+            $this->getTable('entities'),
+            new HasInDatabase($this->getConnection(null, 'entities'), $entityFields)
+        );
+
+        if (!empty($extraFields)) {
+            $id = $entityFields['id'] ?? DB::table($this->getTable('entities'))
+                ->where($entityFields)->orderByDesc('id')->first()->id ?? null;
+            if (is_null($id)) {
+                throw new Exception('Failed to find entity id for asserting database data');
+            }
+
+            if ($type !== 'page') {
+                $extraFields['entity_id'] = $id;
+                $extraFields['entity_type'] = $type;
+            } else {
+                $extraFields['page_id'] = $id;
+            }
+
+            $this->assertThat(
+                $this->getTable($extraTable),
+                new HasInDatabase($this->getConnection(null, $extraTable), $extraFields)
+            );
+        }
+
+        return $this;
+    }
 }
diff --git a/tests/Theme/LogicalThemeEventsTest.php b/tests/Theme/LogicalThemeEventsTest.php
new file mode 100644
index 00000000000..fcfc619a384
--- /dev/null
+++ b/tests/Theme/LogicalThemeEventsTest.php
@@ -0,0 +1,441 @@
+<?php
+
+namespace Tests\Theme;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\DispatchWebhookJob;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use League\CommonMark\Environment\Environment;
+use Tests\TestCase;
+
+class LogicalThemeEventsTest extends TestCase
+{
+    public function test_commonmark_environment_configure()
+    {
+        $callbackCalled = false;
+        $callback = function ($environment) use (&$callbackCalled) {
+            $this->assertInstanceOf(Environment::class, $environment);
+            $callbackCalled = true;
+
+            return $environment;
+        };
+        Theme::listen(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $callback);
+
+        $page = $this->entities->page();
+        $content = new PageContent($page);
+        $content->setNewMarkdown('# test', $this->users->editor());
+
+        $this->assertTrue($callbackCalled);
+    }
+
+    public function test_web_middleware_before()
+    {
+        $callbackCalled = false;
+        $requestParam = null;
+        $callback = function ($request) use (&$callbackCalled, &$requestParam) {
+            $requestParam = $request;
+            $callbackCalled = true;
+        };
+
+        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_BEFORE, $callback);
+        $this->get('/login', ['Donkey' => 'cat']);
+
+        $this->assertTrue($callbackCalled);
+        $this->assertInstanceOf(Request::class, $requestParam);
+        $this->assertEquals('cat', $requestParam->header('donkey'));
+    }
+
+    public function test_web_middleware_before_return_val_used_as_response()
+    {
+        $callback = function (Request $request) {
+            return response('cat', 412);
+        };
+
+        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_BEFORE, $callback);
+        $resp = $this->get('/login', ['Donkey' => 'cat']);
+        $resp->assertSee('cat');
+        $resp->assertStatus(412);
+    }
+
+    public function test_web_middleware_after()
+    {
+        $callbackCalled = false;
+        $requestParam = null;
+        $responseParam = null;
+        $callback = function ($request, Response $response) use (&$callbackCalled, &$requestParam, &$responseParam) {
+            $requestParam = $request;
+            $responseParam = $response;
+            $callbackCalled = true;
+            $response->header('donkey', 'cat123');
+        };
+
+        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_AFTER, $callback);
+
+        $resp = $this->get('/login', ['Donkey' => 'cat']);
+        $this->assertTrue($callbackCalled);
+        $this->assertInstanceOf(Request::class, $requestParam);
+        $this->assertInstanceOf(Response::class, $responseParam);
+        $resp->assertHeader('donkey', 'cat123');
+    }
+
+    public function test_web_middleware_after_return_val_used_as_response()
+    {
+        $callback = function () {
+            return response('cat456', 443);
+        };
+
+        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_AFTER, $callback);
+
+        $resp = $this->get('/login', ['Donkey' => 'cat']);
+        $resp->assertSee('cat456');
+        $resp->assertStatus(443);
+    }
+
+    public function test_auth_login_standard()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+
+        Theme::listen(ThemeEvents::AUTH_LOGIN, $callback);
+        $this->post('/login', ['email' => 'admin@admin.com', 'password' => 'password']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals('standard', $args[0]);
+        $this->assertInstanceOf(User::class, $args[1]);
+    }
+
+    public function test_auth_register_standard()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+        Theme::listen(ThemeEvents::AUTH_REGISTER, $callback);
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $user = User::factory()->make();
+        $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals('standard', $args[0]);
+        $this->assertInstanceOf(User::class, $args[1]);
+    }
+
+    public function test_auth_pre_register()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $user = User::factory()->make();
+        $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals('standard', $args[0]);
+        $this->assertEquals([
+            'email' => $user->email,
+            'name' => $user->name,
+            'password' => 'password',
+        ], $args[1]);
+        $this->assertDatabaseHas('users', ['email' => $user->email]);
+    }
+
+    public function test_auth_pre_register_with_false_return_blocks_registration()
+    {
+        $callback = function () {
+            return false;
+        };
+        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $user = User::factory()->make();
+        $resp = $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
+        $resp->assertRedirect('/login');
+        $this->assertSessionError('User account could not be registered for the provided details');
+        $this->assertDatabaseMissing('users', ['email' => $user->email]);
+    }
+
+    public function test_webhook_call_before()
+    {
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+
+            return ['test' => 'hello!'];
+        };
+        Theme::listen(ThemeEvents::WEBHOOK_CALL_BEFORE, $callback);
+
+        $responses = $this->mockHttpClient([new \GuzzleHttp\Psr7\Response(200, [], '')]);
+
+        $webhook = new Webhook(['name' => 'Test webhook', 'endpoint' => 'https://example.com']);
+        $webhook->save();
+        $event = ActivityType::PAGE_UPDATE;
+        $detail = Page::query()->first();
+
+        dispatch((new DispatchWebhookJob($webhook, $event, $detail)));
+
+        $this->assertCount(5, $args);
+        $this->assertEquals($event, $args[0]);
+        $this->assertEquals($webhook->id, $args[1]->id);
+        $this->assertEquals($detail->id, $args[2]->id);
+
+        $this->assertEquals(1, $responses->requestCount());
+        $request = $responses->latestRequest();
+        $reqData = json_decode($request->getBody(), true);
+        $this->assertEquals('hello!', $reqData['test']);
+    }
+
+    public function test_activity_logged()
+    {
+        $book = $this->entities->book();
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+
+        Theme::listen(ThemeEvents::ACTIVITY_LOGGED, $callback);
+        $this->asEditor()->put($book->getUrl(), ['name' => 'My cool update book!']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals(ActivityType::BOOK_UPDATE, $args[0]);
+        $this->assertTrue($args[1] instanceof Book);
+        $this->assertEquals($book->id, $args[1]->id);
+    }
+
+    public function test_page_content_pre_store_fires_on_page_save()
+    {
+        $page = $this->entities->page();
+
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+            return '<p>New Content!</p>';
+        };
+
+        Theme::listen(ThemeEvents::PAGE_CONTENT_PRE_STORE, $callback);
+
+        $this->asEditor();
+        $this->entities->updatePage($page, ['name' => 'My cool update page!', 'html' => '<p>Old content!</p>']);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals($page->id, $args[1]->id);
+        $this->assertEquals('<p id="bkmrk-old-content%21">Old content!</p>', $args[0]);
+
+        $newPageHtml = $page->refresh()->html;
+        $this->assertEquals('<p>New Content!</p>', $newPageHtml);
+    }
+
+    public function test_page_content_pre_store_does_not_change_content_if_nothing_returned()
+    {
+        $page = $this->entities->page();
+        Theme::listen(ThemeEvents::PAGE_CONTENT_PRE_STORE, fn() => null);
+
+        $this->asEditor();
+        $this->entities->updatePage($page, ['name' => 'My cool update page!', 'html' => '<p>Old content!</p>']);
+
+        $newPageHtml = $page->refresh()->html;
+        $this->assertEquals('<p id="bkmrk-old-content%21">Old content!</p>', $newPageHtml);
+    }
+
+    public function test_page_content_post_render_fires_on_page_view()
+    {
+        $page = $this->entities->page();
+        $page->html = '<p>Old content!</p>';
+        $page->save();
+
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+            return '<p>New postrendercontentforyou!</p>';
+        };
+
+        Theme::listen(ThemeEvents::PAGE_CONTENT_POST_RENDER, $callback);
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertSee('<p>New postrendercontentforyou!</p>', false);
+
+        $this->assertCount(2, $args);
+        $this->assertEquals($page->id, $args[1]->id);
+        $this->assertEquals('<p>Old content!</p>', $args[0]);
+    }
+
+    public function test_page_content_post_render_returns_original_content_if_no_return()
+    {
+        $page = $this->entities->page();
+        $page->html = '<p>Old content!</p>';
+        $page->save();
+
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+        };
+
+        Theme::listen(ThemeEvents::PAGE_CONTENT_POST_RENDER, $callback);
+
+        $resp = $this->asEditor()->get($page->getUrl());
+        $resp->assertSee('<p>Old content!</p>', false);
+
+        $this->assertCount(2, $args);
+    }
+
+    public function test_page_include_parse()
+    {
+        /** @var Page $page */
+        /** @var Page $otherPage */
+        $page = $this->entities->page();
+        $otherPage = Page::query()->where('id', '!=', $page->id)->first();
+        $otherPage->html = '<p id="bkmrk-cool">This is a really cool section</p>';
+        $page->html = "<p>{{@{$otherPage->id}#bkmrk-cool}}</p>";
+        $page->save();
+        $otherPage->save();
+
+        $args = [];
+        $callback = function (...$eventArgs) use (&$args) {
+            $args = $eventArgs;
+
+            return '<strong>Big &amp; content replace surprise!</strong>';
+        };
+
+        Theme::listen(ThemeEvents::PAGE_INCLUDE_PARSE, $callback);
+        $resp = $this->asEditor()->get($page->getUrl());
+        $this->withHtml($resp)->assertElementContains('.page-content strong', 'Big & content replace surprise!');
+
+        $this->assertCount(4, $args);
+        $this->assertEquals($otherPage->id . '#bkmrk-cool', $args[0]);
+        $this->assertEquals('This is a really cool section', $args[1]);
+        $this->assertTrue($args[2] instanceof Page);
+        $this->assertTrue($args[3] instanceof Page);
+        $this->assertEquals($page->id, $args[2]->id);
+        $this->assertEquals($otherPage->id, $args[3]->id);
+    }
+
+    public function test_routes_register_web_and_web_auth()
+    {
+        $functionsContent = <<<'END'
+<?php
+use BookStack\Theming\ThemeEvents;
+use BookStack\Facades\Theme;
+use Illuminate\Routing\Router;
+Theme::listen(ThemeEvents::ROUTES_REGISTER_WEB, function (Router $router) {
+    $router->get('/cat', fn () => 'cat')->name('say.cat');
+});
+Theme::listen(ThemeEvents::ROUTES_REGISTER_WEB_AUTH, function (Router $router) {
+    $router->get('/dog', fn () => 'dog')->name('say.dog');
+});
+END;
+
+        $this->usingThemeFolder(function () use ($functionsContent) {
+
+            $functionsFile = theme_path('functions.php');
+            file_put_contents($functionsFile, $functionsContent);
+
+            $app = $this->createApplication();
+            /** @var \Illuminate\Routing\Router $router */
+            $router = $app->get('router');
+
+            /** @var \Illuminate\Routing\Route $catRoute */
+            $catRoute = $router->getRoutes()->getRoutesByName()['say.cat'];
+            $this->assertEquals(['web'], $catRoute->middleware());
+
+            /** @var \Illuminate\Routing\Route $dogRoute */
+            $dogRoute = $router->getRoutes()->getRoutesByName()['say.dog'];
+            $this->assertEquals(['web', 'auth'], $dogRoute->middleware());
+        });
+    }
+
+    public function test_register_views_to_insert_views_before_and_after()
+    {
+        $this->usingThemeFolder(function (string $folder) {
+            $before = 'this-is-my-before-header-string';
+            $afterA = 'this-is-my-after-header-string-a';
+            $afterB = 'this-is-my-after-header-string-b';
+            $afterC = 'this-is-my-after-header-string-{{ 1+51 }}';
+
+            $functionsContent = <<<'CONTENT'
+<?php use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\Theming\ThemeViews;
+Theme::listen(ThemeEvents::THEME_REGISTER_VIEWS, function (ThemeViews $themeViews) {
+    $themeViews->renderBefore('layouts.parts.header', 'before', 4);
+    $themeViews->renderAfter('layouts.parts.header', 'after-a', 4);
+    $themeViews->renderAfter('layouts.parts.header', 'after-b', 1);
+    $themeViews->renderAfter('layouts.parts.header', 'after-c', 12);
+});
+CONTENT;
+
+            $viewDir = theme_path();
+            file_put_contents($viewDir . '/functions.php', $functionsContent);
+            file_put_contents($viewDir . '/before.blade.php', $before);
+            file_put_contents($viewDir . '/after-a.blade.php', $afterA);
+            file_put_contents($viewDir . '/after-b.blade.php', $afterB);
+            file_put_contents($viewDir . '/after-c.blade.php', $afterC);
+
+            $this->refreshApplication();
+            $this->artisan('view:clear');
+
+            $resp = $this->get('/login');
+            $resp->assertSee($before);
+            // Ensure ordering of the multiple after views
+            $resp->assertSee($afterB . "\n" . $afterA . "\nthis-is-my-after-header-string-52");
+        });
+
+        $this->artisan('view:clear');
+    }
+
+    public function test_view_blocks_register_event()
+    {
+        $this->usingThemeFolder(function (string $folder) {
+            $functionsContent = <<<'CONTENT'
+<?php
+use BookStack\Facades\Theme;
+use BookStack\Theming\ThemeEvents;
+use BookStack\View\ViewBlockManager;
+use BookStack\View\BaseViewBlock;
+class CustomViewBlock extends BaseViewBlock {
+    public static function getId(): string
+    {
+        return 'custom_view';
+    }
+    public static function getLabel(): string
+    {
+        return 'My custom view block';
+    }
+    public function getView(array $viewData): string
+    {
+        return 'custom-block';
+    }
+    public function getViewData(array $viewData): array
+    {
+        return [];
+    }
+}
+Theme::listen(ThemeEvents::VIEW_BLOCKS_REGISTER, function (ViewBlockManager $manager) {
+    $manager->register('home-default', 'right', CustomViewBlock::class);
+});
+CONTENT;
+
+            $viewDir = theme_path();
+            file_put_contents($viewDir . '/functions.php', $functionsContent);
+            file_put_contents($viewDir . '/custom-block.blade.php', '<h2>Hello there from my custom home block!</h2>');
+
+            $this->refreshApplication();
+            $resp = $this->asEditor()->get('/');
+            $html = $this->withHtml($resp);
+
+            $html->assertElementContains('.grid > div:nth-child(3) h2', 'Hello there from my custom home block!');
+        });
+    }
+}
diff --git a/tests/Theme/LogicalThemeTest.php b/tests/Theme/LogicalThemeTest.php
new file mode 100644
index 00000000000..feb1c7ea78a
--- /dev/null
+++ b/tests/Theme/LogicalThemeTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Tests\Theme;
+
+use BookStack\Exceptions\ThemeException;
+use BookStack\Facades\Theme;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Tests\TestCase;
+
+class LogicalThemeTest extends TestCase
+{
+    public function test_theme_functions_file_used_and_app_boot_event_runs()
+    {
+        $this->usingThemeFolder(function ($themeFolder) {
+            $functionsFile = theme_path('functions.php');
+            app()->alias('cat', 'dog');
+            file_put_contents($functionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");
+            $this->runWithEnv(['APP_THEME' => $themeFolder], function () {
+                $this->assertEquals('cat', $this->app->getAlias('dog'));
+            });
+        });
+    }
+
+    public function test_theme_functions_loads_errors_are_caught_and_logged()
+    {
+        $this->usingThemeFolder(function ($themeFolder) {
+            $functionsFile = theme_path('functions.php');
+            file_put_contents($functionsFile, "<?php\n\\BookStack\\Biscuits::eat();");
+
+            $this->expectException(ThemeException::class);
+            $this->expectExceptionMessageMatches('/Failed loading theme functions file at ".*?" with error: Class "BookStack\\\\Biscuits" not found/');
+
+            $this->runWithEnv(['APP_THEME' => $themeFolder], fn() => null);
+        });
+    }
+
+    public function test_add_social_driver()
+    {
+        Theme::addSocialDriver('catnet', [
+            'client_id'     => 'abc123',
+            'client_secret' => 'def456',
+        ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');
+
+        $this->assertEquals('catnet', config('services.catnet.name'));
+        $this->assertEquals('abc123', config('services.catnet.client_id'));
+        $this->assertEquals(url('/login/service/catnet/callback'), config('services.catnet.redirect'));
+
+        $loginResp = $this->get('/login');
+        $loginResp->assertSee('login/service/catnet');
+    }
+
+    public function test_add_social_driver_uses_name_in_config_if_given()
+    {
+        Theme::addSocialDriver('catnet', [
+            'client_id'     => 'abc123',
+            'client_secret' => 'def456',
+            'name'          => 'Super Cat Name',
+        ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');
+
+        $this->assertEquals('Super Cat Name', config('services.catnet.name'));
+        $loginResp = $this->get('/login');
+        $loginResp->assertSee('Super Cat Name');
+    }
+
+    public function test_add_social_driver_allows_a_configure_for_redirect_callback_to_be_passed()
+    {
+        Theme::addSocialDriver(
+            'discord',
+            [
+                'client_id'     => 'abc123',
+                'client_secret' => 'def456',
+                'name'          => 'Super Cat Name',
+            ],
+            'SocialiteProviders\Discord\DiscordExtendSocialite@handle',
+            function ($driver) {
+                $driver->with(['donkey' => 'donut']);
+            }
+        );
+
+        $loginResp = $this->get('/login/service/discord');
+        $redirect = $loginResp->headers->get('location');
+        $this->assertStringContainsString('donkey=donut', $redirect);
+    }
+
+    public function test_register_command_allows_provided_command_to_be_usable_via_artisan()
+    {
+        Theme::registerCommand(new MyCustomCommand());
+
+        Artisan::call('bookstack:test-custom-command', []);
+        $output = Artisan::output();
+
+        $this->assertStringContainsString('Command ran!', $output);
+    }
+}
+
+class MyCustomCommand extends Command
+{
+    protected $signature = 'bookstack:test-custom-command';
+
+    public function handle()
+    {
+        $this->line('Command ran!');
+    }
+}
diff --git a/tests/Theme/ThemeModuleTest.php b/tests/Theme/ThemeModuleTest.php
new file mode 100644
index 00000000000..d1c7225b6af
--- /dev/null
+++ b/tests/Theme/ThemeModuleTest.php
@@ -0,0 +1,254 @@
+<?php
+
+namespace Tests\Theme;
+
+use BookStack\Facades\Theme;
+use BookStack\Util\CspService;
+use Tests\TestCase;
+
+class ThemeModuleTest extends TestCase
+{
+    public function test_modules_loaded_on_theme_load()
+    {
+        $this->usingThemeFolder(function ($themeFolder) {
+            $a = theme_path('modules/a');
+            $b = theme_path('modules/b');
+            mkdir($a, 0777, true);
+            mkdir($b, 0777, true);
+
+            file_put_contents($a . '/bookstack-module.json', json_encode([
+                'name' => 'Module A',
+                'description' => 'This is module A',
+                'version' => '1.0.0',
+            ]));
+            file_put_contents($b . '/bookstack-module.json', json_encode([
+                'name' => 'Module B',
+                'description' => 'This is module B',
+                'version' => 'v0.5.0',
+            ]));
+
+            $this->refreshApplication();
+
+            $modules = Theme::getModules();
+            $this->assertCount(2, $modules);
+
+            $moduleA = $modules['a'];
+            $this->assertEquals('Module A', $moduleA->name);
+            $this->assertEquals('This is module A', $moduleA->description);
+            $this->assertEquals('1.0.0', $moduleA->version);
+        });
+    }
+
+    public function test_module_not_loaded_if_no_bookstack_module_json()
+    {
+        $this->usingThemeFolder(function ($themeFolder) {
+            $moduleDir = theme_path('/modules/a');
+            mkdir($moduleDir, 0777, true);
+            file_put_contents($moduleDir . '/module.json', '{}');
+            $this->refreshApplication();
+            $modules = Theme::getModules();
+            $this->assertCount(0, $modules);
+        });
+    }
+
+    public function test_language_text_overridable_via_module()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $translationPath = $moduleFolderPath . '/lang/en';
+            mkdir($translationPath, 0777, true);
+            file_put_contents($translationPath . '/entities.php', '<?php return ["books" => "SuperBeans"];');
+            $this->refreshApplication();
+
+            $this->asAdmin()->get('/books')->assertSee('SuperBeans');
+        });
+    }
+
+    public function test_language_files_merge_with_theme_files_with_theme_taking_precedence()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $moduleTranslationPath = $moduleFolderPath . '/lang/en';
+            mkdir($moduleTranslationPath, 0777, true);
+            file_put_contents($moduleTranslationPath . '/entities.php', '<?php return ["books" => "SuperBeans", "recently_viewed" => "ViewedBiscuits"];');
+
+            $themeTranslationPath = theme_path('lang/en');
+            mkdir($themeTranslationPath, 0777, true);
+            file_put_contents($themeTranslationPath . '/entities.php', '<?php return ["books" => "WonderBeans"];');
+            $this->refreshApplication();
+
+            $this->asAdmin()->get('/books')
+                ->assertSee('WonderBeans')
+                ->assertDontSee('SuperBeans')
+                ->assertSee('ViewedBiscuits');
+        });
+    }
+
+    public function test_view_files_overridable_from_module()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $viewsFolder = $moduleFolderPath . '/views/layouts/parts';
+            mkdir($viewsFolder, 0777, true);
+            file_put_contents($viewsFolder . '/header.blade.php', 'My custom header that says badgerriffic');
+            $this->refreshApplication();
+            $this->asAdmin()->get('/')->assertSee('badgerriffic');
+        });
+    }
+
+    public function test_theme_view_files_take_precedence_over_module_view_files()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $viewsFolder = $moduleFolderPath . '/views/layouts/parts';
+            mkdir($viewsFolder, 0777, true);
+            file_put_contents($viewsFolder . '/header.blade.php', 'My custom header that says badgerriffic');
+
+            $themeViewsFolder = theme_path('layouts/parts');
+            mkdir($themeViewsFolder, 0777, true);
+            file_put_contents($themeViewsFolder . '/header.blade.php', 'My theme header that says awesomeferrets');
+
+            $this->refreshApplication();
+            $this->asAdmin()->get('/')
+                ->assertDontSee('badgerriffic')
+                ->assertSee('awesomeferrets');
+        });
+    }
+
+    public function test_theme_and_modules_views_can_be_used_at_the_same_time()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $viewsFolder = $moduleFolderPath . '/views/layouts/parts';
+            mkdir($viewsFolder, 0777, true);
+            file_put_contents($viewsFolder . '/base-body-start.blade.php', 'My custom header that says badgerriffic');
+
+            $themeViewsFolder = theme_path('layouts/parts');
+            mkdir($themeViewsFolder, 0777, true);
+            file_put_contents($themeViewsFolder . '/base-body-end.blade.php', 'My theme header that says awesomeferrets');
+
+            $this->refreshApplication();
+            $this->asAdmin()->get('/')
+                ->assertSee('badgerriffic')
+                ->assertSee('awesomeferrets');
+        });
+    }
+
+    public function test_icons_can_be_overridden_from_module()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $iconsFolder = $moduleFolderPath . '/icons';
+            mkdir($iconsFolder, 0777, true);
+            file_put_contents($iconsFolder . '/books.svg', '<svg><path d="supericonpath"/></svg>');
+            $this->refreshApplication();
+
+            $this->asAdmin()->get('/')->assertSee('supericonpath', false);
+        });
+    }
+
+    public function test_theme_icons_take_precedence_over_module_icons()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $iconsFolder = $moduleFolderPath . '/icons';
+            mkdir($iconsFolder, 0777, true);
+            file_put_contents($iconsFolder . '/books.svg', '<svg><path d="supericonpath"/></svg>');
+            $this->refreshApplication();
+
+            $themeViewsFolder = theme_path('icons');
+            mkdir($themeViewsFolder, 0777, true);
+            file_put_contents($themeViewsFolder . '/books.svg', '<svg><path d="wackyiconpath"/></svg>');
+
+
+            $this->asAdmin()->get('/')
+                ->assertSee('wackyiconpath', false)
+                ->assertDontSee('supericonpath', false);
+        });
+    }
+
+    public function test_public_folder_can_be_provided_from_module()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $publicFolder = $moduleFolderPath . '/public';
+            mkdir($publicFolder, 0777, true);
+            $themeName = basename(dirname(dirname($moduleFolderPath)));
+            file_put_contents($publicFolder . '/test.txt', 'hellofrominsidethisfileimaghostwoooo!');
+            $this->refreshApplication();
+
+            $resp = $this->asAdmin()->get("/theme/{$themeName}/test.txt")->streamedContent();
+            $this->assertEquals('hellofrominsidethisfileimaghostwoooo!', $resp);
+        });
+    }
+
+    public function test_theme_public_files_take_precedence_over_modules()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            $publicFolder = $moduleFolderPath . '/public';
+            mkdir($publicFolder, 0777, true);
+            $themeName = basename(theme_path());
+            file_put_contents($publicFolder . '/test.txt', 'hellofrominsidethisfileimaghostwoooo!');
+
+            $themePublicFolder = theme_path('public');
+            mkdir($themePublicFolder, 0777, true);
+            file_put_contents($themePublicFolder . '/test.txt', 'imadifferentghostinsidethetheme,woooooo!');
+
+            $this->refreshApplication();
+
+            $resp = $this->asAdmin()->get("/theme/{$themeName}/test.txt")->streamedContent();
+            $this->assertEquals('imadifferentghostinsidethetheme,woooooo!', $resp);
+        });
+    }
+
+    public function test_logical_functions_file_loaded_from_module_and_it_runs_alongside_theme_functions()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            file_put_contents($moduleFolderPath . '/functions.php', "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");
+
+            $themeFunctionsFile = theme_path('functions.php');
+            file_put_contents($themeFunctionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('beans', 'cheese');});");
+
+            $this->refreshApplication();
+
+            $this->assertEquals('cat', $this->app->getAlias('dog'));
+            $this->assertEquals('beans', $this->app->getAlias('cheese'));
+        });
+    }
+
+    public function test_module_can_use_theme_view_render_functions()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            file_put_contents($moduleFolderPath . '/functions.php', "<?php\n\BookStack\Facades\Theme::listen(\BookStack\Theming\ThemeEvents::THEME_REGISTER_VIEWS, fn(\$views) => \$views->renderBefore('layouts.parts.header', 'cat', 100));");
+            mkdir($moduleFolderPath . '/views', 0777, true);
+            file_put_contents($moduleFolderPath . '/views/cat.blade.php', 'mysupercatispouncy');
+
+            $this->refreshApplication();
+
+            $this->asAdmin()->get('/')->assertSee('mysupercatispouncy');
+        });
+    }
+
+    public function test_module_can_provide_head_content()
+    {
+        $this->usingModuleFolder(function (string $moduleFolderPath) {
+            mkdir($moduleFolderPath . '/head', 0777, true);
+            file_put_contents($moduleFolderPath . '/head/hello.html', '<meta name="beans" content="hello"><script>hellofromcustomscript</script>');
+
+            $this->refreshApplication();
+
+            $cspService = $this->app->make(CspService::class);
+            $nonce = $cspService->getNonce();
+
+            $resp = $this->asAdmin()->get('/');
+            $resp->assertSee('<meta name="beans" content="hello">', false);
+            $resp->assertSee('<script nonce="' . $nonce . '">hellofromcustomscript</script>', false);
+        });
+    }
+
+    protected function usingModuleFolder(callable $callback): void
+    {
+        $this->usingThemeFolder(function (string $themeFolder) use ($callback) {
+            $moduleFolderPath = theme_path('modules/test-module');
+            mkdir($moduleFolderPath, 0777, true);
+            file_put_contents($moduleFolderPath . '/bookstack-module.json', json_encode([
+                'name' => 'Test Module',
+                'description' => 'This is a test module',
+                'version' => 'v1.0.0',
+            ]));
+            $callback($moduleFolderPath);
+        });
+    }
+}
diff --git a/tests/Theme/VisualThemeTest.php b/tests/Theme/VisualThemeTest.php
new file mode 100644
index 00000000000..c06807d7fd0
--- /dev/null
+++ b/tests/Theme/VisualThemeTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Tests\Theme;
+
+use Illuminate\Support\Facades\File;
+use Tests\TestCase;
+
+class VisualThemeTest extends TestCase
+{
+    public function test_translation_text_can_be_overridden_via_theme()
+    {
+        $this->usingThemeFolder(function () {
+            $translationPath = theme_path('/lang/en');
+            File::makeDirectory($translationPath, 0777, true);
+
+            $customTranslations = '<?php
+            return [\'books\' => \'Sandwiches\'];
+        ';
+            file_put_contents($translationPath . '/entities.php', $customTranslations);
+
+            $homeRequest = $this->actingAs($this->users->viewer())->get('/');
+            $this->withHtml($homeRequest)->assertElementContains('header nav', 'Sandwiches');
+        });
+    }
+
+    public function test_custom_settings_category_page_can_be_added_via_view_file()
+    {
+        $content = 'My SuperCustomSettings';
+
+        $this->usingThemeFolder(function (string $folder) use ($content) {
+            $viewDir = theme_path('settings/categories');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/beans.blade.php', $content);
+
+            $this->asAdmin()->get('/settings/beans')->assertSee($content);
+        });
+    }
+
+    public function test_base_body_start_and_end_template_files_can_be_used()
+    {
+        $bodyStartStr = 'barry-fought-against-the-panther';
+        $bodyEndStr = 'barry-lost-his-fight-with-grace';
+
+        $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr) {
+            $viewDir = theme_path('layouts/parts');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/base-body-start.blade.php', $bodyStartStr);
+            file_put_contents($viewDir . '/base-body-end.blade.php', $bodyEndStr);
+
+            $resp = $this->asEditor()->get('/');
+            $resp->assertSee($bodyStartStr);
+            $resp->assertSee($bodyEndStr);
+        });
+    }
+
+    public function test_export_body_start_and_end_template_files_can_be_used()
+    {
+        $bodyStartStr = 'garry-fought-against-the-panther';
+        $bodyEndStr = 'garry-lost-his-fight-with-grace';
+        $page = $this->entities->page();
+
+        $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr, $page) {
+            $viewDir = theme_path('layouts/parts');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/export-body-start.blade.php', $bodyStartStr);
+            file_put_contents($viewDir . '/export-body-end.blade.php', $bodyEndStr);
+
+            $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+            $resp->assertSee($bodyStartStr);
+            $resp->assertSee($bodyEndStr);
+        });
+    }
+
+    public function test_login_and_register_message_template_files_can_be_used()
+    {
+        $loginMessage = 'Welcome to this instance, login below you scallywag';
+        $registerMessage = 'You want to register? Enter the deets below you numpty';
+
+        $this->usingThemeFolder(function (string $folder) use ($loginMessage, $registerMessage) {
+            $viewDir = theme_path('auth/parts');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/login-message.blade.php', $loginMessage);
+            file_put_contents($viewDir . '/register-message.blade.php', $registerMessage);
+            $this->setSettings(['registration-enabled' => 'true']);
+
+            $this->get('/login')->assertSee($loginMessage);
+            $this->get('/register')->assertSee($registerMessage);
+        });
+    }
+
+    public function test_header_links_start_template_file_can_be_used()
+    {
+        $content = 'This is added text in the header bar';
+
+        $this->usingThemeFolder(function (string $folder) use ($content) {
+            $viewDir = theme_path('layouts/parts');
+            mkdir($viewDir, 0777, true);
+            file_put_contents($viewDir . '/header-links-start.blade.php', $content);
+            $this->setSettings(['registration-enabled' => 'true']);
+
+            $this->get('/login')->assertSee($content);
+        });
+    }
+
+    public function test_public_folder_contents_accessible_via_route()
+    {
+        $this->usingThemeFolder(function (string $themeFolderName) {
+            $publicDir = theme_path('public');
+            mkdir($publicDir, 0777, true);
+
+            $text = 'some-text ' . md5(random_bytes(5));
+            $css = "body { background-color: tomato !important; }";
+            file_put_contents("{$publicDir}/file.txt", $text);
+            file_put_contents("{$publicDir}/file.css", $css);
+            copy($this->files->testFilePath('test-image.png'), "{$publicDir}/image.png");
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.txt");
+            $resp->assertStreamedContent($text);
+            $resp->assertHeader('Content-Type', 'text/plain; charset=utf-8');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/image.png");
+            $resp->assertHeader('Content-Type', 'image/png');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+
+            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.css");
+            $resp->assertStreamedContent($css);
+            $resp->assertHeader('Content-Type', 'text/css; charset=utf-8');
+            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
+        });
+    }
+}
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
deleted file mode 100644
index 4dff384186c..00000000000
--- a/tests/ThemeTest.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-
-namespace Tests;
-
-use BookStack\Activity\ActivityType;
-use BookStack\Activity\DispatchWebhookJob;
-use BookStack\Activity\Models\Webhook;
-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Tools\PageContent;
-use BookStack\Exceptions\ThemeException;
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;
-use BookStack\Users\Models\User;
-use Illuminate\Console\Command;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\File;
-use League\CommonMark\Environment\Environment;
-
-class ThemeTest extends TestCase
-{
-    protected string $themeFolderName;
-    protected string $themeFolderPath;
-
-    public function test_translation_text_can_be_overridden_via_theme()
-    {
-        $this->usingThemeFolder(function () {
-            $translationPath = theme_path('/lang/en');
-            File::makeDirectory($translationPath, 0777, true);
-
-            $customTranslations = '<?php
-            return [\'books\' => \'Sandwiches\'];
-        ';
-            file_put_contents($translationPath . '/entities.php', $customTranslations);
-
-            $homeRequest = $this->actingAs($this->users->viewer())->get('/');
-            $this->withHtml($homeRequest)->assertElementContains('header nav', 'Sandwiches');
-        });
-    }
-
-    public function test_theme_functions_file_used_and_app_boot_event_runs()
-    {
-        $this->usingThemeFolder(function ($themeFolder) {
-            $functionsFile = theme_path('functions.php');
-            app()->alias('cat', 'dog');
-            file_put_contents($functionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");
-            $this->runWithEnv(['APP_THEME' => $themeFolder], function () {
-                $this->assertEquals('cat', $this->app->getAlias('dog'));
-            });
-        });
-    }
-
-    public function test_theme_functions_loads_errors_are_caught_and_logged()
-    {
-        $this->usingThemeFolder(function ($themeFolder) {
-            $functionsFile = theme_path('functions.php');
-            file_put_contents($functionsFile, "<?php\n\\BookStack\\Biscuits::eat();");
-
-            $this->expectException(ThemeException::class);
-            $this->expectExceptionMessageMatches('/Failed loading theme functions file at ".*?" with error: Class "BookStack\\\\Biscuits" not found/');
-
-            $this->runWithEnv(['APP_THEME' => $themeFolder], fn() => null);
-        });
-    }
-
-    public function test_event_commonmark_environment_configure()
-    {
-        $callbackCalled = false;
-        $callback = function ($environment) use (&$callbackCalled) {
-            $this->assertInstanceOf(Environment::class, $environment);
-            $callbackCalled = true;
-
-            return $environment;
-        };
-        Theme::listen(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $callback);
-
-        $page = $this->entities->page();
-        $content = new PageContent($page);
-        $content->setNewMarkdown('# test', $this->users->editor());
-
-        $this->assertTrue($callbackCalled);
-    }
-
-    public function test_event_web_middleware_before()
-    {
-        $callbackCalled = false;
-        $requestParam = null;
-        $callback = function ($request) use (&$callbackCalled, &$requestParam) {
-            $requestParam = $request;
-            $callbackCalled = true;
-        };
-
-        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_BEFORE, $callback);
-        $this->get('/login', ['Donkey' => 'cat']);
-
-        $this->assertTrue($callbackCalled);
-        $this->assertInstanceOf(Request::class, $requestParam);
-        $this->assertEquals('cat', $requestParam->header('donkey'));
-    }
-
-    public function test_event_web_middleware_before_return_val_used_as_response()
-    {
-        $callback = function (Request $request) {
-            return response('cat', 412);
-        };
-
-        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_BEFORE, $callback);
-        $resp = $this->get('/login', ['Donkey' => 'cat']);
-        $resp->assertSee('cat');
-        $resp->assertStatus(412);
-    }
-
-    public function test_event_web_middleware_after()
-    {
-        $callbackCalled = false;
-        $requestParam = null;
-        $responseParam = null;
-        $callback = function ($request, Response $response) use (&$callbackCalled, &$requestParam, &$responseParam) {
-            $requestParam = $request;
-            $responseParam = $response;
-            $callbackCalled = true;
-            $response->header('donkey', 'cat123');
-        };
-
-        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_AFTER, $callback);
-
-        $resp = $this->get('/login', ['Donkey' => 'cat']);
-        $this->assertTrue($callbackCalled);
-        $this->assertInstanceOf(Request::class, $requestParam);
-        $this->assertInstanceOf(Response::class, $responseParam);
-        $resp->assertHeader('donkey', 'cat123');
-    }
-
-    public function test_event_web_middleware_after_return_val_used_as_response()
-    {
-        $callback = function () {
-            return response('cat456', 443);
-        };
-
-        Theme::listen(ThemeEvents::WEB_MIDDLEWARE_AFTER, $callback);
-
-        $resp = $this->get('/login', ['Donkey' => 'cat']);
-        $resp->assertSee('cat456');
-        $resp->assertStatus(443);
-    }
-
-    public function test_event_auth_login_standard()
-    {
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-        };
-
-        Theme::listen(ThemeEvents::AUTH_LOGIN, $callback);
-        $this->post('/login', ['email' => 'admin@admin.com', 'password' => 'password']);
-
-        $this->assertCount(2, $args);
-        $this->assertEquals('standard', $args[0]);
-        $this->assertInstanceOf(User::class, $args[1]);
-    }
-
-    public function test_event_auth_register_standard()
-    {
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-        };
-        Theme::listen(ThemeEvents::AUTH_REGISTER, $callback);
-        $this->setSettings(['registration-enabled' => 'true']);
-
-        $user = User::factory()->make();
-        $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
-
-        $this->assertCount(2, $args);
-        $this->assertEquals('standard', $args[0]);
-        $this->assertInstanceOf(User::class, $args[1]);
-    }
-
-    public function test_event_auth_pre_register()
-    {
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-        };
-        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
-        $this->setSettings(['registration-enabled' => 'true']);
-
-        $user = User::factory()->make();
-        $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
-
-        $this->assertCount(2, $args);
-        $this->assertEquals('standard', $args[0]);
-        $this->assertEquals([
-            'email' => $user->email,
-            'name' => $user->name,
-            'password' => 'password',
-        ], $args[1]);
-        $this->assertDatabaseHas('users', ['email' => $user->email]);
-    }
-
-    public function test_event_auth_pre_register_with_false_return_blocks_registration()
-    {
-        $callback = function () {
-            return false;
-        };
-        Theme::listen(ThemeEvents::AUTH_PRE_REGISTER, $callback);
-        $this->setSettings(['registration-enabled' => 'true']);
-
-        $user = User::factory()->make();
-        $resp = $this->post('/register', ['email' => $user->email, 'name' => $user->name, 'password' => 'password']);
-        $resp->assertRedirect('/login');
-        $this->assertSessionError('User account could not be registered for the provided details');
-        $this->assertDatabaseMissing('users', ['email' => $user->email]);
-    }
-
-    public function test_event_webhook_call_before()
-    {
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-
-            return ['test' => 'hello!'];
-        };
-        Theme::listen(ThemeEvents::WEBHOOK_CALL_BEFORE, $callback);
-
-        $responses = $this->mockHttpClient([new \GuzzleHttp\Psr7\Response(200, [], '')]);
-
-        $webhook = new Webhook(['name' => 'Test webhook', 'endpoint' => 'https://example.com']);
-        $webhook->save();
-        $event = ActivityType::PAGE_UPDATE;
-        $detail = Page::query()->first();
-
-        dispatch((new DispatchWebhookJob($webhook, $event, $detail)));
-
-        $this->assertCount(5, $args);
-        $this->assertEquals($event, $args[0]);
-        $this->assertEquals($webhook->id, $args[1]->id);
-        $this->assertEquals($detail->id, $args[2]->id);
-
-        $this->assertEquals(1, $responses->requestCount());
-        $request = $responses->latestRequest();
-        $reqData = json_decode($request->getBody(), true);
-        $this->assertEquals('hello!', $reqData['test']);
-    }
-
-    public function test_event_activity_logged()
-    {
-        $book = $this->entities->book();
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-        };
-
-        Theme::listen(ThemeEvents::ACTIVITY_LOGGED, $callback);
-        $this->asEditor()->put($book->getUrl(), ['name' => 'My cool update book!']);
-
-        $this->assertCount(2, $args);
-        $this->assertEquals(ActivityType::BOOK_UPDATE, $args[0]);
-        $this->assertTrue($args[1] instanceof Book);
-        $this->assertEquals($book->id, $args[1]->id);
-    }
-
-    public function test_event_page_include_parse()
-    {
-        /** @var Page $page */
-        /** @var Page $otherPage */
-        $page = $this->entities->page();
-        $otherPage = Page::query()->where('id', '!=', $page->id)->first();
-        $otherPage->html = '<p id="bkmrk-cool">This is a really cool section</p>';
-        $page->html = "<p>{{@{$otherPage->id}#bkmrk-cool}}</p>";
-        $page->save();
-        $otherPage->save();
-
-        $args = [];
-        $callback = function (...$eventArgs) use (&$args) {
-            $args = $eventArgs;
-
-            return '<strong>Big &amp; content replace surprise!</strong>';
-        };
-
-        Theme::listen(ThemeEvents::PAGE_INCLUDE_PARSE, $callback);
-        $resp = $this->asEditor()->get($page->getUrl());
-        $this->withHtml($resp)->assertElementContains('.page-content strong', 'Big & content replace surprise!');
-
-        $this->assertCount(4, $args);
-        $this->assertEquals($otherPage->id . '#bkmrk-cool', $args[0]);
-        $this->assertEquals('This is a really cool section', $args[1]);
-        $this->assertTrue($args[2] instanceof Page);
-        $this->assertTrue($args[3] instanceof Page);
-        $this->assertEquals($page->id, $args[2]->id);
-        $this->assertEquals($otherPage->id, $args[3]->id);
-    }
-
-    public function test_event_routes_register_web_and_web_auth()
-    {
-        $functionsContent = <<<'END'
-<?php
-use BookStack\Theming\ThemeEvents;
-use BookStack\Facades\Theme;
-use Illuminate\Routing\Router;
-Theme::listen(ThemeEvents::ROUTES_REGISTER_WEB, function (Router $router) {
-    $router->get('/cat', fn () => 'cat')->name('say.cat');
-});
-Theme::listen(ThemeEvents::ROUTES_REGISTER_WEB_AUTH, function (Router $router) {
-    $router->get('/dog', fn () => 'dog')->name('say.dog');
-});
-END;
-
-        $this->usingThemeFolder(function () use ($functionsContent) {
-
-            $functionsFile = theme_path('functions.php');
-            file_put_contents($functionsFile, $functionsContent);
-
-            $app = $this->createApplication();
-            /** @var \Illuminate\Routing\Router $router */
-            $router = $app->get('router');
-
-            /** @var \Illuminate\Routing\Route $catRoute */
-            $catRoute = $router->getRoutes()->getRoutesByName()['say.cat'];
-            $this->assertEquals(['web'], $catRoute->middleware());
-
-            /** @var \Illuminate\Routing\Route $dogRoute */
-            $dogRoute = $router->getRoutes()->getRoutesByName()['say.dog'];
-            $this->assertEquals(['web', 'auth'], $dogRoute->middleware());
-        });
-    }
-
-    public function test_add_social_driver()
-    {
-        Theme::addSocialDriver('catnet', [
-            'client_id'     => 'abc123',
-            'client_secret' => 'def456',
-        ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');
-
-        $this->assertEquals('catnet', config('services.catnet.name'));
-        $this->assertEquals('abc123', config('services.catnet.client_id'));
-        $this->assertEquals(url('/login/service/catnet/callback'), config('services.catnet.redirect'));
-
-        $loginResp = $this->get('/login');
-        $loginResp->assertSee('login/service/catnet');
-    }
-
-    public function test_add_social_driver_uses_name_in_config_if_given()
-    {
-        Theme::addSocialDriver('catnet', [
-            'client_id'     => 'abc123',
-            'client_secret' => 'def456',
-            'name'          => 'Super Cat Name',
-        ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');
-
-        $this->assertEquals('Super Cat Name', config('services.catnet.name'));
-        $loginResp = $this->get('/login');
-        $loginResp->assertSee('Super Cat Name');
-    }
-
-    public function test_add_social_driver_allows_a_configure_for_redirect_callback_to_be_passed()
-    {
-        Theme::addSocialDriver(
-            'discord',
-            [
-                'client_id'     => 'abc123',
-                'client_secret' => 'def456',
-                'name'          => 'Super Cat Name',
-            ],
-            'SocialiteProviders\Discord\DiscordExtendSocialite@handle',
-            function ($driver) {
-                $driver->with(['donkey' => 'donut']);
-            }
-        );
-
-        $loginResp = $this->get('/login/service/discord');
-        $redirect = $loginResp->headers->get('location');
-        $this->assertStringContainsString('donkey=donut', $redirect);
-    }
-
-    public function test_register_command_allows_provided_command_to_be_usable_via_artisan()
-    {
-        Theme::registerCommand(new MyCustomCommand());
-
-        Artisan::call('bookstack:test-custom-command', []);
-        $output = Artisan::output();
-
-        $this->assertStringContainsString('Command ran!', $output);
-    }
-
-    public function test_base_body_start_and_end_template_files_can_be_used()
-    {
-        $bodyStartStr = 'barry-fought-against-the-panther';
-        $bodyEndStr = 'barry-lost-his-fight-with-grace';
-
-        $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr) {
-            $viewDir = theme_path('layouts/parts');
-            mkdir($viewDir, 0777, true);
-            file_put_contents($viewDir . '/base-body-start.blade.php', $bodyStartStr);
-            file_put_contents($viewDir . '/base-body-end.blade.php', $bodyEndStr);
-
-            $resp = $this->asEditor()->get('/');
-            $resp->assertSee($bodyStartStr);
-            $resp->assertSee($bodyEndStr);
-        });
-    }
-
-    public function test_export_body_start_and_end_template_files_can_be_used()
-    {
-        $bodyStartStr = 'garry-fought-against-the-panther';
-        $bodyEndStr = 'garry-lost-his-fight-with-grace';
-        $page = $this->entities->page();
-
-        $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr, $page) {
-            $viewDir = theme_path('layouts/parts');
-            mkdir($viewDir, 0777, true);
-            file_put_contents($viewDir . '/export-body-start.blade.php', $bodyStartStr);
-            file_put_contents($viewDir . '/export-body-end.blade.php', $bodyEndStr);
-
-            $resp = $this->asEditor()->get($page->getUrl('/export/html'));
-            $resp->assertSee($bodyStartStr);
-            $resp->assertSee($bodyEndStr);
-        });
-    }
-
-    public function test_login_and_register_message_template_files_can_be_used()
-    {
-        $loginMessage = 'Welcome to this instance, login below you scallywag';
-        $registerMessage = 'You want to register? Enter the deets below you numpty';
-
-        $this->usingThemeFolder(function (string $folder) use ($loginMessage, $registerMessage) {
-            $viewDir = theme_path('auth/parts');
-            mkdir($viewDir, 0777, true);
-            file_put_contents($viewDir . '/login-message.blade.php', $loginMessage);
-            file_put_contents($viewDir . '/register-message.blade.php', $registerMessage);
-            $this->setSettings(['registration-enabled' => 'true']);
-
-            $this->get('/login')->assertSee($loginMessage);
-            $this->get('/register')->assertSee($registerMessage);
-        });
-    }
-
-    public function test_header_links_start_template_file_can_be_used()
-    {
-        $content = 'This is added text in the header bar';
-
-        $this->usingThemeFolder(function (string $folder) use ($content) {
-            $viewDir = theme_path('layouts/parts');
-            mkdir($viewDir, 0777, true);
-            file_put_contents($viewDir . '/header-links-start.blade.php', $content);
-            $this->setSettings(['registration-enabled' => 'true']);
-
-            $this->get('/login')->assertSee($content);
-        });
-    }
-
-    public function test_custom_settings_category_page_can_be_added_via_view_file()
-    {
-        $content = 'My SuperCustomSettings';
-
-        $this->usingThemeFolder(function (string $folder) use ($content) {
-            $viewDir = theme_path('settings/categories');
-            mkdir($viewDir, 0777, true);
-            file_put_contents($viewDir . '/beans.blade.php', $content);
-
-            $this->asAdmin()->get('/settings/beans')->assertSee($content);
-        });
-    }
-
-    public function test_public_folder_contents_accessible_via_route()
-    {
-        $this->usingThemeFolder(function (string $themeFolderName) {
-            $publicDir = theme_path('public');
-            mkdir($publicDir, 0777, true);
-
-            $text = 'some-text ' . md5(random_bytes(5));
-            $css = "body { background-color: tomato !important; }";
-            file_put_contents("{$publicDir}/file.txt", $text);
-            file_put_contents("{$publicDir}/file.css", $css);
-            copy($this->files->testFilePath('test-image.png'), "{$publicDir}/image.png");
-
-            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.txt");
-            $resp->assertStreamedContent($text);
-            $resp->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
-            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
-
-            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/image.png");
-            $resp->assertHeader('Content-Type', 'image/png');
-            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
-
-            $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.css");
-            $resp->assertStreamedContent($css);
-            $resp->assertHeader('Content-Type', 'text/css; charset=UTF-8');
-            $resp->assertHeader('Cache-Control', 'max-age=86400, private');
-        });
-    }
-
-    protected function usingThemeFolder(callable $callback)
-    {
-        // Create a folder and configure a theme
-        $themeFolderName = 'testing_theme_' . str_shuffle(rtrim(base64_encode(time()), '='));
-        config()->set('view.theme', $themeFolderName);
-        $themeFolderPath = theme_path('');
-
-        // Create theme folder and clean it up on application tear-down
-        File::makeDirectory($themeFolderPath);
-        $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));
-
-        // Run provided callback with theme env option set
-        $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {
-            call_user_func($callback, $themeFolderName);
-        });
-    }
-}
-
-class MyCustomCommand extends Command
-{
-    protected $signature = 'bookstack:test-custom-command';
-
-    public function handle()
-    {
-        $this->line('Command ran!');
-    }
-}
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
index 7795a861a0c..3da754cc219 100644
--- a/tests/Unit/ConfigTest.php
+++ b/tests/Unit/ConfigTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Unit;
 
+use Exception;
+use Illuminate\Encryption\MissingAppKeyException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -122,6 +124,27 @@ public function test_mail_disable_ssl_verification_alters_mailer()
         });
     }
 
+    public function test_app_url_changes_smtp_ehlo_host_on_mailer()
+    {
+        $getLocalDomain = function (): string {
+            /** @var EsmtpTransport $transport */
+            $transport = Mail::mailer('smtp')->getSymfonyTransport();
+            return $transport->getLocalDomain();
+        };
+
+        $this->runWithEnv(['APP_URL' => ''], function () use ($getLocalDomain) {
+            $this->assertEquals('[127.0.0.1]', $getLocalDomain());
+        });
+
+        $this->runWithEnv(['APP_URL' => 'https://example.com/cats/dogs'], function () use ($getLocalDomain) {
+            $this->assertEquals('example.com', $getLocalDomain());
+        });
+
+        $this->runWithEnv(['APP_URL' => 'http://beans.cat.example.com'], function () use ($getLocalDomain) {
+            $this->assertEquals('beans.cat.example.com', $getLocalDomain());
+        });
+    }
+
     public function test_non_null_mail_encryption_options_enforce_smtp_scheme()
     {
         $this->checkEnvConfigResult('MAIL_ENCRYPTION', 'tls', 'mail.mailers.smtp.require_tls', true);
@@ -170,8 +193,43 @@ public function test_mysql_host_parsed_as_expected()
         }
     }
 
+    public function test_content_filtering_defaults_to_enabled()
+    {
+        $this->runWithEnv(['APP_CONTENT_FILTERING' => null, 'ALLOW_CONTENT_SCRIPTS' => null], function () {
+            $this->assertEquals('jhfa', config('app.content_filtering'));
+        });
+    }
+
+    public function test_content_filtering_can_be_disabled()
+    {
+        $this->runWithEnv(['APP_CONTENT_FILTERING' => "", 'ALLOW_CONTENT_SCRIPTS' => null], function () {
+            $this->assertEquals('', config('app.content_filtering'));
+        });
+    }
+
+    public function test_allow_content_scripts_disables_content_filtering()
+    {
+        $this->runWithEnv(['APP_CONTENT_FILTERING' => null, 'ALLOW_CONTENT_SCRIPTS' => 'true'], function () {
+            $this->assertEquals('', config('app.content_filtering'));
+        });
+    }
+
+    public function test_app_errors_if_no_app_key_set()
+    {
+        $this->runWithEnv(['APP_KEY' => ''], function () {
+            $error = null;
+            try {
+                $this->get('/');
+            } catch (Exception $e) {
+                $error = $e;
+            }
+
+            $this->assertInstanceOf(MissingAppKeyException::class, $error);
+        });
+    }
+
     /**
-     * Set an environment variable of the given name and value
+     * Set an environment variable of the given name and value,
      * then check the given config key to see if it matches the given result.
      * Providing a null $envVal clears the variable.
      */
diff --git a/tests/Unit/SsrUrlValidatorTest.php b/tests/Unit/SsrUrlValidatorTest.php
deleted file mode 100644
index 8fb538916aa..00000000000
--- a/tests/Unit/SsrUrlValidatorTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use BookStack\Exceptions\HttpFetchException;
-use BookStack\Util\SsrUrlValidator;
-use Tests\TestCase;
-
-class SsrUrlValidatorTest extends TestCase
-{
-    public function test_allowed()
-    {
-        $testMap = [
-            // Single values
-            ['config' => '', 'url' => '', 'result' => false],
-            ['config' => '', 'url' => 'https://example.com', 'result' => false],
-            ['config' => '    ', 'url' => 'https://example.com', 'result' => false],
-            ['config' => '*', 'url' => '', 'result' => false],
-            ['config' => '*', 'url' => 'https://example.com', 'result' => true],
-            ['config' => 'https://*', 'url' => 'https://example.com', 'result' => true],
-            ['config' => 'http://*', 'url' => 'https://example.com', 'result' => false],
-            ['config' => 'https://*example.com', 'url' => 'https://example.com', 'result' => true],
-            ['config' => 'https://*ample.com', 'url' => 'https://example.com', 'result' => true],
-            ['config' => 'https://*.example.com', 'url' => 'https://example.com', 'result' => false],
-            ['config' => 'https://*.example.com', 'url' => 'https://test.example.com', 'result' => true],
-            ['config' => '*//example.com', 'url' => 'https://example.com', 'result' => true],
-            ['config' => '*//example.com', 'url' => 'http://example.com', 'result' => true],
-            ['config' => '*//example.co', 'url' => 'http://example.co.uk', 'result' => false],
-            ['config' => '*//example.co/bookstack', 'url' => 'https://example.co/bookstack/a/path', 'result' => true],
-            ['config' => '*//example.co*', 'url' => 'https://example.co.uk/bookstack/a/path', 'result' => true],
-            ['config' => 'https://example.com', 'url' => 'https://example.com/a/b/c?test=cat', 'result' => true],
-            ['config' => 'https://example.com', 'url' => 'https://example.co.uk', 'result' => false],
-
-            // Escapes
-            ['config' => 'https://(.*?).com', 'url' => 'https://example.com', 'result' => false],
-            ['config' => 'https://example.com', 'url' => 'https://example.co.uk#https://example.com', 'result' => false],
-
-            // Multi values
-            ['config' => '*//example.org *//example.com', 'url' => 'https://example.com', 'result' => true],
-            ['config' => '*//example.org *//example.com', 'url' => 'https://example.com/a/b/c?test=cat#hello', 'result' => true],
-            ['config' => '*.example.org *.example.com', 'url' => 'https://example.co.uk', 'result' => false],
-            ['config' => '  *.example.org  *.example.com  ', 'url' => 'https://example.co.uk', 'result' => false],
-            ['config' => '* *.example.com', 'url' => 'https://example.co.uk', 'result' => true],
-            ['config' => '*//example.org *//example.com *//example.co.uk', 'url' => 'https://example.co.uk', 'result' => true],
-            ['config' => '*//example.org *//example.com *//example.co.uk', 'url' => 'https://example.net', 'result' => false],
-        ];
-
-        foreach ($testMap as $test) {
-            $result = (new SsrUrlValidator($test['config']))->allowed($test['url']);
-            $this->assertEquals($test['result'], $result, "Failed asserting url '{$test['url']}' with config '{$test['config']}' results " . ($test['result'] ? 'true' : 'false'));
-        }
-    }
-
-    public function test_enssure_allowed()
-    {
-        $result = (new SsrUrlValidator('https://example.com'))->ensureAllowed('https://example.com');
-        $this->assertNull($result);
-
-        $this->expectException(HttpFetchException::class);
-        (new SsrUrlValidator('https://example.com'))->ensureAllowed('https://test.example.com');
-    }
-}
diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index 2eaf21d9c6f..30e45fff6fc 100644
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -5,6 +5,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;
+use BookStack\Permissions\Permission;
 use BookStack\Uploads\Attachment;
 use Tests\TestCase;
 
@@ -158,6 +159,38 @@ public function test_attachment_updating()
         $this->files->deleteAllAttachmentFiles();
     }
 
+    public function test_attachment_update_without_permission()
+    {
+        $page = $this->entities->page();
+        $attachment = Attachment::factory()->create(['uploaded_to' => $page->id]);
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $resp = $this->asViewer()->put("attachments/{$attachment->id}", [
+            'attachment_edit_name' => 'My new attachment name',
+            'attachment_edit_url'  => 'https://test.example.com',
+        ]);
+
+        $this->assertPermissionError($resp);
+    }
+
+    public function test_attachment_update_without_permission_with_validation_errors()
+    {
+        $page = $this->entities->page();
+        /** @var Attachment $attachment */
+        $attachment = Attachment::factory()->create(['uploaded_to' => $page->id]);
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $resp = $this->asViewer()->put("attachments/{$attachment->id}", [
+            'attachment_edit_name' => '',
+            'attachment_edit_url'  => 'https://test.example.com',
+        ]);
+
+        $this->assertPermissionError($resp);
+        $resp->assertDontSee($attachment->path);
+    }
+
     public function test_file_deletion()
     {
         $page = $this->entities->page();
@@ -206,6 +239,21 @@ public function test_attachment_deletion_on_page_deletion()
         $this->files->deleteAllAttachmentFiles();
     }
 
+    public function test_attachment_deletion_requires_page_access()
+    {
+        $page = $this->entities->page();
+        $attachment = Attachment::factory()->create(['uploaded_to' => $page->id]);
+        $editor = $this->users->editor();
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->permissions->grantUserRolePermissions($editor, [Permission::AttachmentDeleteAll]);
+
+        $resp = $this->actingAs($editor)->delete($attachment->getUrl());
+        $resp->assertNotFound();
+
+        $this->assertDatabaseHas('attachments', ['id' => $attachment->id]);
+    }
+
     public function test_attachment_access_without_permission_shows_404()
     {
         $admin = $this->users->admin();
@@ -226,6 +274,26 @@ public function test_attachment_access_without_permission_shows_404()
         $this->files->deleteAllAttachmentFiles();
     }
 
+    public function test_attachment_edit_form_access_requires_view_permission()
+    {
+        $page = $this->entities->page();
+        /** @var Attachment $attachment */
+        $attachment = Attachment::factory()->create(['uploaded_to' => $page->id]);
+        $editor = $this->users->editor();
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->permissions->grantUserRolePermissions($editor, [Permission::AttachmentUpdateAll]);
+        $this->permissions->setEntityPermissionsForRole($page, ['update'], $editor->roles()->first());
+
+        $resp = $this->actingAs($editor)->get("/attachments/edit/{$attachment->id}");
+        $this->assertPermissionError($resp);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $editor->roles()->first());
+        $resp = $this->actingAs($editor)->get("/attachments/edit/{$attachment->id}");
+        $resp->assertOk();
+        $resp->assertSee($attachment->name);
+    }
+
     public function test_data_and_js_links_cannot_be_attached_to_a_page()
     {
         $page = $this->entities->page();
@@ -267,6 +335,34 @@ public function test_data_and_js_links_cannot_be_attached_to_a_page()
         }
     }
 
+    public function test_existing_data_and_js_links_do_not_render_link()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+        $attachment = Attachment::factory()->create(['uploaded_to' => $page->id]);
+
+        $links = [
+            'javascript:alert("bunny")',
+            ' javascript:alert("bunny")',
+            'JavaScript:alert("bunny")',
+            "\t\n\t\nJavaScript:alert(\"bunny\")",
+            'data:text/html;bunny<a></a>',
+            'Data:text/html;bunny<a></a>',
+            'Data:text/html;bunny<a></a>',
+            'donk\tscript:alert("bunny")',
+            "donk\tscript:alert('bunny')",
+        ];
+
+        foreach ($links as $link) {
+            $attachment->path = $link;
+            $attachment->save();
+
+            $resp = $this->get($page->getUrl());
+            $resp->assertDontSee('bunny', false);
+            $resp->assertSee('#badlink', false);
+        }
+    }
+
     public function test_attachment_delete_only_shows_with_permission()
     {
         $this->asAdmin();
@@ -323,8 +419,8 @@ public function test_file_access_with_open_query_param_provides_inline_response_
 
         $attachmentGet = $this->get($attachment->getUrl(true));
         // http-foundation/Response does some 'fixing' of responses to add charsets to text responses.
-        $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
-        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename="upload_test_file.txt"');
+        $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=utf-8');
+        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename*=UTF-8\'\'upload_test_file.txt');
         $attachmentGet->assertHeader('X-Content-Type-Options', 'nosniff');
 
         $this->files->deleteAllAttachmentFiles();
@@ -339,8 +435,23 @@ public function test_html_file_access_with_open_forces_plain_content_type()
 
         $attachmentGet = $this->get($attachment->getUrl(true));
         // http-foundation/Response does some 'fixing' of responses to add charsets to text responses.
-        $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
-        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename="test_file.html"');
+        $attachmentGet->assertHeader('Content-Type', 'text/plain; charset=utf-8');
+        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename*=UTF-8\'\'test_file.html');
+
+        $this->files->deleteAllAttachmentFiles();
+    }
+
+    public function test_file_access_name_in_content_disposition_header_is_sanitized()
+    {
+        $page = $this->entities->page();
+        $this->asAdmin();
+
+        $attachment = $this->files->uploadAttachmentDataToPage($this, $page, 'test_file.html', '<html></html><p>testing</p>', 'text/html');
+        $attachment->name = "my\\_/super\n_fu\$n_\tfile";
+        $attachment->save();
+
+        $attachmentGet = $this->get($attachment->getUrl(true));
+        $attachmentGet->assertHeader('Content-Disposition', 'inline; filename*=UTF-8\'\'my_super_fun_file.html');
 
         $this->files->deleteAllAttachmentFiles();
     }
diff --git a/tests/Uploads/DrawioTest.php b/tests/Uploads/DrawioTest.php
index d5b3f60880e..d455d5334ea 100644
--- a/tests/Uploads/DrawioTest.php
+++ b/tests/Uploads/DrawioTest.php
@@ -72,6 +72,47 @@ public function test_drawing_base64_upload()
         $this->assertTrue($testImageData === $uploadedImageData, 'Uploaded image file data does not match our test image as expected');
     }
 
+    public function test_base64_upload_requires_edit_permission_to_page()
+    {
+        $page = $this->entities->page();
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+
+        $upload = function () use ($page) {
+            return $this->postJson('images/drawio', [
+                'uploaded_to' => $page->id,
+                'image'       => 'image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gEcDCo5iYNs+gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFElEQVQI12O0jN/KgASYGFABqXwAZtoBV6Sl3hIAAAAASUVORK5CYII=',
+            ]);
+        };
+
+        $upload()->assertStatus(404);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $editor->roles()->first());
+        $upload()->assertStatus(403);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $editor->roles()->first());
+        $upload()->assertStatus(200);
+    }
+
+    public function test_drawing_base64_upload_validates_data_as_image()
+    {
+        $page = $this->entities->page();
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $upload = $this->postJson('images/drawio', [
+            'uploaded_to' => $page->id,
+            'image'       => 'image/png;base64,' . base64_encode('i like turtles'),
+        ]);
+
+        $upload->assertStatus(422);
+        $upload->assertJsonValidationErrors([
+            'image' => 'The image must be a valid base64 URI containing data of image/png mime type.',
+        ]);
+    }
+
     public function test_drawio_url_can_be_configured()
     {
         config()->set('services.drawio', 'http://cats.com?dog=tree');
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index a2f03df34d4..e913f8469d1 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -5,6 +5,8 @@
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageService;
+use BookStack\Uploads\UserAvatars;
+use BookStack\Users\Models\Role;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 
@@ -34,6 +36,45 @@ public function test_image_upload()
         ]);
     }
 
+    public function test_image_upload_with_page_reference_requires_visibility_and_update_permissions_of_target_page()
+    {
+        $page = $this->entities->page();
+        $editor = $this->users->editor();
+
+        $this->permissions->disableEntityInheritedPermissions($page);
+        $this->actingAs($editor);
+
+        $resp = $this->files->uploadGalleryImage($this, 'test-image.png', $page->id);
+        $resp->assertStatus(404);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view'], $editor->roles()->first());
+
+        $resp = $this->files->uploadGalleryImage($this, 'test-image.png', $page->id);
+        $this->assertPermissionError($resp);
+
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $editor->roles()->first());
+
+        $resp = $this->files->uploadGalleryImage($this, 'test-image.png', $page->id);
+        $resp->assertStatus(200);
+
+        $this->files->deleteAtRelativePath($resp->json('path'));
+    }
+
+    public function test_image_upload_with_page_reference_requires_page_to_exist()
+    {
+        $page = $this->entities->page();
+        $this->entities->destroy($page);
+
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $resp = $this->files->uploadGalleryImage($this, 'test-image.png', $page->id);
+        $resp->assertStatus(404);
+
+        $resp = $this->files->uploadGalleryImage($this, 'test-image.png', 0);
+        $resp->assertStatus(404);
+    }
+
     public function test_image_display_thumbnail_generation_does_not_increase_image_size()
     {
         $page = $this->entities->page();
@@ -73,6 +114,10 @@ public function test_image_display_thumbnail_generation_for_apng_images_uses_ori
 
     public function test_image_display_thumbnail_generation_for_animated_avif_images_uses_original_file()
     {
+        if ((gd_info()['AVIF Support'] ?? false) !== true) {
+            $this->markTestSkipped('imageavif() is not available');
+        }
+
         $page = $this->entities->page();
         $admin = $this->users->admin();
         $this->actingAs($admin);
@@ -423,29 +468,6 @@ public function test_system_images_remain_public_with_local_secure()
         }
     }
 
-    public function test_secure_images_not_tracked_in_session_history()
-    {
-        config()->set('filesystems.images', 'local_secure');
-        $this->asEditor();
-        $page = $this->entities->page();
-        $result = $this->files->uploadGalleryImageToPage($this, $page);
-        $expectedPath = storage_path($result['path']);
-        $this->assertFileExists($expectedPath);
-
-        $this->get('/books');
-        $this->assertEquals(url('/books'), session()->previousUrl());
-
-        $resp = $this->get($result['path']);
-        $resp->assertOk();
-        $resp->assertHeader('Content-Type', 'image/png');
-
-        $this->assertEquals(url('/books'), session()->previousUrl());
-
-        if (file_exists($expectedPath)) {
-            unlink($expectedPath);
-        }
-    }
-
     public function test_system_images_remain_public_with_local_secure_restricted()
     {
         config()->set('filesystems.images', 'local_secure_restricted');
@@ -463,6 +485,26 @@ public function test_system_images_remain_public_with_local_secure_restricted()
         }
     }
 
+    public function test_avatar_images_visible_only_when_public_access_enabled_with_local_secure_restricted()
+    {
+        config()->set('filesystems.images', 'local_secure_restricted');
+        $user = $this->users->admin();
+        $avatars = $this->app->make(UserAvatars::class);
+        $avatars->assignToUserFromExistingData($user, $this->files->pngImageData(), 'png');
+
+        $avatarUrl = $user->getAvatar();
+
+        $resp = $this->get($avatarUrl);
+        $resp->assertRedirect('/login');
+
+        $this->permissions->makeAppPublic();
+
+        $resp = $this->get($avatarUrl);
+        $resp->assertOk();
+
+        $this->files->deleteAtRelativePath($user->avatar->path);
+    }
+
     public function test_secure_restricted_images_inaccessible_without_relation_permission()
     {
         config()->set('filesystems.images', 'local_secure_restricted');
@@ -487,6 +529,38 @@ public function test_secure_restricted_images_inaccessible_without_relation_perm
         }
     }
 
+    public function test_secure_restricted_images_accessible_with_public_guest_access()
+    {
+        config()->set('filesystems.images', 'local_secure_restricted');
+        $this->permissions->makeAppPublic();
+
+        $this->asEditor();
+        $page = $this->entities->page();
+        $this->files->uploadGalleryImageToPage($this, $page);
+        $image = Image::query()->where('type', '=', 'gallery')
+            ->where('uploaded_to', '=', $page->id)
+            ->first();
+
+        $expectedUrl = url($image->path);
+        $expectedPath = storage_path($image->path);
+        auth()->logout();
+
+        $this->get($expectedUrl)->assertOk();
+
+        $this->permissions->setEntityPermissions($page, [], []);
+
+        $resp = $this->get($expectedUrl);
+        $resp->assertNotFound();
+
+        $this->permissions->setEntityPermissions($page, ['view'], [Role::getSystemRole('public')]);
+
+        $this->get($expectedUrl)->assertOk();
+
+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }
+    }
+
     public function test_thumbnail_path_handled_by_secure_restricted_images()
     {
         config()->set('filesystems.images', 'local_secure_restricted');
@@ -615,6 +689,34 @@ public function test_image_manager_delete_button_only_shows_with_permission()
         $this->files->deleteAtRelativePath($relPath);
     }
 
+    public function test_image_manager_upload_options_only_shown_with_permission()
+    {
+        $page = $this->entities->page();
+        $editor = $this->users->editor();
+
+        $resp = $this->actingAs($editor)->get($page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('[refs~="image-manager@uploadButton"]');
+        $this->withHtml($resp)->assertElementExists('[refs="image-manager@dropzoneContainer"]');
+        $resp->assertDontSee('You do not have permission to upload new images.');
+
+        // Viewer with page-update permission but no image-create-all permission
+        $viewer = $this->users->viewer();
+        $this->permissions->setEntityPermissionsForRole($page, ['view', 'update'], $viewer->roles()->first());
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementNotExists('[refs~="image-manager@uploadButton"]');
+        $this->withHtml($resp)->assertElementNotExists('[refs="image-manager@dropzoneContainer"]');
+        $resp->assertSee('You do not have permission to upload new images.');
+
+        // Grant image-create-all, upload options should now be enabled
+        $this->permissions->grantUserRolePermissions($viewer, ['image-create-all']);
+
+        $resp = $this->actingAs($viewer)->get($page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('[refs~="image-manager@uploadButton"]');
+        $this->withHtml($resp)->assertElementExists('[refs="image-manager@dropzoneContainer"]');
+        $resp->assertDontSee('You do not have permission to upload new images.');
+    }
+
     public function test_image_manager_regen_thumbnails()
     {
         $this->asEditor();
@@ -662,15 +764,15 @@ public function test_gif_thumbnail_generation()
         $galleryFileSize = filesize($galleryThumbPath);
 
         // Basic scan of GIF content to check frame count
-        $originalFrameCount = count(explode("\x00\x21\xF9", file_get_contents($originalFile)));
-        $galleryFrameCount = count(explode("\x00\x21\xF9", file_get_contents($galleryThumbPath)));
+        $originalFrameCount = count(explode("\x00\x21\xF9", file_get_contents($originalFile))) - 1;
+        $galleryFrameCount = count(explode("\x00\x21\xF9", file_get_contents($galleryThumbPath))) - 1;
 
         $this->files->deleteAtRelativePath($relPath);
         $this->files->deleteAtRelativePath($galleryThumbRelPath);
 
         $this->assertNotEquals($originalFileSize, $galleryFileSize);
-        $this->assertEquals(3, $originalFrameCount);
-        $this->assertEquals(1, $galleryFrameCount);
+        $this->assertEquals(2, $originalFrameCount);
+        $this->assertLessThan(2, $galleryFrameCount);
     }
 
     protected function getTestProfileImage()
@@ -745,7 +847,7 @@ public function test_deleted_unused_images()
         $pageRepo->update($page, [
             'name'    => $page->name,
             'html'    => $page->html . "<img src=\"{$image->url}\">",
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         // Ensure no images are reported as deletable
@@ -757,7 +859,7 @@ public function test_deleted_unused_images()
         $pageRepo->update($page, [
             'name'    => $page->name,
             'html'    => '<p>Hello</p>',
-            'summary' => '',
+            'changelog' => '',
         ]);
 
         // Ensure revision images are picked up okay
diff --git a/tests/User/UserManagementMfaTest.php b/tests/User/UserManagementMfaTest.php
new file mode 100644
index 00000000000..ea05869cb0e
--- /dev/null
+++ b/tests/User/UserManagementMfaTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\User;
+
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Activity\ActivityType;
+use BookStack\Permissions\Permission;
+use Tests\TestCase;
+
+class UserManagementMfaTest extends TestCase
+{
+    public function test_configured_mfa_options_visible_on_user_edit()
+    {
+        $editor = $this->users->editor();
+
+        $resp = $this->asAdmin()->get($editor->getEditUrl());
+        $resp->assertSeeText('0 methods configured');
+
+        MfaValue::factory()->create(['user_id' => $editor->id, 'method' => MfaValue::METHOD_BACKUP_CODES]);
+
+        $resp = $this->get($editor->getEditUrl());
+        $resp->assertSeeText('1 method configured');
+        $resp->assertDontSeeText('0 methods configured');
+    }
+
+    public function test_reset_mfa_flow()
+    {
+        $editor = $this->users->editor();
+        MfaValue::factory()->create(['user_id' => $editor->id, 'method' => MfaValue::METHOD_BACKUP_CODES]);
+        MfaValue::factory()->create(['user_id' => $editor->id, 'method' => MfaValue::METHOD_TOTP]);
+
+        $this->assertEquals(2, $editor->mfaValues()->count());
+
+        $resp = $this->asAdmin()->get($editor->getEditUrl());
+        $this->withHtml($resp)->assertElementContains('form[action$="/mfa"] button[type="submit"]', 'Reset');
+
+        $resp = $this->delete($editor->getEditUrl('/mfa'));
+        $resp->assertRedirect($editor->getEditUrl());
+        $this->assertActivityExists(ActivityType::USER_MFA_RESET);
+
+        $resp = $this->followRedirects($resp);
+        $resp->assertSee('Multi-factor authentication methods reset');
+
+        $this->assertEquals(0, $editor->mfaValues()->count());
+    }
+
+    public function test_users_manage_permission_required_for_mfa_reset()
+    {
+        $editor = $this->users->editor();
+        $resp = $this->actingAs($editor)->delete($editor->getEditUrl('/mfa'));
+        $this->assertPermissionError($resp);
+
+        $this->permissions->grantUserRolePermissions($editor, [Permission::UsersManage]);
+
+        $resp = $this->delete($editor->getEditUrl('/mfa'));
+        $this->assertNotPermissionError($resp);
+        $resp->assertRedirect($editor->getEditUrl());
+    }
+}
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index d92f13f0b3f..b1bece33e57 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -2,9 +2,22 @@
 
 namespace Tests\User;
 
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\SocialAccount;
 use BookStack\Access\UserInviteException;
 use BookStack\Access\UserInviteService;
 use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Activity;
+use BookStack\Activity\Models\Comment;
+use BookStack\Activity\Models\Favourite;
+use BookStack\Activity\Models\View;
+use BookStack\Activity\Models\Watch;
+use BookStack\Api\ApiToken;
+use BookStack\Entities\Models\Deletion;
+use BookStack\Entities\Models\PageRevision;
+use BookStack\Entities\Models\PageUpdateDraft;
+use BookStack\Exports\Import;
+use BookStack\Uploads\Attachment;
 use BookStack\Uploads\Image;
 use BookStack\Users\Models\Role;
 use BookStack\Users\Models\User;
@@ -28,10 +41,10 @@ public function test_user_creation()
         $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/users/create') . '"]', 'Save');
 
         $resp = $this->post('/settings/users/create', [
-            'name'                          => $user->name,
-            'email'                         => $user->email,
-            'password'                      => $user->password,
-            'password-confirm'              => $user->password,
+            'name' => $user->name,
+            'email' => $user->email,
+            'password' => $user->password,
+            'password-confirm' => $user->password,
             'roles[' . $adminRole->id . ']' => 'true',
         ]);
         $resp->assertRedirect('/settings/users');
@@ -77,7 +90,7 @@ public function test_user_password_update()
         $this->get($userProfilePage)->assertSee('Password confirmation required');
 
         $this->put($userProfilePage, [
-            'password'         => 'newpassword',
+            'password' => 'newpassword',
             'password-confirm' => 'newpassword',
         ])->assertRedirect('/settings/users');
 
@@ -165,9 +178,9 @@ public function test_delete_with_new_owner_id_changes_ownership()
         $owner = $page->ownedBy;
         $newOwner = User::query()->where('id', '!=', $owner->id)->first();
 
-        $this->asAdmin()->delete("settings/users/{$owner->id}", ['new_owner_id' => $newOwner->id]);
-        $this->assertDatabaseHas('pages', [
-            'id'       => $page->id,
+        $this->asAdmin()->delete("settings/users/{$owner->id}", ['new_owner_id' => $newOwner->id])->assertRedirect();
+        $this->assertDatabaseHasEntityData('page', [
+            'id' => $page->id,
             'owned_by' => $newOwner->id,
         ]);
     }
@@ -182,6 +195,94 @@ public function test_delete_with_empty_owner_migration_id_works()
         $this->assertSessionHas('success');
     }
 
+    public function test_delete_with_empty_owner_migration_id_clears_relevant_id_uses()
+    {
+        $user = $this->users->editor();
+        $page = $this->entities->page();
+        $this->actingAs($user);
+
+        // Create relations
+        $activity = Activity::factory()->create(['user_id' => $user->id]);
+        $attachment = Attachment::factory()->create(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $comment = Comment::factory()->create(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $deletion = Deletion::factory()->create(['deleted_by' => $user->id]);
+        $page->forceFill(['owned_by' => $user->id, 'created_by' => $user->id, 'updated_by' => $user->id])->save();
+        $page->rebuildPermissions();
+        $image = Image::factory()->create(['created_by' => $user->id, 'updated_by' => $user->id]);
+        $import = Import::factory()->create(['created_by' => $user->id]);
+        $revision = PageRevision::factory()->create(['created_by' => $user->id]);
+        $draft = PageUpdateDraft::factory()->create(['created_by' => $user->id]);
+
+        $apiToken = ApiToken::factory()->create(['user_id' => $user->id]);
+        \DB::table('email_confirmations')->insert(['user_id' => $user->id, 'token' => 'abc123']);
+        $favourite = Favourite::factory()->create(['user_id' => $user->id]);
+        $mfaValue = MfaValue::factory()->create(['user_id' => $user->id]);
+        $socialAccount = SocialAccount::factory()->create(['user_id' => $user->id]);
+        \DB::table('user_invites')->insert(['user_id' => $user->id, 'token' => 'abc123']);
+        View::incrementFor($page);
+        $watch = Watch::factory()->create(['user_id' => $user->id]);
+
+        $userColumnsByTable = [
+            'api_tokens' => ['user_id'],
+            'attachments' => ['created_by', 'updated_by'],
+            'comments' => ['created_by', 'updated_by'],
+            'deletions' => ['deleted_by'],
+            'email_confirmations' => ['user_id'],
+            'entities' => ['created_by', 'updated_by', 'owned_by'],
+            'favourites' => ['user_id'],
+            'images' => ['created_by', 'updated_by'],
+            'imports' => ['created_by'],
+            'joint_permissions' => ['owner_id'],
+            'mfa_values' => ['user_id'],
+            'page_update_drafts' => ['created_by'],
+            'page_revisions' => ['created_by'],
+            'role_user' => ['user_id'],
+            'social_accounts' => ['user_id'],
+            'user_invites' => ['user_id'],
+            'views' => ['user_id'],
+            'watches' => ['user_id'],
+        ];
+
+        // Ensure columns have user id before deletion
+        foreach ($userColumnsByTable as $table => $columns) {
+            foreach ($columns as $column) {
+                $this->assertDatabaseHas($table, [$column => $user->id]);
+            }
+        }
+
+        $resp = $this->asAdmin()->delete("settings/users/{$user->id}", ['new_owner_id' => '']);
+        $resp->assertRedirect('/settings/users');
+
+        // Ensure columns missing user id after deletion
+        foreach ($userColumnsByTable as $table => $columns) {
+            foreach ($columns as $column) {
+                $this->assertDatabaseMissing($table, [$column => $user->id]);
+            }
+        }
+
+        // Check models exist where should be retained
+        $this->assertDatabaseHas('attachments', ['id' => $attachment->id, 'created_by' => null, 'updated_by' => null]);
+        $this->assertDatabaseHas('comments', ['id' => $comment->id, 'created_by' => null, 'updated_by' => null]);
+        $this->assertDatabaseHas('deletions', ['id' => $deletion->id, 'deleted_by' => null]);
+        $this->assertDatabaseHas('entities', ['id' => $page->id, 'created_by' => null, 'updated_by' => null, 'owned_by' => null]);
+        $this->assertDatabaseHas('images', ['id' => $image->id, 'created_by' => null, 'updated_by' => null]);
+        $this->assertDatabaseHas('imports', ['id' => $import->id, 'created_by' => null]);
+        $this->assertDatabaseHas('page_revisions', ['id' => $revision->id, 'created_by' => null]);
+        $this->assertDatabaseHas('page_update_drafts', ['id' => $draft->id, 'created_by' => null]);
+
+        // Check models no longer exist where should have been deleted with the user
+        $this->assertDatabaseMissing('api_tokens', ['id' => $apiToken->id]);
+        $this->assertDatabaseMissing('email_confirmations', ['token' => 'abc123']);
+        $this->assertDatabaseMissing('favourites', ['id' => $favourite->id]);
+        $this->assertDatabaseMissing('mfa_values', ['id' => $mfaValue->id]);
+        $this->assertDatabaseMissing('social_accounts', ['id' => $socialAccount->id]);
+        $this->assertDatabaseMissing('user_invites', ['token' => 'abc123']);
+        $this->assertDatabaseMissing('watches', ['id' => $watch->id]);
+
+        // Ensure activity remains using the old ID (Special case for auditing changes)
+        $this->assertDatabaseHas('activities', ['id' => $activity->id, 'user_id' => $user->id]);
+    }
+
     public function test_delete_removes_user_preferences()
     {
         $editor = $this->users->editor();
@@ -247,9 +348,9 @@ public function test_user_creation_is_not_performed_if_the_invitation_sending_fa
         });
 
         $this->asAdmin()->post('/settings/users/create', [
-            'name'                          => $user->name,
-            'email'                         => $user->email,
-            'send_invite'                   => 'true',
+            'name' => $user->name,
+            'email' => $user->email,
+            'send_invite' => 'true',
             'roles[' . $adminRole->id . ']' => 'true',
         ]);
 
@@ -267,9 +368,9 @@ public function test_user_create_activity_is_not_persisted_if_the_invitation_sen
         });
 
         $this->asAdmin()->post('/settings/users/create', [
-            'name'                          => $user->name,
-            'email'                         => $user->email,
-            'send_invite'                   => 'true',
+            'name' => $user->name,
+            'email' => $user->email,
+            'send_invite' => 'true',
         ]);
 
         $this->assertDatabaseMissing('activities', ['type' => 'USER_CREATE']);
@@ -286,9 +387,9 @@ public function test_return_to_form_with_warning_if_the_invitation_sending_fails
         });
 
         $resp = $this->asAdmin()->post('/settings/users/create', [
-            'name'                          => $user->name,
-            'email'                         => $user->email,
-            'send_invite'                   => 'true',
+            'name' => $user->name,
+            'email' => $user->email,
+            'send_invite' => 'true',
         ]);
 
         $resp->assertRedirect('/settings/users/create');
@@ -314,8 +415,8 @@ public function test_user_create_update_fails_if_locale_is_invalid()
         // Both on create
         $resp = $this->post('/settings/users/create', [
             'language' => 'en<GB_and_this_is_longer',
-            'name'     => 'My name',
-            'email'    => 'jimmy@example.com',
+            'name' => 'My name',
+            'email' => 'jimmy@example.com',
         ]);
         $resp->assertSessionHasErrors(['language' => 'The language may not be greater than 15 characters.']);
         $resp->assertSessionHasErrors(['language' => 'The language may only contain letters, numbers, dashes and underscores.']);
diff --git a/tests/User/UserMyAccountTest.php b/tests/User/UserMyAccountTest.php
index e1b40daddcf..e2c054befe4 100644
--- a/tests/User/UserMyAccountTest.php
+++ b/tests/User/UserMyAccountTest.php
@@ -135,6 +135,8 @@ public function test_profile_self_delete_shows_ownership_migration_if_can_manage
     public function test_auth_password_change()
     {
         $editor = $this->users->editor();
+        $editor->password = Hash::make('password');
+        $editor->save();
 
         $resp = $this->actingAs($editor)->get('/my-account/auth');
         $resp->assertSee('Change Password');
@@ -144,6 +146,7 @@ public function test_auth_password_change()
         $resp = $this->put('/my-account/auth/password', [
             'password' => $password,
             'password-confirm' => $password,
+            'password-current' => 'password'
         ]);
         $resp->assertRedirect('/my-account/auth');
 
@@ -151,6 +154,28 @@ public function test_auth_password_change()
         $this->assertTrue(Hash::check($password, $editor->password));
     }
 
+    public function test_auth_password_change_requires_current_password()
+    {
+        $editor = $this->users->editor();
+        $editor->password = Hash::make('password');
+        $editor->save();
+
+        $this->actingAs($editor)->get('/my-account/auth');
+
+        $password = Str::random();
+        $resp = $this->put('/my-account/auth/password', [
+            'password' => $password,
+            'password-confirm' => $password,
+            'password-current' => 'caterpillar'
+        ]);
+        $resp->assertRedirect('/my-account/auth');
+        $resp->assertSessionHasErrors(['password-current']);
+
+        $editor->refresh();
+        $this->assertFalse(Hash::check($password, $editor->password));
+        $this->assertTrue(Hash::check('password', $editor->password));
+    }
+
     public function test_auth_password_change_hides_if_not_using_email_auth()
     {
         $editor = $this->users->editor();
@@ -329,11 +354,40 @@ public function test_notification_comment_options_only_exist_if_comments_active(
         $resp = $this->asEditor()->get('/my-account/notifications');
         $resp->assertSee('Notify upon comments');
         $resp->assertSee('Notify upon replies');
+        $resp->assertSee('Notify when I\'m mentioned in a comment');
 
         setting()->put('app-disable-comments', true);
 
         $resp = $this->get('/my-account/notifications');
         $resp->assertDontSee('Notify upon comments');
         $resp->assertDontSee('Notify upon replies');
+        $resp->assertDontSee('Notify when I\'m mentioned in a comment');
+    }
+
+    public function test_notification_comment_mention_option_enabled_by_default()
+    {
+        $resp = $this->asEditor()->get('/my-account/notifications');
+        $this->withHtml($resp)->assertElementExists('input[name="preferences[comment-mentions]"][value="true"]');
+    }
+
+    public function test_update_interface_preferences()
+    {
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+
+        $this->assertEquals('en', $editor->getLocale()->appLocale());
+        $this->assertFalse(setting()->getUser($editor, 'dark-mode-enabled'));
+
+        $resp = $this->get('/my-account/interface');
+        $resp->assertOk();
+
+        $resp->assertSeeText('Preferred Language');
+        $resp->assertSeeText('UI Layout Preferences');
+
+        $resp = $this->put('/my-account/interface', ['language' => 'fr', 'display_mode' => 'dark']);
+        $resp->assertRedirect('/my-account/interface');
+
+        $this->assertEquals('fr', $editor->getLocale()->appLocale());
+        $this->assertTrue(setting()->getUser($editor, 'dark-mode-enabled'));
     }
 }
diff --git a/tests/User/UserPreferencesTest.php b/tests/User/UserPreferencesTest.php
index ff3cb63ca70..e893f002dfd 100644
--- a/tests/User/UserPreferencesTest.php
+++ b/tests/User/UserPreferencesTest.php
@@ -153,6 +153,26 @@ public function test_shelf_view_type_change()
             ->assertElementNotExists('.content-wrap .entity-list-item');
     }
 
+    public function test_redirect_on_preference_change_checks_host()
+    {
+        $expectedByRedirect = [
+            'http://localhost/beans' => 'http://localhost/beans',
+            'https://localhost/beans' => 'http://localhost',
+            'http://localhost:9090/beans' => 'http://localhost',
+            'http://localhost.example.com/beans' => 'http://localhost',
+            'http://localhost@example.com/beans' => 'http://localhost',
+        ];
+
+        $this->asEditor();
+        foreach ($expectedByRedirect as $url => $expected) {
+            $req = $this->patch("/preferences/change-view/bookshelf", [
+                'view' => 'grid',
+                '_return' => $url,
+            ]);
+            $req->assertRedirect($expected);
+        }
+    }
+
     public function test_update_code_language_favourite()
     {
         $editor = $this->users->editor();
diff --git a/tests/User/UserSearchTest.php b/tests/User/UserSearchTest.php
index 76efbf4af9b..25c7c6ee928 100644
--- a/tests/User/UserSearchTest.php
+++ b/tests/User/UserSearchTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\User;
 
+use BookStack\Permissions\Permission;
 use BookStack\Users\Models\User;
 use Tests\TestCase;
 
@@ -62,4 +63,70 @@ public function test_select_requires_logged_in_user()
         $resp = $this->get('/search/users/select?search=a');
         $this->assertPermissionError($resp);
     }
+
+    public function test_mentions_search_matches_by_name()
+    {
+        $viewer = $this->users->viewer();
+        $editor = $this->users->editor();
+
+        $resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
+
+        $resp->assertOk();
+        $resp->assertSee($viewer->name);
+        $resp->assertDontSee($editor->name);
+    }
+
+    public function test_mentions_search_does_not_match_by_email()
+    {
+        $viewer = $this->users->viewer();
+
+        $resp = $this->asEditor()->get('/search/users/mention?search=' . urlencode($viewer->email));
+
+        $resp->assertDontSee($viewer->name);
+    }
+
+    public function test_mentions_search_requires_logged_in_user()
+    {
+        $this->setSettings(['app-public' => true]);
+        $guest = $this->users->guest();
+        $this->permissions->grantUserRolePermissions($guest, [Permission::CommentCreateAll, Permission::CommentUpdateAll]);
+
+        $resp = $this->get('/search/users/mention?search=a');
+        $this->assertPermissionError($resp);
+    }
+
+    public function test_mentions_search_requires_comment_create_or_update_permission()
+    {
+        $viewer = $this->users->viewer();
+        $editor = $this->users->editor();
+
+        $resp = $this->actingAs($viewer)->get('/search/users/mention?search=' . urlencode($editor->name));
+        $this->assertPermissionError($resp);
+
+        $this->permissions->grantUserRolePermissions($viewer, [Permission::CommentCreateAll]);
+
+        $resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
+        $resp->assertOk();
+        $resp->assertSee($viewer->name);
+
+        $this->permissions->removeUserRolePermissions($viewer, [Permission::CommentCreateAll]);
+        $this->permissions->grantUserRolePermissions($viewer, [Permission::CommentUpdateAll]);
+
+        $resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
+        $resp->assertOk();
+        $resp->assertSee($viewer->name);
+    }
+
+    public function test_mentions_search_shows_first_by_name_without_search()
+    {
+        /** @var User $firstUser */
+        $firstUser = User::query()
+            ->orderBy('name', 'asc')
+            ->first();
+
+        $resp = $this->asEditor()->get('/search/users/mention');
+
+        $resp->assertOk();
+        $this->withHtml($resp)->assertElementContains('a[data-id]:first-child', $firstUser->name);
+    }
 }
diff --git a/tests/Util/HtmlToPlainTextTest.php b/tests/Util/HtmlToPlainTextTest.php
new file mode 100644
index 00000000000..e522e486360
--- /dev/null
+++ b/tests/Util/HtmlToPlainTextTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Util;
+
+use BookStack\Util\HtmlToPlainText;
+use Tests\TestCase;
+
+class HtmlToPlainTextTest extends TestCase
+{
+    public function test_it_converts_html_to_plain_text()
+    {
+        $html = <<<HTML
+<p>This is a test</p>
+<ul>
+<li>Item 1</li>
+<li>Item 2</li>
+</ul>
+<h2>A Header</h2>
+<p>more &lt;&copy;&gt; text <strong>with bold</strong></p>
+HTML;
+        $expected = <<<TEXT
+This is a test
+Item 1
+Item 2
+A Header
+more <©> text with bold
+TEXT;
+
+        $this->runTest($html, $expected);
+    }
+
+    public function test_adjacent_list_items_are_separated_by_newline()
+    {
+        $html = <<<HTML
+<ul><li>Item A</li><li>Item B</li></ul>
+HTML;
+        $expected = <<<TEXT
+Item A
+Item B
+TEXT;
+
+        $this->runTest($html, $expected);
+    }
+
+    public function test_inline_formats_dont_cause_newlines()
+    {
+        $html = <<<HTML
+<p><strong>H</strong><a>e</a><sup>l</sup><span>l</span><em>o</em></p>
+HTML;
+        $expected = <<<TEXT
+Hello
+TEXT;
+
+        $this->runTest($html, $expected);
+    }
+
+    protected function runTest(string $html, string $expected): void
+    {
+        $converter = new HtmlToPlainText();
+        $result = $converter->convert(trim($html));
+        $this->assertEquals(trim($expected), $result);
+    }
+}
diff --git a/tests/Util/SsrUrlValidatorTest.php b/tests/Util/SsrUrlValidatorTest.php
new file mode 100644
index 00000000000..12e1765171e
--- /dev/null
+++ b/tests/Util/SsrUrlValidatorTest.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Tests\Util;
+
+use BookStack\Exceptions\HttpFetchException;
+use BookStack\Util\SsrUrlValidator;
+use Tests\TestCase;
+
+class SsrUrlValidatorTest extends TestCase
+{
+    public function test_is_uses_app_config_by_default()
+    {
+        config()->set([
+            'app.ssr_hosts' => 'https://donkey.example.com',
+        ]);
+
+        $validator = new SsrUrlValidator();
+
+        $this->assertTrue($validator->allowed('https://donkey.example.com'));
+        $this->assertFalse($validator->allowed('https://monkey.example.com'));
+    }
+
+    public function test_config_string_can_be_passed_in_constructor()
+    {
+        config()->set([
+            'app.ssr_hosts' => 'https://donkey.example.com',
+        ]);
+
+        $validator = new SsrUrlValidator('https://monkey.example.com');
+
+        $this->assertFalse($validator->allowed('https://donkey.example.com'));
+        $this->assertTrue($validator->allowed('https://monkey.example.com'));
+    }
+
+    public function test_config_string_can_include_multiple_space_seperated_values()
+    {
+        $validator = new SsrUrlValidator('https://monkey.example.com https://cat.example.com');
+
+        $this->assertFalse($validator->allowed('https://donkey.example.com'));
+        $this->assertTrue($validator->allowed('https://monkey.example.com'));
+        $this->assertTrue($validator->allowed('https://cat.example.com'));
+    }
+
+    public function test_ensure_allowed_throws_if_not_allowed()
+    {
+        $validator = new SsrUrlValidator('https://monkey.example.com');
+
+        $this->assertNull($validator->ensureAllowed('https://monkey.example.com'));
+
+        $this->assertThrows(function () use ($validator) {
+            $validator->ensureAllowed('https://donkey.example.com');
+        }, HttpFetchException::class, 'The URL does not match the configured allowed SSR hosts');
+    }
+
+    public function test_basic_url_matching()
+    {
+        $tests = [
+            // Single values
+            ['config' => '', 'url' => '', 'result' => false],
+            ['config' => '', 'url' => 'https://example.com', 'result' => false],
+            ['config' => '    ', 'url' => 'https://example.com', 'result' => false],
+            ['config' => '*', 'url' => '', 'result' => false],
+            ['config' => '*', 'url' => 'https://example.com', 'result' => true],
+            ['config' => 'https://*', 'url' => 'https://example.com', 'result' => true],
+            ['config' => 'http://*', 'url' => 'https://example.com', 'result' => false],
+            ['config' => 'https://*example.com', 'url' => 'https://example.com', 'result' => true],
+            ['config' => 'https://*ample.com', 'url' => 'https://example.com', 'result' => true],
+            ['config' => 'https://*.example.com', 'url' => 'https://example.com', 'result' => false],
+            ['config' => 'https://*.example.com', 'url' => 'https://test.example.com', 'result' => true],
+            ['config' => '*//example.com', 'url' => 'https://example.com', 'result' => true],
+            ['config' => '*//example.com', 'url' => 'http://example.com', 'result' => true],
+            ['config' => '*//example.co', 'url' => 'http://example.co.uk', 'result' => false],
+            ['config' => '*//example.co/bookstack', 'url' => 'https://example.co/bookstack/a/path', 'result' => true],
+            ['config' => '*//example.co*', 'url' => 'https://example.co.uk/bookstack/a/path', 'result' => true],
+            ['config' => 'https://example.com', 'url' => 'https://example.com/a/b/c?test=cat', 'result' => true],
+            ['config' => 'https://example.com', 'url' => 'https://example.co.uk', 'result' => false],
+
+            // Escapes
+            ['config' => 'https://(.*?).com', 'url' => 'https://example.com', 'result' => false],
+            ['config' => 'https://example.com', 'url' => 'https://example.co.uk#https://example.com', 'result' => false],
+
+            // Multi values
+            ['config' => '*//example.org *//example.com', 'url' => 'https://example.com', 'result' => true],
+            ['config' => '*//example.org *//example.com', 'url' => 'https://example.com/a/b/c?test=cat#hello', 'result' => true],
+            ['config' => '*.example.org *.example.com', 'url' => 'https://example.co.uk', 'result' => false],
+            ['config' => '  *.example.org  *.example.com  ', 'url' => 'https://example.co.uk', 'result' => false],
+            ['config' => '* *.example.com', 'url' => 'https://example.co.uk', 'result' => true],
+            ['config' => '*//example.org *//example.com *//example.co.uk', 'url' => 'https://example.co.uk', 'result' => true],
+            ['config' => '*//example.org *//example.com *//example.co.uk', 'url' => 'https://example.net', 'result' => false],
+
+            // Further tests
+            ['config' => 'https://monkey.example.com', 'url' => 'https://monkey.example.com/a/b', 'result' => true,],
+            ['config' => 'https://monkey.example.com', 'url' => 'https://monkey.example.com/a/b?a=b#ab', 'result' => true,],
+            ['config' => 'https://monkey.example.com', 'url' => 'https://monkey.example.com:8080/a', 'result' => false,],
+            ['config' => '*', 'url' => 'https://a.example.com', 'result' => true,],
+            ['config' => 'https://monkey.example.com', 'url' => 'http://monkey.example.com/a/b?a=b#ab', 'result' => false,],
+            ['config' => 'https://monkey.example.com', 'url' => 'https://beans.monkey.example.com/a/b?a=b#ab', 'result' => false,],
+            ['config' => 'https://*monkey.example.com', 'url' => 'https://amonkey.example.com/a/b?a=b#ab', 'result' => true,],
+            ['config' => 'https://*monkey.example.com', 'url' => 'https://donkey.example.com/a/b/monkey.example.com/b?a=b#ab', 'result' => false,],
+            ['config' => 'https://monkey.example.com', 'url' => 'https://example.com/monkey.example.com/b?a=monkey.example.com#monkey.example.com', 'result' => false,],
+            ['config' => 'https://*.example.com', 'url' => 'https://a.b.example.com/a/b', 'result' => true,],
+            ['config' => 'https://*.example.com', 'url' => 'https://a.b.example.a.com/a/b', 'result' => false,],
+            ['config' => 'https://*.example.com', 'url' => 'https://a.com/a/b?val=a.example.com', 'result' => false,],
+            ['config' => 'https://*.example.com', 'url' => 'https://a.com/a/b#example.com', 'result' => false,],
+            ['config' => 'https://a.*.example.com', 'url' => 'https://a.b.c.example.com/c/d', 'result' => true,],
+            ['config' => 'https://example.com/webhooks/', 'url' => 'https://example.com/webhooks/beans', 'result' => true,],
+            ['config' => 'https://example.com/webhooks/', 'url' => 'https://example.com/a/webhooks/', 'result' => false,],
+            ['config' => 'https://example.com:8080', 'url' => 'https://example.com/a/b', 'result' => false,],
+            ['config' => 'https://example.com:8080', 'url' => 'https://example.com:8080/a/b', 'result' => true,],
+            ['config' => 'https://example.com/*', 'url' => 'https://example.com:8080/a/b', 'result' => false,],
+        ];
+
+        foreach ($tests as $testCase) {
+            $validator = new SsrUrlValidator($testCase['config']);
+            $result = $validator->allowed($testCase['url']);
+            $this->assertEquals($testCase['result'], $result, "Failed asserting expected result for config {$testCase['config']} and test value {$testCase['url']}");
+        }
+    }
+
+    public function test_wildcard_does_not_match_userinfo_data_but_still_allows_it()
+    {
+        $validator = new SsrUrlValidator('https://*monkey.example.com');
+        $this->assertFalse($validator->allowed('https://monkey.example.com@a.example.com'));
+
+        $validator = new SsrUrlValidator('https://monkey.example.com*');
+        $this->assertFalse($validator->allowed('https://monkey.example.com@a.example.com'));
+        $this->assertFalse($validator->allowed('https://monkey.example.com:monkey.example.com@a.example.com'));
+
+        $validator = new SsrUrlValidator('https://monkey.example.com');
+        $this->assertTrue($validator->allowed('https://a:b@monkey.example.com'));
+    }
+
+    public function test_percent_encoded_slashes_in_host_are_rejected()
+    {
+        $validator = new SsrUrlValidator('*');
+
+        $this->assertFalse($validator->allowed('https://cat.example.com%2Fa/b'));
+        $this->assertFalse($validator->allowed('https://cat.example.com%2fa/b'));
+        $this->assertFalse($validator->allowed('https://cat%2f.example.com/a/b'));
+        $this->assertFalse($validator->allowed('https://cat.exa%2Fmple.com'));
+    }
+}
diff --git a/tests/Util/UrlComparisonTest.php b/tests/Util/UrlComparisonTest.php
new file mode 100644
index 00000000000..af20011fa60
--- /dev/null
+++ b/tests/Util/UrlComparisonTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Util;
+
+use BookStack\Util\UrlComparison;
+use PHPUnit\Framework\TestCase;
+
+class UrlComparisonTest extends TestCase
+{
+    public function test_origins_match()
+    {
+        $good = [
+            ['http://localhost/a/b', 'http://localhost#cat'],
+            ['example.com/a/b', 'example.com?cat=dog'],
+            ['https://example.com:5050/a/b', 'https://example.com:5050/a/b'],
+        ];
+
+        $bad = [
+            ['http://localhost/a/b', 'http://localh0st#cat'],
+            ['https://example.com/a/b', 'http://example.com?cat=dog'],
+            ['https://example.com:5051/a/b', 'https://example.com:5050/a/b'],
+        ];
+
+        foreach ($good as [$a, $b]) {
+            $comparison = new UrlComparison($a, $b);
+            $this->assertTrue($comparison->originsMatch());
+        }
+
+        foreach ($bad as [$a, $b]) {
+            $comparison = new UrlComparison($a, $b);
+            $this->assertFalse($comparison->originsMatch());
+        }
+    }
+
+    public function test_paths_overlap()
+    {
+        $good = [
+            ['https://example.com', 'https://example.com/a/b/c'],
+            ['https://example.com/', 'https://example.com/a/b/c'],
+            ['https://example.com/a/b', 'https://example.com/a/b/c'],
+            ['https://example.com/a/b/c', 'https://example.com/a'],
+            ['http://donk.com/a/b/c?a=b#cat', 'https://example.com:5005/a/b#hello'],
+        ];
+
+        $bad = [
+            ['https://example.com/a/c', 'https://example.com/a/b/c/d'],
+            ['https://example.com/a/c', 'https://example.com/d/a/c'],
+        ];
+
+        foreach ($good as [$a, $b]) {
+            $comparison = new UrlComparison($a, $b);
+            $this->assertTrue($comparison->pathsOverlap());
+        }
+
+        foreach ($bad as [$a, $b]) {
+            $comparison = new UrlComparison($a, $b);
+            $this->assertFalse($comparison->pathsOverlap());
+        }
+    }
+}
diff --git a/tests/Util/UrlFilterTest.php b/tests/Util/UrlFilterTest.php
new file mode 100644
index 00000000000..9928253d68a
--- /dev/null
+++ b/tests/Util/UrlFilterTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Tests\Util;
+
+use BookStack\Util\UrlFilter;
+use Tests\TestCase;
+
+class UrlFilterTest extends TestCase
+{
+    public function test_it_finds_invalid_urls()
+    {
+        $urls = [
+            'javascript:alert("bunny")',
+            ' javascript:alert("bunny")',
+            'JavaScript:alert("bunny")',
+            "\t\n\t\nJavaScript:alert(\"bunny\")",
+            'data:text/html;bunny<a></a>',
+            'Data:text/html;bunny<a></a>',
+            'Data:text/html;bunny<a></a>',
+            "http://example.com\0javascript:alert(1)",
+        ];
+
+        foreach ($urls as $url) {
+            $filter = new UrlFilter($url);
+            $this->assertFalse($filter->isAllowed(), "Failed to detect invalid url: {$url}");
+        }
+    }
+
+    public function test_clean()
+    {
+        $expectedOutputByInput = [
+            'javascript:alert("bunny")' => '#badlink',
+            ' javascript:alert("bunny")' => '#badlink',
+            'JavaScript:alert("bunny")' => '#badlink',
+            "\t\n\t\nJavaScript:alert(\"bunny\")" => '#badlink',
+            'data:text/html;bunny<a></a>' => '#badlink',
+            'Data:text/html;bunny<a></a>' => '#badlink',
+            'Data:text/html;bunny<a></a>' => '#badlink',
+            "http://example.com\0javascript:alert(1)" => '#badlink',
+            "Java\tScript:alert(\"bunny\")" => '#badlink',
+
+            'https://example.com' => 'https://example.com',
+            'https://example.com/a/b' => 'https://example.com/a/b',
+            'https://example.com/a/b?a=b#ab' => 'https://example.com/a/b?a=b#ab',
+            'https://example.com/a/b?a=b#ab&c=d' => 'https://example.com/a/b?a=b#ab&c=d',
+            'https://example.com:5050' => 'https://example.com:5050',
+            'https://example.com:5050/a/b' => 'https://example.com:5050/a/b',
+            'https://example.com:5050/a/b?a=b#ab' => 'https://example.com:5050/a/b?a=b#ab',
+            'https://user@example.com:5011/a/b?a=b' => 'https://user@example.com:5011/a/b?a=b',
+            'https://user:pass@example.com:5011/a/b?a=b' => 'https://user:pass@example.com:5011/a/b?a=b',
+
+            '//example.com' => 'https://example.com',
+            'a/b/c' => 'a/b/c',
+            '/a/b/c' => '/a/b/c',
+
+            'tel:123456789' => 'tel:123456789',
+            'TEL:123456789' => 'tel:123456789',
+            'maiLto:a@b.c' => 'mailto:a@b.c',
+            'file://a/b/c' => 'file://a/b/c',
+            'ftp://a/b/c' => 'ftp://a/b/c',
+            'sftp://a/b/c' => 'sftp://a/b/c',
+            'nntp://a/b/c' => 'nntp://a/b/c',
+            'news:a/b/c' => 'news:a/b/c',
+            '#a-reference-to-an-id' => '#a-reference-to-an-id',
+        ];
+
+        foreach ($expectedOutputByInput as $input => $expected) {
+            $filter = new UrlFilter($input);
+            $output = $filter->clean();
+            $this->assertEquals($expected, $output, "Failed to clean url: {$input}");
+        }
+    }
+}
diff --git a/tests/View/HeaderBarTest.php b/tests/View/HeaderBarTest.php
new file mode 100644
index 00000000000..1c50fcdb557
--- /dev/null
+++ b/tests/View/HeaderBarTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\View;
+
+use Tests\TestCase;
+
+class HeaderBarTest extends TestCase
+{
+    public function test_header_logo_alt_tag_blank_when_used_with_app_name()
+    {
+        $this->setSettings([
+            'app-name' => 'Dino Docs',
+            'app-logo' => '',
+            'app-name-header' => true,
+        ]);
+
+        $resp = $this->get('/login');
+        $this->withHtml($resp)->assertElementExists('header img.logo-image[alt=""]');
+    }
+
+    public function test_header_logo_alt_tag_uses_app_name_when_name_not_shown_in_header()
+    {
+        $this->setSettings([
+            'app-name' => 'Dino Docs',
+            'app-logo' => '',
+            'app-name-header' => false,
+        ]);
+
+        $resp = $this->get('/login');
+        $this->withHtml($resp)->assertElementExists('header img.logo-image[alt="Dino Docs"]');
+    }
+}
diff --git a/tests/View/LayoutEditTest.php b/tests/View/LayoutEditTest.php
new file mode 100644
index 00000000000..7a31e0e684b
--- /dev/null
+++ b/tests/View/LayoutEditTest.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace Tests\View;
+
+use BookStack\Activity\Models\Favourite;
+use Tests\TestCase;
+
+class LayoutEditTest extends TestCase
+{
+    public function test_route_access_limited_to_logged_in_users()
+    {
+        $this->setSettings(['app-public' => 'true']);
+
+        $this->get('/layouts/books-show')->assertRedirect('/');
+        $this->put('/layouts/books-show')->assertRedirect('/');
+        $this->put('/layouts/books-show/reset')->assertRedirect('/');
+    }
+
+    public function test_view()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-index');
+        $resp->assertOk();
+
+        $resp->assertSee('Back to Preferences');
+        $resp->assertSee('Edit Layout');
+        $resp->assertSee('Popular Books');
+        $resp->assertDontSee('My Recent Drafts');
+    }
+
+    public function test_view_loads_existing_preferences()
+    {
+        $this->asEditor();
+        setting()->putForCurrentUser('view-layout#books-show', json_encode([
+            'left' => [
+            ],
+            'right' => [
+            ],
+            'unused' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+                'builtin_books-show-activity',
+                'builtin_books-show-shelves',
+                'builtin_books-show-tags',
+                'builtin_books-show-details',
+            ],
+        ]));
+
+        $resp = $this->get('/layouts/books-show');
+        $resp->assertOk();
+        $html = $this->withHtml($resp);
+
+        $html->assertElementCount('[data-column="unused"] > li', 7);
+        $html->assertElementCount('[data-column="left"] > li', 1);
+        $html->assertElementCount('[data-column="right"] > li', 1);
+    }
+
+    public function test_view_only_shows_center_column_for_relevant_layouts()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertElementCount('[data-column="center"]', 0);
+
+        $resp = $this->asEditor()->get('/layouts/home-default');
+        $html = $this->withHtml($resp);
+        $html->assertElementCount('[data-column="center"]', 1);
+    }
+
+    public function test_only_single_homepage_option_shows_depending_on_app_homepage_setting()
+    {
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertLinkExists(url('/layouts/home-default'), 'Homepage');
+        $html->assertLinkNotExists(url('/layouts/home-non-default'), 'Homepage');
+
+        $this->setSettings(['app-homepage-type' => 'books']);
+
+        $resp = $this->asEditor()->get('/layouts/books-show');
+        $html = $this->withHtml($resp);
+        $html->assertLinkExists(url('/layouts/home-non-default'), 'Homepage');
+        $html->assertLinkNotExists(url('/layouts/home-default'), 'Homepage');
+    }
+
+    public function test_update()
+    {
+        $layout = [
+            'left' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+            ],
+            'center' => [
+                'builtin_books-show-tags', // Should be ignored as there's no center position
+            ],
+            'right' => [
+                'builtin_books-show-activity',
+                'totally_invalid_value', // Should be removed
+            ],
+            'unused' => [
+                'builtin_books-show-shelves',
+            ],
+        ];
+
+        $resp = $this->asEditor()->put('/layouts/books-show', ['layout' => json_encode($layout)]);
+        $resp->assertRedirect('/layouts/books-show');
+        $this->assertSessionHas('success');
+
+        $userPreferenceString = setting()->getForCurrentUser('view-layout#books-show');
+        $this->assertJson($userPreferenceString);
+        $storedData = json_decode($userPreferenceString, true);
+
+        $this->assertEquals([
+            'left' => [
+                'builtin_books-show-search-form',
+                'builtin_books-show-actions',
+            ],
+            'right' => [
+                'builtin_books-show-activity',
+            ],
+            'unused' => [
+                'builtin_books-show-shelves',
+            ],
+        ], $storedData);
+    }
+
+    public function test_malformed_update()
+    {
+        $layout = [
+            'left' => 'a',
+            'right' => ['builtin_books-show-activity', 5],
+        ];
+
+        $resp = $this->asEditor()->put('/layouts/books-show', ['layout' => json_encode($layout)]);
+        $resp->assertRedirect('/layouts/books-show');
+
+        $userPreferenceString = setting()->getForCurrentUser('view-layout#books-show');
+        $this->assertJson($userPreferenceString);
+        $storedData = json_decode($userPreferenceString, true);
+
+        $this->assertEquals([
+            'right' => [
+                'builtin_books-show-activity',
+            ],
+        ], $storedData);
+    }
+
+    public function test_layout_changes_take_effect()
+    {
+        $editor = $this->users->editor();
+        $this->actingAs($editor);
+        $page = $this->entities->page();
+        $page->favourites()->save((new Favourite())->forceFill(['user_id' => $editor->id]));
+        $this->get($page->getUrl());
+
+        $html = $this->withHtml($this->get('/'));
+
+        $html->assertElementExists('.grid.third > div:nth-child(1) h3:contains("My Recently Viewed")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("My Most Viewed Favourites")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("Recently Updated Pages")');
+        $html->assertElementExists('.grid.third > div:nth-child(3) h3:contains("Recent Activity")');
+
+        $layout = [
+            'left' => [
+                'builtin_home-top-favourites',
+            ],
+            'center' => [
+                'builtin_home-recent-activity',
+            ],
+            'right' => [
+                'builtin_home-recently-viewed-or-recent-books',
+            ],
+            'unused' => [
+                'builtin_home-recently-updated-pages',
+            ],
+        ];
+
+        $this->put('/layouts/home-default', ['layout' => json_encode($layout)])->assertRedirect('/layouts/home-default');
+        $html = $this->withHtml($this->get('/'));
+
+        $html->assertElementExists('.grid.third > div:nth-child(3) h3:contains("My Recently Viewed")');
+        $html->assertElementExists('.grid.third > div:nth-child(1) h3:contains("My Most Viewed Favourites")');
+        $html->assertElementNotExists('h3:contains("Recently Updated Pages")');
+        $html->assertElementExists('.grid.third > div:nth-child(2) h3:contains("Recent Activity")');
+    }
+
+    public function test_reset()
+    {
+        $this->asEditor();
+
+        $settingKey = 'view-layout#books-show';
+        setting()->putForCurrentUser($settingKey, json_encode(['left' => [], 'right' => [], 'unused' => ['builtin_books-show-activity']]));
+
+        $resp = $this->asEditor()->put('/layouts/books-show/reset');
+        $resp->assertRedirect('/layouts/books-show');
+        $this->assertSessionHas('success');
+
+        $this->assertFalse(setting()->getForCurrentUser($settingKey));
+    }
+}
diff --git a/tests/View/ViewBlockDefaultsTest.php b/tests/View/ViewBlockDefaultsTest.php
new file mode 100644
index 00000000000..6b47bcea7e7
--- /dev/null
+++ b/tests/View/ViewBlockDefaultsTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\View;
+
+use BookStack\View\ViewBlockDefaults;
+use Tests\TestCase;
+
+class ViewBlockDefaultsTest extends TestCase
+{
+    public function test_each_has_a_unique_id_and_non_key_label()
+    {
+        $locations = ViewBlockDefaults::getLocations();
+        $classes = [];
+        $trueById = [];
+
+        foreach ($locations as $location) {
+            $blocksByPosition = ViewBlockDefaults::getForLocation($location);
+            foreach ($blocksByPosition as $blocks) {
+                array_push($classes, ...$blocks);
+            }
+        }
+
+        $blocks = array_unique($classes);
+        foreach ($blocks as $block) {
+            $id = $block::getId();
+            $this->assertArrayNotHasKey($id, $trueById);
+            $trueById[$id] = true;
+
+            $label = $block::getLabel();
+            $this->assertIsString($label);
+            $this->assertDoesNotMatchRegularExpression('/^[a-z]{1,10}\./', $label);
+        }
+
+        $this->assertGreaterThan(10, count($trueById));
+    }
+}
diff --git a/tests/test-data/fonts/Cardiff-Bold.ttf b/tests/test-data/fonts/Cardiff-Bold.ttf
new file mode 100644
index 00000000000..efaae4d9eb0
Binary files /dev/null and b/tests/test-data/fonts/Cardiff-Bold.ttf differ
diff --git a/tests/test-data/fonts/Cardiff.ttf b/tests/test-data/fonts/Cardiff.ttf
new file mode 100644
index 00000000000..4e8fea609c6
Binary files /dev/null and b/tests/test-data/fonts/Cardiff.ttf differ
diff --git a/tests/test-data/fonts/attribution.txt b/tests/test-data/fonts/attribution.txt
new file mode 100644
index 00000000000..e78c3892557
--- /dev/null
+++ b/tests/test-data/fonts/attribution.txt
@@ -0,0 +1,2 @@
+Font files by Roger White, in public domain.
+https://web.archive.org/web/20110609213636/http://www.rogersfonts.org.uk/
diff --git a/tsconfig.json b/tsconfig.json
index dacaefea279..55b61674cdb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,15 +2,16 @@
   "include": ["resources/js/**/*"],
   "exclude": ["resources/js/wysiwyg/lexical/yjs/*"],
   "compilerOptions": {
-    "target": "es2022",
-    "module": "commonjs",
+    "target": "es2023",
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "rootDir": "./resources/js/",
-    "baseUrl": "./",
+    "types": ["jest", "node"],
     "paths": {
-      "@icons/*": ["resources/icons/*"],
-      "lexical": ["resources/js/wysiwyg/lexical/core/index.ts"],
-      "lexical/*": ["resources/js/wysiwyg/lexical/core/*"],
-      "@lexical/*": ["resources/js/wysiwyg/lexical/*"]
+      "@icons/*": ["./resources/icons/*"],
+      "lexical": ["./resources/js/wysiwyg/lexical/core/index.ts"],
+      "lexical/*": ["./resources/js/wysiwyg/lexical/core/*"],
+      "@lexical/*": ["./resources/js/wysiwyg/lexical/*"]
     },
     "resolveJsonModule": true,
     "allowJs": true,
diff --git a/version b/version
index 51b8fdb6012..9eadc470b49 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v25.02-dev
+v26.05-dev