Lint

Update tests
Update __init__.py
2026-05-04 13:45:25 +00:00 · 2026-03-17 11:48:53 -07:00 · 2026-03-17 11:46:44 -07:00 · 2026-03-17 11:43:22 -07:00 · 2026-03-17 11:42:17 -07:00 · 2026-03-17 11:39:53 -07:00
523 changed files with 149470 additions and 244904 deletions
@@ -21,7 +21,6 @@ body:
        - [The installation instructions](https://docs.paperless-ngx.com/setup/#installation).
        - [Existing issues and discussions](https://github.com/paperless-ngx/paperless-ngx/search?q=&type=issues).
        - Disable any custom container initialization scripts, if using
-        - Remove any third-party parser plugins — issues caused by or requiring changes to a third-party plugin will be closed without investigation.

        If you encounter issues while installing or configuring Paperless-ngx, please post in the ["Support" section of the discussions](https://github.com/paperless-ngx/paperless-ngx/discussions/new?category=support).
  - type: textarea
@@ -157,15 +157,10 @@ updates:
      postgres:
        patterns:
          - "docker.io/library/postgres*"
-      greenmail:
-        patterns:
-          - "docker.io/greenmail*"
  - package-ecosystem: "pre-commit" # See documentation for possible values
    directory: "/" # Location of package manifests
    schedule:
      interval: "monthly"
-    cooldown:
-      default-days: 7
    groups:
      pre-commit-dependencies:
        patterns:
@@ -11,32 +11,25 @@ concurrency:
  group: backend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
  NLTK_DATA: "/usr/share/nltk_data"
-permissions: {}
 jobs:
  changes:
    name: Detect Backend Changes
    runs-on: ubuntu-slim
-    permissions:
-      contents: read
    outputs:
      backend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.backend == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          fetch-depth: 0
-          persist-credentials: false
      - name: Decide run mode
        id: force
-        env:
-          EVENT_NAME: ${{ github.event_name }}
-          REF_NAME: ${{ github.ref_name }}
        run: |
-          if [[ "${EVENT_NAME}" == "workflow_dispatch" ]]; then
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          elif [[ "${EVENT_NAME}" == "push" && ( "${REF_NAME}" == "main" || "${REF_NAME}" == "dev" ) ]]; then
+          elif [[ "${{ github.event_name }}" == "push" && ( "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "dev" ) ]]; then
            echo "run_all=true" >> "$GITHUB_OUTPUT"
          else
            echo "run_all=false" >> "$GITHUB_OUTPUT"
@@ -44,26 +37,19 @@ jobs:
      - name: Set diff range
        id: range
        if: steps.force.outputs.run_all != 'true'
-        env:
-          BEFORE_SHA: ${{ github.event.before }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-          EVENT_CREATED: ${{ github.event.created }}
-          EVENT_NAME: ${{ github.event_name }}
-          PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          SHA: ${{ github.sha }}
        run: |
-          if [[ "${EVENT_NAME}" == "pull_request" ]]; then
-            echo "base=${PR_BASE_SHA}" >> "$GITHUB_OUTPUT"
-          elif [[ "${EVENT_CREATED}" == "true" ]]; then
-            echo "base=${DEFAULT_BRANCH}" >> "$GITHUB_OUTPUT"
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "base=${{ github.event.pull_request.base.sha }}" >> "$GITHUB_OUTPUT"
+          elif [[ "${{ github.event.created }}" == "true" ]]; then
+            echo "base=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
          else
-            echo "base=${BEFORE_SHA}" >> "$GITHUB_OUTPUT"
+            echo "base=${{ github.event.before }}" >> "$GITHUB_OUTPUT"
          fi
-          echo "ref=${SHA}" >> "$GITHUB_OUTPUT"
+          echo "ref=${{ github.sha }}" >> "$GITHUB_OUTPUT"
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@v3.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -79,28 +65,24 @@ jobs:
    if: needs.changes.outputs.backend_changed == 'true'
    name: "Python ${{ matrix.python-version }}"
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    strategy:
      matrix:
        python-version: ['3.11', '3.12', '3.13', '3.14']
      fail-fast: false
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Start containers
        run: |
          docker compose --file docker/compose/docker-compose.ci-test.yml pull --quiet
          docker compose --file docker/compose/docker-compose.ci-test.yml up --detach
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: "${{ matrix.python-version }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -114,11 +96,9 @@ jobs:
        run: |
          sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml
      - name: Install Python dependencies
-        env:
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          uv sync \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            --group testing \
            --frozen
      - name: List installed Python dependencies
@@ -126,27 +106,26 @@ jobs:
          uv pip list
      - name: Install NLTK data
        run: |
-          uv run python -m nltk.downloader punkt punkt_tab snowball_data stopwords -d "${NLTK_DATA}"
+          uv run python -m nltk.downloader punkt punkt_tab snowball_data stopwords -d ${{ env.NLTK_DATA }}
      - name: Run tests
        env:
          NLTK_DATA: ${{ env.NLTK_DATA }}
          PAPERLESS_CI_TEST: 1
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          uv run \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            --dev \
            --frozen \
            pytest
      - name: Upload test results to Codecov
        if: always()
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@v5.5.2
        with:
          flags: backend-python-${{ matrix.python-version }}
          files: junit.xml
          report_type: test_results
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@v5.5.2
        with:
          flags: backend-python-${{ matrix.python-version }}
          files: coverage.xml
@@ -161,33 +140,26 @@ jobs:
    if: needs.changes.outputs.backend_changed == 'true'
    name: Check project typing
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    env:
      DEFAULT_PYTHON: "3.12"
-      PAPERLESS_SECRET_KEY: "ci-typing-not-a-real-secret"
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: "${{ env.DEFAULT_PYTHON }}"
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
          python-version: ${{ steps.setup-python.outputs.python-version }}
      - name: Install Python dependencies
-        env:
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          uv sync \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            --group testing \
            --group typing \
            --frozen
@@ -201,7 +173,7 @@ jobs:
            check \
            src/
      - name: Cache Mypy
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: .mypy_cache
          # Keyed by OS, Python version, and dependency hashes
@@ -223,23 +195,19 @@ jobs:
    runs-on: ubuntu-slim
    steps:
      - name: Check gate
-        env:
-          BACKEND_CHANGED: ${{ needs.changes.outputs.backend_changed }}
-          TEST_RESULT: ${{ needs.test.result }}
-          TYPING_RESULT: ${{ needs.typing.result }}
        run: |
-          if [[ "${BACKEND_CHANGED}" != "true" ]]; then
+          if [[ "${{ needs.changes.outputs.backend_changed }}" != "true" ]]; then
            echo "No backend-relevant changes detected."
            exit 0
          fi

-          if [[ "${TEST_RESULT}" != "success" ]]; then
-            echo "::error::Backend test job result: ${TEST_RESULT}"
+          if [[ "${{ needs.test.result }}" != "success" ]]; then
+            echo "::error::Backend test job result: ${{ needs.test.result }}"
            exit 1
          fi

-          if [[ "${TYPING_RESULT}" != "success" ]]; then
-            echo "::error::Backend typing job result: ${TYPING_RESULT}"
+          if [[ "${{ needs.typing.result }}" != "success" ]]; then
+            echo "::error::Backend typing job result: ${{ needs.typing.result }}"
            exit 1
          fi

@@ -41,9 +41,7 @@ jobs:
      ref-name: ${{ steps.ref.outputs.name }}
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Determine ref name
        id: ref
        run: |
@@ -89,7 +87,7 @@ jobs:
                push_external="true"
                ;;
            esac
-            case "${GITHUB_REF}" in
+            case "${{ github.ref }}" in
              refs/tags/v*|*beta.rc*)
                push_external="true"
                ;;
@@ -106,9 +104,9 @@ jobs:
          echo "repository=${repo_name}"
          echo "name=${repo_name}" >> $GITHUB_OUTPUT
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+        uses: docker/setup-buildx-action@v4.0.0
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@v4.0.0
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -121,7 +119,7 @@ jobs:
          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
      - name: Docker metadata
        id: docker-meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+        uses: docker/metadata-action@v5.10.0
        with:
          images: |
            ${{ env.REGISTRY }}/${{ steps.repo.outputs.name }}
@@ -132,7 +130,7 @@ jobs:
            type=semver,pattern={{major}}.{{minor}}
      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@v6.19.2
        with:
          context: .
          file: ./Dockerfile
@@ -154,7 +152,7 @@ jobs:
          echo "${digest}" > "/tmp/digests/digest-${{ matrix.arch }}.txt"
      - name: Upload digest
        if: steps.check-push.outputs.should-push == 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@v7.0.0
        with:
          name: digests-${{ matrix.arch }}
          path: /tmp/digests/digest-${{ matrix.arch }}.txt
@@ -166,13 +164,12 @@ jobs:
    runs-on: ubuntu-24.04
    needs: build-arch
    if: needs.build-arch.outputs.should-push == 'true'
-    environment: image-publishing
    permissions:
      contents: read
      packages: write
    steps:
      - name: Download digests
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v8.0.0
        with:
          path: /tmp/digests
          pattern: digest-*.txt
@@ -182,29 +179,29 @@ jobs:
          echo "Downloaded digests:"
          ls -la /tmp/digests/
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+        uses: docker/setup-buildx-action@v4.0.0
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@v4.0.0
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Login to Docker Hub
        if: needs.build-arch.outputs.push-external == 'true'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@v4.0.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Login to Quay.io
        if: needs.build-arch.outputs.push-external == 'true'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@v4.0.0
        with:
          registry: quay.io
          username: ${{ secrets.QUAY_USERNAME }}
          password: ${{ secrets.QUAY_ROBOT_TOKEN }}
      - name: Docker metadata
        id: docker-meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+        uses: docker/metadata-action@v5.10.0
        with:
          images: |
            ${{ env.REGISTRY }}/${{ needs.build-arch.outputs.repository }}
@@ -231,10 +228,8 @@ jobs:

          docker buildx imagetools create ${tags} ${digests}
      - name: Inspect image
-        env:
-          FIRST_TAG: ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
        run: |
-          docker buildx imagetools inspect "${FIRST_TAG}"
+          docker buildx imagetools inspect ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
      - name: Copy to Docker Hub
        if: needs.build-arch.outputs.push-external == 'true'
        env:
@@ -10,8 +10,10 @@ concurrency:
  cancel-in-progress: true
 permissions:
  contents: read
+  pages: write
+  id-token: write
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 jobs:
  changes:
@@ -21,10 +23,9 @@ jobs:
      docs_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.docs == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          fetch-depth: 0
-          persist-credentials: false
      - name: Decide run mode
        id: force
        run: |
@@ -50,7 +51,7 @@ jobs:
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@v3.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -67,18 +68,16 @@ jobs:
    name: Build Documentation
    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
+      - uses: actions/configure-pages@v5.0.0
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
@@ -94,7 +93,7 @@ jobs:
            --frozen \
            zensical build --clean
      - name: Upload GitHub Pages artifact
-        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
+        uses: actions/upload-pages-artifact@v4.0.0
        with:
          path: site
          name: github-pages-${{ github.run_id }}-${{ github.run_attempt }}
@@ -103,15 +102,12 @@ jobs:
    needs: [changes, build]
    if: github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.docs_changed == 'true'
    runs-on: ubuntu-24.04
-    permissions:
-      pages: write
-      id-token: write
    environment:
      name: github-pages
      url: ${{ steps.deployment.outputs.page_url }}
    steps:
      - name: Deploy GitHub Pages
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@v4.0.5
        id: deployment
        with:
          artifact_name: github-pages-${{ github.run_id }}-${{ github.run_attempt }}
@@ -10,30 +10,23 @@ on:
 concurrency:
  group: frontend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
-permissions: {}
 jobs:
  changes:
    name: Detect Frontend Changes
    runs-on: ubuntu-slim
-    permissions:
-      contents: read
    outputs:
      frontend_changed: ${{ steps.force.outputs.run_all == 'true' || steps.filter.outputs.frontend == 'true' }}
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          fetch-depth: 0
-          persist-credentials: false
      - name: Decide run mode
        id: force
-        env:
-          EVENT_NAME: ${{ github.event_name }}
-          REF_NAME: ${{ github.ref_name }}
        run: |
-          if [[ "${EVENT_NAME}" == "workflow_dispatch" ]]; then
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
            echo "run_all=true" >> "$GITHUB_OUTPUT"
-          elif [[ "${EVENT_NAME}" == "push" && ( "${REF_NAME}" == "main" || "${REF_NAME}" == "dev" ) ]]; then
+          elif [[ "${{ github.event_name }}" == "push" && ( "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "dev" ) ]]; then
            echo "run_all=true" >> "$GITHUB_OUTPUT"
          else
            echo "run_all=false" >> "$GITHUB_OUTPUT"
@@ -41,26 +34,19 @@ jobs:
      - name: Set diff range
        id: range
        if: steps.force.outputs.run_all != 'true'
-        env:
-          BEFORE_SHA: ${{ github.event.before }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-          EVENT_CREATED: ${{ github.event.created }}
-          EVENT_NAME: ${{ github.event_name }}
-          PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          SHA: ${{ github.sha }}
        run: |
-          if [[ "${EVENT_NAME}" == "pull_request" ]]; then
-            echo "base=${PR_BASE_SHA}" >> "$GITHUB_OUTPUT"
-          elif [[ "${EVENT_CREATED}" == "true" ]]; then
-            echo "base=${DEFAULT_BRANCH}" >> "$GITHUB_OUTPUT"
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "base=${{ github.event.pull_request.base.sha }}" >> "$GITHUB_OUTPUT"
+          elif [[ "${{ github.event.created }}" == "true" ]]; then
+            echo "base=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
          else
-            echo "base=${BEFORE_SHA}" >> "$GITHUB_OUTPUT"
+            echo "base=${{ github.event.before }}" >> "$GITHUB_OUTPUT"
          fi
-          echo "ref=${SHA}" >> "$GITHUB_OUTPUT"
+          echo "ref=${{ github.sha }}" >> "$GITHUB_OUTPUT"
      - name: Detect changes
        id: filter
        if: steps.force.outputs.run_all != 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@v3.0.2
        with:
          base: ${{ steps.range.outputs.base }}
          ref: ${{ steps.range.outputs.ref }}
@@ -73,26 +59,22 @@ jobs:
    if: needs.changes.outputs.frontend_changed == 'true'
    name: Install Dependencies
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -105,25 +87,21 @@ jobs:
    needs: [changes, install-dependencies]
    if: needs.changes.outputs.frontend_changed == 'true'
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -138,8 +116,6 @@ jobs:
    needs: [changes, install-dependencies]
    if: needs.changes.outputs.frontend_changed == 'true'
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    strategy:
      fail-fast: false
      matrix:
@@ -148,21 +124,19 @@ jobs:
        shard-count: [4]
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -174,13 +148,13 @@ jobs:
        run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
      - name: Upload test results to Codecov
        if: always()
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@v5.5.2
        with:
          flags: frontend-node-${{ matrix.node-version }}
          directory: src-ui/
          report_type: test_results
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@v5.5.2
        with:
          flags: frontend-node-${{ matrix.node-version }}
          directory: src-ui/coverage/
@@ -189,9 +163,7 @@ jobs:
    needs: [changes, install-dependencies]
    if: needs.changes.outputs.frontend_changed == 'true'
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-    container: mcr.microsoft.com/playwright:v1.59.0-noble
+    container: mcr.microsoft.com/playwright:v1.58.2-noble
    env:
      PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -203,21 +175,19 @@ jobs:
        shard-count: [2]
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -234,27 +204,23 @@ jobs:
    needs: [changes, unit-tests, e2e-tests]
    if: needs.changes.outputs.frontend_changed == 'true'
    runs-on: ubuntu-24.04
-    environment: bundle-analysis
-    permissions:
-      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          fetch-depth: 2
-          persist-credentials: false
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -273,41 +239,34 @@ jobs:
    runs-on: ubuntu-slim
    steps:
      - name: Check gate
-        env:
-          BUNDLE_ANALYSIS_RESULT: ${{ needs['bundle-analysis'].result }}
-          E2E_RESULT: ${{ needs['e2e-tests'].result }}
-          FRONTEND_CHANGED: ${{ needs.changes.outputs.frontend_changed }}
-          INSTALL_RESULT: ${{ needs['install-dependencies'].result }}
-          LINT_RESULT: ${{ needs.lint.result }}
-          UNIT_RESULT: ${{ needs['unit-tests'].result }}
        run: |
-          if [[ "${FRONTEND_CHANGED}" != "true" ]]; then
+          if [[ "${{ needs.changes.outputs.frontend_changed }}" != "true" ]]; then
            echo "No frontend-relevant changes detected."
            exit 0
          fi

-          if [[ "${INSTALL_RESULT}" != "success" ]]; then
-            echo "::error::Frontend install job result: ${INSTALL_RESULT}"
+          if [[ "${{ needs['install-dependencies'].result }}" != "success" ]]; then
+            echo "::error::Frontend install job result: ${{ needs['install-dependencies'].result }}"
            exit 1
          fi

-          if [[ "${LINT_RESULT}" != "success" ]]; then
-            echo "::error::Frontend lint job result: ${LINT_RESULT}"
+          if [[ "${{ needs.lint.result }}" != "success" ]]; then
+            echo "::error::Frontend lint job result: ${{ needs.lint.result }}"
            exit 1
          fi

-          if [[ "${UNIT_RESULT}" != "success" ]]; then
-            echo "::error::Frontend unit-tests job result: ${UNIT_RESULT}"
+          if [[ "${{ needs['unit-tests'].result }}" != "success" ]]; then
+            echo "::error::Frontend unit-tests job result: ${{ needs['unit-tests'].result }}"
            exit 1
          fi

-          if [[ "${E2E_RESULT}" != "success" ]]; then
-            echo "::error::Frontend e2e-tests job result: ${E2E_RESULT}"
+          if [[ "${{ needs['e2e-tests'].result }}" != "success" ]]; then
+            echo "::error::Frontend e2e-tests job result: ${{ needs['e2e-tests'].result }}"
            exit 1
          fi

-          if [[ "${BUNDLE_ANALYSIS_RESULT}" != "success" ]]; then
-            echo "::error::Frontend bundle-analysis job result: ${BUNDLE_ANALYSIS_RESULT}"
+          if [[ "${{ needs['bundle-analysis'].result }}" != "success" ]]; then
+            echo "::error::Frontend bundle-analysis job result: ${{ needs['bundle-analysis'].result }}"
            exit 1
          fi

@@ -9,20 +9,16 @@ on:
 concurrency:
  group: lint-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
-permissions:
-  contents: read
 jobs:
  lint:
    name: Linting via prek
    runs-on: ubuntu-slim
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      - name: Install Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: "3.14"
      - name: Run prek
-        uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
+        uses: j178/prek-action@v1.1.1
@@ -8,19 +8,15 @@ concurrency:
  group: release-${{ github.ref }}
  cancel-in-progress: false
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
  DEFAULT_PYTHON_VERSION: "3.12"
-permissions: {}
 jobs:
  wait-for-docker:
    name: Wait for Docker Build
    runs-on: ubuntu-24.04
-    permissions:
-      checks: read
-      statuses: read
    steps:
      - name: Wait for Docker build
-        uses: lewagon/wait-on-check-action@74049309dfeff245fe8009a0137eacf28136cb3c # v1.5.0
+        uses: lewagon/wait-on-check-action@v1.5.0
        with:
          ref: ${{ github.sha }}
          check-name: 'Build Docker Image'
@@ -30,23 +26,20 @@ jobs:
    name: Build Release
    needs: wait-for-docker
    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      # ---- Frontend Build ----
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
-          package-manager-cache: false
+          cache: 'pnpm'
+          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Install frontend dependencies
        run: cd src-ui && pnpm install
      - name: Build frontend
@@ -54,31 +47,27 @@ jobs:
      # ---- Backend Setup ----
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
-          enable-cache: false
+          enable-cache: true
          python-version: ${{ steps.setup-python.outputs.python-version }}
      - name: Install Python dependencies
-        env:
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
-          uv sync --python "${PYTHON_VERSION}" --dev --frozen
+          uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
      - name: Install system dependencies
        run: |
          sudo apt-get update -qq
          sudo apt-get install -qq --no-install-recommends gettext liblept5
      # ---- Build Documentation ----
      - name: Build documentation
-        env:
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          uv run \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            --dev \
            --frozen \
            zensical build --clean
@@ -87,22 +76,16 @@ jobs:
        run: |
          uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
      - name: Compile messages
-        env:
-          PAPERLESS_SECRET_KEY: "ci-release-not-a-real-secret"
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          cd src/
          uv run \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            manage.py compilemessages
      - name: Collect static files
-        env:
-          PAPERLESS_SECRET_KEY: "ci-release-not-a-real-secret"
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
        run: |
          cd src/
          uv run \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            manage.py collectstatic --no-input --clear
      - name: Assemble release package
        run: |
@@ -135,7 +118,7 @@ jobs:
          sudo chown -R 1000:1000 paperless-ngx/
          tar -cJf paperless-ngx.tar.xz paperless-ngx/
      - name: Upload release artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@v7.0.0
        with:
          name: release
          path: dist/paperless-ngx.tar.xz
@@ -144,33 +127,28 @@ jobs:
    name: Publish Release
    needs: build-release
    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      pull-requests: write
    outputs:
      prerelease: ${{ steps.get-version.outputs.prerelease }}
      changelog: ${{ steps.create-release.outputs.body }}
      version: ${{ steps.get-version.outputs.version }}
    steps:
      - name: Download release artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v8.0.0
        with:
          name: release
          path: ./
      - name: Get version info
        id: get-version
-        env:
-          REF_NAME: ${{ github.ref_name }}
        run: |
-          echo "version=${REF_NAME}" >> $GITHUB_OUTPUT
-          if [[ "${REF_NAME}" == *"-beta.rc"* ]]; then
+          echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          if [[ "${{ github.ref_name }}" == *"-beta.rc"* ]]; then
            echo "prerelease=true" >> $GITHUB_OUTPUT
          else
            echo "prerelease=false" >> $GITHUB_OUTPUT
          fi
      - name: Create release and changelog
        id: create-release
-        uses: release-drafter/release-drafter@139054aeaa9adc52ab36ddf67437541f039b88e2 # v7.1.1
+        uses: release-drafter/release-drafter@v6.2.0
        with:
          name: Paperless-ngx ${{ steps.get-version.outputs.version }}
          tag: ${{ steps.get-version.outputs.version }}
@@ -181,7 +159,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Upload release archive
-        uses: shogo82148/actions-upload-release-asset@96bc1f0cb850b65efd58a6b5eaa0a69f88d38077 # v1.10.0
+        uses: shogo82148/actions-upload-release-asset@v1.9.2
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          upload_url: ${{ steps.create-release.outputs.upload_url }}
@@ -196,39 +174,29 @@ jobs:
    needs: publish-release
    if: needs.publish-release.outputs.prerelease == 'false'
    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      pull-requests: write
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          ref: main
-          persist-credentials: true # for pushing changelog branch
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
          version: ${{ env.DEFAULT_UV_VERSION }}
-          enable-cache: false
+          enable-cache: true
          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
      - name: Update changelog
        working-directory: docs
-        env:
-          CHANGELOG: ${{ needs.publish-release.outputs.changelog }}
-          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
-          VERSION: ${{ needs.publish-release.outputs.version }}
        run: |
-          branch_name="${VERSION}-changelog"
+          git branch ${{ needs.publish-release.outputs.version }}-changelog
+          git checkout ${{ needs.publish-release.outputs.version }}-changelog

-          git branch "${branch_name}"
-          git checkout "${branch_name}"
-
-          printf '# Changelog\n\n%s\n' "${CHANGELOG}" > changelog-new.md
+          echo -e "# Changelog\n\n${{ needs.publish-release.outputs.changelog }}\n" > changelog-new.md

          echo "Manually linking usernames"
          sed -i -r 's|@([a-zA-Z0-9_]+) \(\[#|[@\1](https://github.com/\1) ([#|g' changelog-new.md
@@ -241,28 +209,24 @@ jobs:
          mv changelog-new.md changelog.md

          uv run \
-            --python "${PYTHON_VERSION}" \
+            --python ${{ steps.setup-python.outputs.python-version }} \
            --dev \
            prek run --files changelog.md || true

          git config --global user.name "github-actions"
          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -am "Changelog ${VERSION} - GHA"
-          git push origin "${branch_name}"
+          git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
+          git push origin ${{ needs.publish-release.outputs.version }}-changelog
      - name: Create pull request
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        env:
-          VERSION: ${{ needs.publish-release.outputs.version }}
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const { repo, owner } = context.repo;
-            const version = process.env.VERSION;
-            const head = `${version}-changelog`;
            const result = await github.rest.pulls.create({
-              title: `Documentation: Add ${version} changelog`,
+              title: 'Documentation: Add ${{ needs.publish-release.outputs.version }} changelog',
              owner,
              repo,
-              head,
+              head: '${{ needs.publish-release.outputs.version }}-changelog',
              base: 'main',
              body: 'This PR is auto-generated by CI.'
            });
@@ -1,50 +0,0 @@
-name: Static Analysis
-on:
-  push:
-    branches-ignore:
-      - 'translations**'
-  pull_request:
-    branches-ignore:
-      - 'translations**'
-  workflow_dispatch:
-concurrency:
-  group: static-analysis-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-permissions:
-  contents: read
-jobs:
-  zizmor:
-    name: Run zizmor
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-      actions: read
-      security-events: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - name: Run zizmor
-        uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2
-  semgrep:
-    name: Semgrep CE
-    runs-on: ubuntu-24.04
-    container:
-      image: semgrep/semgrep:1.155.0@sha256:cc869c685dcc0fe497c86258da9f205397d8108e56d21a86082ea4886e52784d
-    if: github.actor != 'dependabot[bot]'
-    permissions:
-      contents: read
-      security-events: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - name: Run Semgrep
-        run: semgrep scan --config auto --sarif-output results.sarif
-      - name: Upload results to GitHub code scanning
-        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
-        if: always()
-        with:
-          sarif_file: results.sarif
@@ -12,13 +12,11 @@ on:
 concurrency:
  group: registry-tags-cleanup
  cancel-in-progress: false
-permissions: {}
 jobs:
  cleanup-images:
    name: Cleanup Image Tags for ${{ matrix.primary-name }}
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    environment: registry-maintenance
    strategy:
      fail-fast: false
      matrix:
@@ -29,7 +27,7 @@ jobs:
    steps:
      - name: Clean temporary images
        if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@4fe057d991d63b8f6d5d22c40f17c1bca2226537 # v0.12.0
+        uses: stumpylog/image-cleaner-action/ephemeral@v0.12.0
        with:
          token: "${{ env.TOKEN }}"
          owner: "${{ github.repository_owner }}"
@@ -45,7 +43,6 @@ jobs:
    runs-on: ubuntu-24.04
    needs:
      - cleanup-images
-    environment: registry-maintenance
    strategy:
      fail-fast: false
      matrix:
@@ -56,7 +53,7 @@ jobs:
    steps:
      - name: Clean untagged images
        if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@4fe057d991d63b8f6d5d22c40f17c1bca2226537 # v0.12.0
+        uses: stumpylog/image-cleaner-action/untagged@v0.12.0
        with:
          token: "${{ env.TOKEN }}"
          owner: "${{ github.repository_owner }}"
@@ -34,12 +34,10 @@ jobs:
        # Learn more about CodeQL language support at https://git.io/codeql-language-support
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v6.0.2
      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/init@v4.32.5
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,4 +45,4 @@ jobs:
          # Prefix the list here with "+" to use these queries and those in the config file.
          # queries: ./path/to/local/query, your-org/your-repo/queries@main
      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/analyze@v4.32.5
@@ -6,23 +6,18 @@ on:
  push:
    paths: ['src/locale/**', 'src-ui/messages.xlf', 'src-ui/src/locale/**']
    branches: [dev]
-permissions:
-  contents: write
-  pull-requests: write
 jobs:
  synchronize-with-crowdin:
    name: Crowdin Sync
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    environment: translation-sync
    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        with:
          token: ${{ secrets.PNGX_BOT_PAT }}
-          persist-credentials: false
      - name: crowdin action
-        uses: crowdin/github-action@7ca9c452bfe9197d3bb7fa83a4d7e2b0c9ae835d # v2.16.0
+        uses: crowdin/github-action@v2.15.0
        with:
          upload_translations: false
          download_translations: true
@@ -3,18 +3,17 @@ on:
  pull_request_target:
    types: [opened]
 jobs:
-  Anti-slop:
+  anti-slop:
    runs-on: ubuntu-latest
    permissions:
      contents: read
      issues: read
      pull-requests: write
    steps:
-      - uses: peakoss/anti-slop@85daca1880e9e1af197fc06ea03349daf08f4202 # v0.2.1
+      - uses: peakoss/anti-slop@v0.2.1
        with:
          max-failures: 4
          failure-add-pr-labels: 'ai'
-          require-pr-template: true
  pr-bot:
    name: Automated PR Bot
    runs-on: ubuntu-latest
@@ -24,11 +23,11 @@ jobs:
    steps:
      - name: Label PR by file path or branch name
        # see .github/labeler.yml for the labeler config
-        uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+        uses: actions/labeler@v6.0.1
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Label by size
-        uses: Gascon1/pr-size-labeler@deff8ed00a76639a7c0f197525bafa3350ba4c36 # v1.3.0
+        uses: Gascon1/pr-size-labeler@v1.3.0
        with:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          xs_label: 'small-change'
@@ -38,7 +37,7 @@ jobs:
          fail_if_xl: 'false'
          excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
      - name: Label by PR title
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const pr = context.payload.pull_request;
@@ -64,7 +63,7 @@ jobs:
            }
      - name: Label bot-generated PRs
        if: ${{ contains(github.actor, 'dependabot') || contains(github.actor, 'crowdin-bot') }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const pr = context.payload.pull_request;
@@ -89,7 +88,7 @@ jobs:
            }
      - name: Welcome comment
        if: ${{ !contains(github.actor, 'bot') }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const pr = context.payload.pull_request;
@@ -19,6 +19,6 @@ jobs:
    if: github.event_name == 'pull_request_target' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request.user.login != 'dependabot'
    steps:
      - name: Label PR with release-drafter
-        uses: release-drafter/release-drafter@139054aeaa9adc52ab36ddf67437541f039b88e2 # v7.1.1
+        uses: release-drafter/release-drafter@v6.2.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -3,6 +3,10 @@ on:
  schedule:
    - cron: '0 3 * * *'
  workflow_dispatch:
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
 concurrency:
  group: lock
 jobs:
@@ -10,11 +14,8 @@ jobs:
    name: 'Stale'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    permissions:
-      issues: write
-      pull-requests: write
    steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@v10.2.0
        with:
          days-before-stale: 7
          days-before-close: 14
@@ -35,12 +36,8 @@ jobs:
    name: 'Lock Old Threads'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    permissions:
-      issues: write
-      pull-requests: write
-      discussions: write
    steps:
-      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
+      - uses: dessant/lock-threads@v6.0.0
        with:
          issue-inactive-days: '30'
          pr-inactive-days: '30'
@@ -59,10 +56,8 @@ jobs:
    name: 'Close Answered Discussions'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    permissions:
-      discussions: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@v8.0.0
        with:
          script: |
            function sleep(ms) {
@@ -118,10 +113,8 @@ jobs:
    name: 'Close Outdated Discussions'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    permissions:
-      discussions: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@v8.0.0
        with:
          script: |
            function sleep(ms) {
@@ -212,10 +205,8 @@ jobs:
    name: 'Close Unsupported Feature Requests'
    if: github.repository_owner == 'paperless-ngx'
    runs-on: ubuntu-24.04
-    permissions:
-      discussions: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@v8.0.0
        with:
          script: |
            function sleep(ms) {
@@ -3,35 +3,30 @@ on:
  push:
    branches:
      - dev
-env:
-  DEFAULT_UV_VERSION: "0.11.x"
 jobs:
  generate-translate-strings:
    name: Generate Translation Strings
    runs-on: ubuntu-latest
-    environment: translation-sync
    permissions:
      contents: write
    steps:
      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6.0.2
        env:
          GH_REF: ${{ github.ref }} # sonar rule:githubactions:S7630 - avoid injection
        with:
          token: ${{ secrets.PNGX_BOT_PAT }}
          ref: ${{ env.GH_REF }}
-          persist-credentials: true # for pushing translation branch
      - name: Set up Python
        id: setup-python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@v6.2.0
      - name: Install system dependencies
        run: |
          sudo apt-get update -qq
          sudo apt-get install -qq --no-install-recommends gettext
      - name: Install uv
-        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        uses: astral-sh/setup-uv@v7.3.1
        with:
-          version: ${{ env.DEFAULT_UV_VERSION }}
          enable-cache: true
      - name: Install backend python dependencies
        run: |
@@ -39,22 +34,20 @@ jobs:
            --group dev \
            --frozen
      - name: Generate backend translation strings
-        env:
-          PAPERLESS_SECRET_KEY: "ci-translate-not-a-real-secret"
        run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*"
      - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@v4.2.0
        with:
          version: 10
      - name: Use Node.js 24
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@v6.3.0
        with:
          node-version: 24.x
          cache: 'pnpm'
          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@v5.0.3
        with:
          path: |
            ~/.pnpm-store
@@ -70,7 +63,7 @@ jobs:
          cd src-ui
          pnpm run ng extract-i18n
      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
+        uses: stefanzweifel/git-auto-commit-action@v7.1.0
        with:
          file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
          commit_message: "Auto translate strings"
@@ -1,29 +0,0 @@
-rules:
-  template-injection:
-    ignore:
-      # github.event_name is a GitHub-internal constant (push/pull_request/etc.),
-      # not attacker-controllable.
-      - ci-docker.yml:74
-      - ci-docs.yml:33
-      # github.event.repository.default_branch refers to the target repo's setting,
-      # which only admins can change; not influenced by fork PR authors.
-      - ci-docs.yml:45
-      # steps.setup-python.outputs.python-version is always a semver string (e.g. "3.12.0")
-      # produced by actions/setup-python from a hardcoded env var input.
-      - ci-docs.yml:88
-      - ci-docs.yml:92
-      # needs.*.result is always one of: success/failure/cancelled/skipped.
-      - ci-docs.yml:131
-      - ci-docs.yml:132
-      # needs.changes.outputs.* is always "true" or "false".
-      - ci-docs.yml:126
-      # steps.build.outputs.digest is always a SHA256 digest (sha256:[a-f0-9]{64}).
-      - ci-docker.yml:152
-  dangerous-triggers:
-    ignore:
-      # Both workflows use pull_request_target solely to label/comment on fork PRs
-      # (requires write-back access unavailable to pull_request). Neither workflow
-      # checks out PR code or executes anything from the fork — only reads PR
-      # metadata via context/API. Permissions are scoped to pull-requests: write.
-      - pr-bot.yml:2
-      - project-actions.yml:2
@@ -79,7 +79,6 @@ virtualenv
 /docker-compose.env
 /docker-compose.yml
 .ruff_cache/
-.mypy_cache/

 # Used for development
 scripts/import-for-development
@@ -112,6 +111,3 @@ celerybeat-schedule*

 # ignore pnpm package store folder created when setting up the devcontainer
 .pnpm-store/
-
-# Git worktree local folder
-.worktrees
@@ -50,12 +50,12 @@ repos:
          - 'prettier-plugin-organize-imports@4.3.0'
  # Python hooks
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.8
+    rev: v0.15.5
    hooks:
      - id: ruff-check
      - id: ruff-format
  - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.21.0"
+    rev: "v2.12.1"
    hooks:
      - id: pyproject-fmt
  # Dockerfile hooks
@@ -30,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.11.6-python3.12-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.10.9-python3.12-trixie-slim AS s6-overlay-base

 WORKDIR /usr/src/s6

@@ -237,8 +237,8 @@ RUN set -eux \
  && echo "Adjusting all permissions" \
    && chown --from root:root --changes --recursive paperless:paperless /usr/src/paperless \
  && echo "Collecting static files" \
-    && PAPERLESS_SECRET_KEY=build-time-dummy s6-setuidgid paperless python3 manage.py collectstatic --clear --no-input --link \
-    && PAPERLESS_SECRET_KEY=build-time-dummy s6-setuidgid paperless python3 manage.py compilemessages \
+    && s6-setuidgid paperless python3 manage.py collectstatic --clear --no-input --link \
+    && s6-setuidgid paperless python3 manage.py compilemessages \
    && /usr/local/bin/deduplicate.py --verbose /usr/src/paperless/static/

 VOLUME ["/usr/src/paperless/data", \
@@ -7,9 +7,9 @@

 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_white.png" width="50%">
-    <source media="(prefers-color-scheme: light)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_black.png" width="50%">
-    <img src="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_black.png" width="50%">
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/resources/logo/web/png/White%20logo%20-%20no%20background.png" width="50%">
+    <source media="(prefers-color-scheme: light)" srcset="https://github.com/paperless-ngx/paperless-ngx/raw/main/resources/logo/web/png/Black%20logo%20-%20no%20background.png" width="50%">
+    <img src="https://github.com/paperless-ngx/paperless-ngx/raw/main/resources/logo/web/png/Black%20logo%20-%20no%20background.png" width="50%">
  </picture>
 </p>

@@ -2,83 +2,8 @@

 ## Reporting a Vulnerability

-The Paperless-ngx team and community take security issues seriously. We appreciate good-faith reports and will make every effort to review legitimate findings responsibly.
+The Paperless-ngx team and community take security bugs seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.

 To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/paperless-ngx/paperless-ngx/security/advisories/new) tab.

-After the initial reply to your report, the team may ask for additional information, reproduction steps, affected versions, configuration details, or proof-of-concept material needed to verify the issue.
-
-## What makes a helpful report
-
-Please include as much of the following as possible:
-
- A clear description of the issue and why it is a security vulnerability.
- Affected Paperless-ngx version(s).
- Required configuration, permissions, or preconditions.
- Step-by-step reproduction instructions.
- A realistic impact statement.
- Logs, screenshots, requests, or a proof of concept where appropriate.
- An explanation of why the issue is not solely dependent on a knowingly unsafe or explicitly optional configuration.
-
-Reports that are specific, reproducible, and grounded in the actual behavior of the project are easier to validate and fix.
-
-## AI-assisted submissions
-
-AI tools can be useful for security research, but they can also produce plausible-sounding reports that do not reflect actual vulnerabilities in Paperless-ngx.
-
-If you use AI tools to help draft or investigate a report, please disclose this and verify the result yourself before submission. Make sure the report:
-
- identifies a real code path in this project
- includes a real reproduction, not just a theoretical concern
- demonstrates realistic impact
- accounts for existing permission checks, configuration requirements, and trust boundaries
- is about Paperless-ngx itself, rather than a hypothetical deployment, downstream customization, third-party app, scanner output, reverse proxy behavior, or external service unless you can show a direct product vulnerability
-
-Submitting unverified AI-generated claims creates unnecessary review work and slows down handling of legitimate reports.
-
-<!-- Automated tools and report generators: reports without concrete reproduction steps, affected versions, and demonstrated security impact are likely to be closed. -->
-
-## Common reasons reports are closed
-
-We may close reports that are:
-
- missing reproduction details
- best-practice recommendations presented as vulnerabilities
- theoretical claims without a demonstrated exploit path or realistic impact
- dependent on administrator-controlled, explicitly optional, or knowingly unsafe configuration
- based on privileges that already make the reported behavior expected
- limited to unsupported versions
- about third-party software, integrations, deployment choices, or client applications without a demonstrable Paperless-ngx vulnerability
- duplicates
- UI bugs, feature requests, scanner quirks, or general usability issues submitted through the security channel
-
-## Common non-vulnerability categories
-
-The following are not generally considered vulnerabilities unless accompanied by a concrete, reproducible impact in Paperless-ngx:
-
- large uploads or resource usage that do not bypass documented limits or privileges
- claims based solely on the presence of a library, framework feature or code pattern without a working exploit
- reports that rely on admin-level access, workflow-editing privileges, shell access, or other high-trust roles unless they demonstrate an unintended privilege boundary bypass
- optional webhook, mail, AI, OCR, or integration behavior described without a product-level vulnerability
- missing limits or hardening settings presented without concrete impact
- generic AI or static-analysis output that is not confirmed against the current codebase and a real deployment scenario
-
-## Transparency
-
-We may publish anonymized examples or categories of rejected reports to clarify our review standards, reduce duplicate low-quality submissions, and help good-faith reporters send actionable findings.
-
-A mistaken report made in good faith is not misconduct. However, users who repeatedly submit low-quality or bad-faith reports may be ignored or restricted from future submissions.
-
-## Scope and expectations
-
-Please use the security reporting channel only for security vulnerabilities in Paperless-ngx.
-
-Please do not use the security advisory system for:
-
- support questions
- general bug reports
- feature requests
- browser compatibility issues
- issues in third-party mobile apps, reverse proxies, or deployment tooling unless you can demonstrate a Paperless-ngx vulnerability
-
-The team will review reports as time permits, but submission does not guarantee that a report is valid, in scope, or will result in a fix. Reports that do not describe a reproducible product-level issue may be closed without extended back-and-forth.
+The team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
@@ -18,13 +18,13 @@ services:
      - "--log-level=warn"
      - "--log-format=text"
  tika:
-    image: docker.io/apache/tika:3.2.3.0
+    image: docker.io/apache/tika:latest
    hostname: tika
    container_name: tika
    network_mode: host
    restart: unless-stopped
  greenmail:
-    image: docker.io/greenmail/standalone:2.1.8
+    image: greenmail/standalone:2.1.8
    hostname: greenmail
    container_name: greenmail
    environment:
@@ -17,9 +17,9 @@
 # (if doing so please consider security measures such as reverse proxy)
 #PAPERLESS_URL=https://paperless.example.com

-# Required. A unique secret key for session tokens and signing.
-# Generate with: python3 -c "import secrets; print(secrets.token_urlsafe(64))"
-PAPERLESS_SECRET_KEY=change-me
+# Adjust this key if you plan to make paperless available publicly. It should
+# be a very long sequence of random characters. You don't need to remember it.
+#PAPERLESS_SECRET_KEY=change-me

 # Use this variable to set a timezone for the Paperless Docker containers. Defaults to UTC.
 #PAPERLESS_TIME_ZONE=America/Los_Angeles
@@ -3,10 +3,26 @@

 declare -r log_prefix="[init-index]"

-echo "${log_prefix} Checking search index..."
-cd "${PAPERLESS_SRC_DIR}"
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	python3 manage.py document_index reindex --if-needed --no-progress-bar
-else
-	s6-setuidgid paperless python3 manage.py document_index reindex --if-needed --no-progress-bar
+declare -r index_version=9
+declare -r data_dir="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
+declare -r index_version_file="${data_dir}/.index_version"
+
+update_index () {
+	echo "${log_prefix} Search index out of date. Updating..."
+	cd "${PAPERLESS_SRC_DIR}"
+	if [[ -n "${USER_IS_NON_ROOT}" ]]; then
+		python3 manage.py document_index reindex --no-progress-bar
+		echo ${index_version} | tee "${index_version_file}" > /dev/null
+	else
+		s6-setuidgid paperless python3 manage.py document_index reindex --no-progress-bar
+		echo ${index_version} | s6-setuidgid paperless tee "${index_version_file}" > /dev/null
+	fi
+}
+
+if [[ (! -f "${index_version_file}") ]]; then
+	echo "${log_prefix} No index version file found"
+	update_index
+elif [[ $(<"${index_version_file}") != "$index_version" ]]; then
+	echo "${log_prefix} index version updated"
+	update_index
 fi
@@ -180,16 +180,6 @@ following:
    This might not actually do anything. Not every new paperless version
    comes with new database migrations.

-4.  Rebuild the search index if needed.
-
-    ```shell-session
-    cd src
-    python3 manage.py document_index reindex --if-needed
-    ```
-
-    This is a no-op if the index is already up to date, so it is safe to
-    run on every upgrade.
-
 ### Database Upgrades

 Paperless-ngx is compatible with Django-supported versions of PostgreSQL and MariaDB and it is generally
@@ -463,42 +453,17 @@ the search yields non-existing documents or won't find anything, you
 may need to recreate the index manually.

 ```
-document_index {reindex,optimize} [--recreate] [--if-needed]
+document_index {reindex,optimize}
 ```

-Specify `reindex` to rebuild the index from all documents in the database. This
-may take some time.
+Specify `reindex` to have the index created from scratch. This may take
+some time.

-Pass `--recreate` to wipe the existing index before rebuilding. Use this when the
-index is corrupted or you want a fully clean rebuild.
-
-Pass `--if-needed` to skip the rebuild if the index is already up to date (schema
-version and search language match). Safe to run on every startup or upgrade.
-
-Specify `optimize` to optimize the index. This command is regularly invoked by the
+Specify `optimize` to optimize the index. This updates certain aspects
+of the index and usually makes queries faster and also ensures that the
+autocompletion works properly. This command is regularly invoked by the
 task scheduler.

-!!! note
-
-    The `optimize` subcommand is deprecated and is now a no-op. Tantivy manages
-    segment merging automatically; no manual optimization step is needed.
-
-!!! note
-
-    **Docker users:** On every startup, the container runs
-    `document_index reindex --if-needed` automatically. Schema changes, language
-    changes, and missing indexes are all detected and rebuilt before the webserver
-    starts. No manual step is required.
-
-    **Bare metal users:** Run the following command after each upgrade (and after
-    changing `PAPERLESS_SEARCH_LANGUAGE`). It is a no-op if the index is already
-    up to date:
-
-    ```shell-session
-    cd src
-    python3 manage.py document_index reindex --if-needed
-    ```
-
 ### Clearing the database read cache

 If the database read cache is enabled, **you must run this command** after making any changes to the database outside the application context.
@@ -723,81 +723,6 @@ services:

 1. Note the `:ro` tag means the folder will be mounted as read only. This is for extra security against changes

-## Installing third-party parser plugins {#parser-plugins}
-
-Third-party parser plugins extend Paperless-ngx to support additional file
-formats. A plugin is a Python package that advertises itself under the
-`paperless_ngx.parsers` entry point group. Refer to the
-[developer documentation](development.md#making-custom-parsers) for how to
-create one.
-
-!!! warning "Third-party plugins are not officially supported"
-
-    The Paperless-ngx maintainers do not provide support for third-party
-    plugins. Issues caused by or requiring changes to a third-party plugin
-    will be closed without further investigation. Always reproduce problems
-    with all plugins removed before filing a bug report.
-
-### Docker
-
-Use a [custom container initialization script](#custom-container-initialization)
-to install the package before the webserver starts. Create a shell script and
-mount it into `/custom-cont-init.d`:
-
-```bash
-#!/bin/bash
-# /path/to/my/scripts/install-parsers.sh
-
-pip install my-paperless-parser-package
-```
-
-Mount it in your `docker-compose.yml`:
-
-```yaml
-services:
-  webserver:
-    # ...
-    volumes:
-      - /path/to/my/scripts:/custom-cont-init.d:ro
-```
-
-The script runs as `root` before the webserver starts, so the package will be
-available when Paperless-ngx discovers plugins at startup.
-
-### Bare metal
-
-Install the package into the same Python environment that runs Paperless-ngx.
-If you followed the standard bare-metal install guide, that is the `paperless`
-user's environment:
-
-```bash
-sudo -Hu paperless pip3 install my-paperless-parser-package
-```
-
-If you are using `uv` or a virtual environment, activate it first and then run:
-
-```bash
-uv pip install my-paperless-parser-package
-# or
-pip install my-paperless-parser-package
-```
-
-Restart all Paperless-ngx services after installation so the new plugin is
-discovered.
-
-### Verifying installation
-
-On the next startup, check the application logs for a line confirming
-discovery:
-
-```
-Loaded third-party parser 'My Parser' v1.0.0 by Acme Corp (entrypoint: 'my_parser').
-```
-
-If this line does not appear, verify that the package is installed in the
-correct environment and that its `pyproject.toml` declares the
-`paperless_ngx.parsers` entry point.
-
 ## MySQL Caveats {#mysql-caveats}

 ### Case Sensitivity
@@ -842,7 +767,7 @@ MariaDB: `mariadb-tzinfo-to-sql /usr/share/zoneinfo | mariadb -u root mysql -p`

 ## Barcodes {#barcodes}

-Paperless is able to utilize barcodes for automatically performing some tasks. Barcodes are only supported for PDF documents or TIFF, [if enabled](configuration.md#PAPERLESS_CONSUMER_BARCODE_TIFF_SUPPORT).
+Paperless is able to utilize barcodes for automatically performing some tasks.

 At this time, the library utilized for detection of barcodes supports the following types:

@@ -62,14 +62,10 @@ The REST api provides five different forms of authentication.

 ## Searching for documents

-Full text searching is available on the `/api/documents/` endpoint. The
-following query parameters cause the API to return Tantivy-backed search
+Full text searching is available on the `/api/documents/` endpoint. Two
+specific query parameters cause the API to return full text search
 results:

- `/api/documents/?text=your%20search%20query`: Search title and content
-  using simple substring-style search.
- `/api/documents/?title_search=your%20search%20query`: Search title only
-  using simple substring-style search.
 - `/api/documents/?query=your%20search%20query`: Search for a document
  using a full text query. For details on the syntax, see [Basic Usage - Searching](usage.md#basic-usage_searching).
 - `/api/documents/?more_like_id=1234`: Search for documents similar to
@@ -171,8 +167,9 @@ Query parameters:
 - `term`: The incomplete term.
 - `limit`: Amount of results. Defaults to 10.

-Results are ordered by how many of the user's visible documents contain
-each matching word. The first result is the word that appears in the most documents.
+Results returned by the endpoint are ordered by importance of the term
+in the document index. The first result is the term that has the highest
+[Tf/Idf](https://en.wikipedia.org/wiki/Tf%E2%80%93idf) score in the index.

 ```json
 ["term1", "term3", "term6", "term4"]
@@ -440,8 +437,3 @@ Initial API version.
  moved from the bulk edit endpoint to their own individual endpoints. Using these methods via
  the bulk edit endpoint is still supported for compatibility with versions < 10 until support
  for API v9 is dropped.
- The `all` parameter of list endpoints is now deprecated and will be removed in a future version.
- The bulk edit objects endpoint now supports `all` and `filters` parameters to avoid having to send
-  large lists of object IDs for operations affecting many objects.
- The legacy `title_content` document search parameter is deprecated and will be removed in a future version.
-  Clients should use `text` for simple title-and-content search and `title_search` for title-only search.
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 1000" style="enable-background:new 0 0 1000 1000;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M299,891.7c-4.2-19.8-12.5-59.6-13.6-59.6c-176.7-105.7-155.8-288.7-97.3-393.4
+	c12.5,131.8,245.8,222.8,109.8,383.9c-1.1,2,6.2,27.2,12.5,50.2c27.2-46,68-101.4,65.8-106.7C208.9,358.2,731.9,326.9,840.6,73.7
+	c49.1,244.8-25.1,623.5-445.5,719.7c-2,1.1-76.3,131.8-79.5,132.9c0-2-31.4-1.1-27.2-11.5C290.7,908.4,294.8,900.1,299,891.7
+	L299,891.7z M293.8,793.4c53.3-61.8-9.4-167.4-47.1-201.9C310.5,701.3,306.3,765.1,293.8,793.4L293.8,793.4z"/>
+</svg>
@@ -1,19 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #000;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2962.2 860.2" style="enable-background:new 0 0 2962.2 860.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<path d="M1055.6,639.7v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3v249.6L1055.6,639.7L1055.6,639.7z M1059.1,514.9c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	c16.8,0,30.3-5.9,40.6-17.7C1054,546.9,1059.1,532.3,1059.1,514.9z"/>
+<path d="M1417.8,398.2c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V390.2h85.3v20.6
+	c18-20,43.1-30.1,75.4-30.1C1379.2,380.7,1399.5,386.6,1417.8,398.2z M1389.5,514.9c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7S1389.5,532.3,1389.5,514.9z"/>
+<path d="M1713.6,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2s37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8c3.6,11.4,10.5,20.7,20.9,28.1
+	c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1695.8,570.1,1704.9,563.7,1713.6,555.3z M1596.9,486.2h92.9
+	c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11S1599,473.9,1596.9,486.2z"/>
+<path d="M1908.8,418.4c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V390.2h85.3V418.4L1908.8,418.4z"/>
+<path d="M2113,258.2v381.5h-85.3V258.2H2113z"/>
+<path d="M2360.8,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2343.1,570.1,2352.1,563.7,2360.8,555.3z
+	 M2244.1,486.2h92.9c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11C2251.7,464.1,2246.2,473.9,2244.1,486.2z"/>
+<path d="M2565.9,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2590.5,448.7,2577.6,446.3,2565.9,446.3z"/>
+<path d="M2817.3,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2841.8,448.7,2828.9,446.3,2817.3,446.3z"/>
+<g>
+	<path d="M2508,724h60.2v17.3H2508V724z"/>
+	<path d="M2629.2,694.4c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6v-52.6
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2620.2,699.4,2624.4,696.4,2629.2,694.4z"/>
+	<path d="M2790.3,833.2c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2s-6.6-11.9-7.1-19.6h19.6
+		c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7c-3.6,3.4-8,6.2-13.3,8.2
+		c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6s2-17.3,6-24.7
+		s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2803.2,815.9,2798.9,826.4,2790.3,833.2z M2782.2,755.7c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2776.1,764.1,2779.6,760.4,2782.2,755.7z"/>
+	<path d="M2843.5,788.4h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2843.5,788.4z
+		"/>
+</g>
+<path d="M835.8,319.2c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2H647v-135h72.7c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7c11.5-18.9,17.3-39.5,17.3-61.9
+	C853.1,358.9,847.4,338.1,835.8,319.2z M747,416.6c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C761.1,396.6,756.4,407.7,747,416.6z"/>
+<path class="st0" d="M164.7,698.7c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4C82.8,431.4,277,507.1,163.8,641.2
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C89.7,254.7,525,228.6,615.5,17.9c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C157.8,712.6,161.2,705.7,164.7,698.7L164.7,698.7z M160.4,616.9
+	c44.4-51.4-7.8-139.3-39.2-168C174.3,540.2,170.8,593.3,160.4,616.9L160.4,616.9z"/>
 </svg>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #eee;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
-</svg>
@@ -1,19 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #fff;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2962.2 860.2" style="enable-background:new 0 0 2962.2 860.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#17541F;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<path class="st0" d="M1055.6,639.7v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3v249.6L1055.6,639.7L1055.6,639.7z M1059.1,514.9c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	c16.8,0,30.3-5.9,40.6-17.7C1054,546.9,1059.1,532.3,1059.1,514.9z"/>
+<path class="st0" d="M1417.8,398.2c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V390.2h85.3v20.6
+	c18-20,43.1-30.1,75.4-30.1C1379.2,380.7,1399.5,386.6,1417.8,398.2z M1389.5,514.9c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7S1389.5,532.3,1389.5,514.9z"/>
+<path class="st0" d="M1713.6,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2s37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8c3.6,11.4,10.5,20.7,20.9,28.1
+	c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1695.8,570.1,1704.9,563.7,1713.6,555.3z M1596.9,486.2h92.9
+	c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11S1599,473.9,1596.9,486.2z"/>
+<path class="st0" d="M1908.8,418.4c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7
+	c-8.4-2.1-15.7-3.1-22-3.1c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V390.2h85.3V418.4L1908.8,418.4z"/>
+<path class="st0" d="M2113,258.2v381.5h-85.3V258.2H2113z"/>
+<path class="st0" d="M2360.8,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2343.1,570.1,2352.1,563.7,2360.8,555.3z
+	 M2244.1,486.2h92.9c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11C2251.7,464.1,2246.2,473.9,2244.1,486.2z"/>
+<path class="st0" d="M2565.9,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2590.5,448.7,2577.6,446.3,2565.9,446.3z"/>
+<path class="st0" d="M2817.3,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2841.8,448.7,2828.9,446.3,2817.3,446.3z"/>
+<g>
+	<path class="st0" d="M2508,724h60.2v17.3H2508V724z"/>
+	<path class="st0" d="M2629.2,694.4c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6v-52.6
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2620.2,699.4,2624.4,696.4,2629.2,694.4z"/>
+	<path class="st0" d="M2790.3,833.2c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2s-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2803.2,815.9,2798.9,826.4,2790.3,833.2z M2782.2,755.7c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2776.1,764.1,2779.6,760.4,2782.2,755.7z"/>
+	<path class="st0" d="M2843.5,788.4h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35
+		L2843.5,788.4z"/>
+</g>
+<path class="st0" d="M835.8,319.2c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2H647v-135h72.7c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7c11.5-18.9,17.3-39.5,17.3-61.9
+	C853.1,358.9,847.4,338.1,835.8,319.2z M747,416.6c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C761.1,396.6,756.4,407.7,747,416.6z"/>
+<path class="st1" d="M164.7,698.7c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4C82.8,431.4,277,507.1,163.8,641.2
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C89.7,254.7,525,228.6,615.5,17.9c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C157.8,712.6,161.2,705.7,164.7,698.7L164.7,698.7z M160.4,616.9
+	c44.4-51.4-7.8-139.3-39.2-168C174.3,540.2,170.8,593.3,160.4,616.9L160.4,616.9z"/>
 </svg>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
-  <defs>
-    <style>
-      .st0 {
-        fill: #005616;
-      }
-    </style>
-  </defs>
-  <path class="st0" d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-</svg>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
-  <defs>
-    <style>
-      .st0 {
-        fill: #fff;
-      }
-    </style>
-  </defs>
-  <path class="st0" d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-</svg>
@@ -1,91 +1,5 @@
 # Changelog

-## paperless-ngx 2.20.15
-
-### Security
-
- Resolve [GHSA-96jx-fj7m-qh6x](https://github.com/paperless-ngx/paperless-ngx/security/advisories/GHSA-8c6x-pfjq-9gr7)
-
-### Bug Fixes
-
- Fix: use only allauth login/logout endpoints [@shamoon](https://github.com/shamoon) ([#12639](https://github.com/paperless-ngx/paperless-ngx/pull/12639))
- Fix: correctly scope mail account enumeration [@shamoon](https://github.com/shamoon) ([#12636](https://github.com/paperless-ngx/paperless-ngx/pull/12636))
- Fix: prevent intermediate change event when CustomFieldQueryAtom operator changes type [@ggouzi](https://github.com/ggouzi) ([#12597](https://github.com/paperless-ngx/paperless-ngx/pull/12597))
- Fix: reject invalid requests to API notes endpoint [@ggouzi](https://github.com/ggouzi) ([#12582](https://github.com/paperless-ngx/paperless-ngx/pull/12582))
-
-### All App Changes
-
-<details>
-<summary>4 changes</summary>
-
- Fix: use only allauth login/logout endpoints [@shamoon](https://github.com/shamoon) ([#12639](https://github.com/paperless-ngx/paperless-ngx/pull/12639))
- Fix: correctly scope mail account enumeration [@shamoon](https://github.com/shamoon) ([#12636](https://github.com/paperless-ngx/paperless-ngx/pull/12636))
- Fix: prevent intermediate change event when CustomFieldQueryAtom operator changes type [@ggouzi](https://github.com/ggouzi) ([#12597](https://github.com/paperless-ngx/paperless-ngx/pull/12597))
- Fix: reject invalid requests to API notes endpoint [@ggouzi](https://github.com/ggouzi) ([#12582](https://github.com/paperless-ngx/paperless-ngx/pull/12582))
-</details>
-
-## paperless-ngx 2.20.14
-
-### Bug Fixes
-
- Fix: do not submit permissions for non-owners [@shamoon](https://github.com/shamoon) ([#12571](https://github.com/paperless-ngx/paperless-ngx/pull/12571))
- Fix: prevent duplicate parent tag IDs [@shamoon](https://github.com/shamoon) ([#12522](https://github.com/paperless-ngx/paperless-ngx/pull/12522))
- Fix: dont defer tag change application in workflows [@shamoon](https://github.com/shamoon) ([#12478](https://github.com/paperless-ngx/paperless-ngx/pull/12478))
- Fix: limit share link viewset actions [@shamoon](https://github.com/shamoon) ([#12461](https://github.com/paperless-ngx/paperless-ngx/pull/12461))
- Fix: add fallback ordering for documents by id after created [@shamoon](https://github.com/shamoon) ([#12440](https://github.com/paperless-ngx/paperless-ngx/pull/12440))
- Fixhancement: default mail-created correspondent matching to exact [@shamoon](https://github.com/shamoon) ([#12414](https://github.com/paperless-ngx/paperless-ngx/pull/12414))
- Fix: validate date CF value in serializer [@shamoon](https://github.com/shamoon) ([#12410](https://github.com/paperless-ngx/paperless-ngx/pull/12410))
-
-### All App Changes
-
-<details>
-<summary>7 changes</summary>
-
- Fix: do not submit permissions for non-owners [@shamoon](https://github.com/shamoon) ([#12571](https://github.com/paperless-ngx/paperless-ngx/pull/12571))
- Fix: prevent duplicate parent tag IDs [@shamoon](https://github.com/shamoon) ([#12522](https://github.com/paperless-ngx/paperless-ngx/pull/12522))
- Fix: dont defer tag change application in workflows [@shamoon](https://github.com/shamoon) ([#12478](https://github.com/paperless-ngx/paperless-ngx/pull/12478))
- Fix: limit share link viewset actions [@shamoon](https://github.com/shamoon) ([#12461](https://github.com/paperless-ngx/paperless-ngx/pull/12461))
- Fix: add fallback ordering for documents by id after created [@shamoon](https://github.com/shamoon) ([#12440](https://github.com/paperless-ngx/paperless-ngx/pull/12440))
- Fixhancement: default mail-created correspondent matching to exact [@shamoon](https://github.com/shamoon) ([#12414](https://github.com/paperless-ngx/paperless-ngx/pull/12414))
- Fix: validate date CF value in serializer [@shamoon](https://github.com/shamoon) ([#12410](https://github.com/paperless-ngx/paperless-ngx/pull/12410))
-</details>
-
-## paperless-ngx 2.20.13
-
-### Bug Fixes
-
- Fix: suggest corrections only if visible results
- Fix: require view permission for more-like search
- Fix: validate document link targets
- Fix: enforce permissions when attaching accounts to mail rules
-
-## paperless-ngx 2.20.12
-
-### Security
-
- Resolve [GHSA-96jx-fj7m-qh6x](https://github.com/paperless-ngx/paperless-ngx/security/advisories/GHSA-96jx-fj7m-qh6x)
-
-### Bug Fixes
-
- Fix: Scope the workflow saves to prevent clobbering filename/archive_filename [@stumpylog](https://github.com/stumpylog) ([#12390](https://github.com/paperless-ngx/paperless-ngx/pull/12390))
- Fix: don't try to usermod/groupmod when non-root + update docs (#<!---->12365) [@stumpylog](https://github.com/stumpylog) ([#12391](https://github.com/paperless-ngx/paperless-ngx/pull/12391))
- Fix: avoid moving files if already moved [@shamoon](https://github.com/shamoon) ([#12389](https://github.com/paperless-ngx/paperless-ngx/pull/12389))
- Fix: remove pagination from document notes api spec [@shamoon](https://github.com/shamoon) ([#12388](https://github.com/paperless-ngx/paperless-ngx/pull/12388))
- Fix: fix file button hover color in dark mode [@shamoon](https://github.com/shamoon) ([#12367](https://github.com/paperless-ngx/paperless-ngx/pull/12367))
- Fixhancement: only offer basic auth for appropriate requests [@shamoon](https://github.com/shamoon) ([#12362](https://github.com/paperless-ngx/paperless-ngx/pull/12362))
-
-### All App Changes
-
-<details>
-<summary>5 changes</summary>
-
- Fix: Scope the workflow saves to prevent clobbering filename/archive_filename [@stumpylog](https://github.com/stumpylog) ([#12390](https://github.com/paperless-ngx/paperless-ngx/pull/12390))
- Fix: avoid moving files if already moved [@shamoon](https://github.com/shamoon) ([#12389](https://github.com/paperless-ngx/paperless-ngx/pull/12389))
- Fix: remove pagination from document notes api spec [@shamoon](https://github.com/shamoon) ([#12388](https://github.com/paperless-ngx/paperless-ngx/pull/12388))
- Fix: fix file button hover color in dark mode [@shamoon](https://github.com/shamoon) ([#12367](https://github.com/paperless-ngx/paperless-ngx/pull/12367))
- Fixhancement: only offer basic auth for appropriate requests [@shamoon](https://github.com/shamoon) ([#12362](https://github.com/paperless-ngx/paperless-ngx/pull/12362))
-</details>
-
 ## paperless-ngx 2.20.11

 ### Security
@@ -101,7 +101,7 @@ and `mariadb`.

 #### [`PAPERLESS_DB_OPTIONS=<options>`](#PAPERLESS_DB_OPTIONS) {#PAPERLESS_DB_OPTIONS}

-: Advanced database connection options as a comma-delimited key-value string.
+: Advanced database connection options as a semicolon-delimited key-value string.
 Keys and values are separated by `=`. Dot-notation produces nested option
 dictionaries; for example, `pool.max_size=20` sets
 `OPTIONS["pool"]["max_size"] = 20`.
@@ -123,36 +123,18 @@ dictionaries; for example, `pool.max_size=20` sets
        to handle all pool connections across all workers:
        `(web_workers + celery_workers) * pool.max_size + safety_margin`.

-    !!! note "SQLite defaults"
-
-        SQLite connections are pre-configured with WAL journal mode, optimised
-        synchronous and cache settings, and a 5-second busy timeout. These defaults
-        suit most deployments. To override `init_command`, use `;` between PRAGMAs
-        within the value and `,` between options:
-
-        ```bash
-        PAPERLESS_DB_OPTIONS="init_command=PRAGMA journal_mode=DELETE;PRAGMA synchronous=FULL,transaction_mode=DEFERRED"
-        ```
-
-    !!! note "MariaDB: READ COMMITTED isolation level"
-
-        MariaDB connections default to `READ COMMITTED` isolation level, which
-        eliminates gap locking and reduces deadlock frequency. If binary logging is
-        enabled on your MariaDB server, this requires `binlog_format=ROW` (the
-        default for most managed MariaDB instances). Statement-based replication is
-        not compatible with `READ COMMITTED`.
-
    **Examples:**

    ```bash title="PostgreSQL: require SSL, set a custom CA certificate, and limit the pool size"
-    PAPERLESS_DB_OPTIONS="sslmode=require,sslrootcert=/certs/ca.pem,pool.max_size=5"
+    PAPERLESS_DB_OPTIONS="sslmode=require;sslrootcert=/certs/ca.pem;pool.max_size=5"
    ```

    ```bash title="MariaDB: require SSL with a custom CA certificate"
-    PAPERLESS_DB_OPTIONS="ssl_mode=REQUIRED,ssl.ca=/certs/ca.pem"
+    PAPERLESS_DB_OPTIONS="ssl_mode=REQUIRED;ssl.ca=/certs/ca.pem"
    ```

-    ```bash title="PostgreSQL or MariaDB: set a connection timeout"
+    ```bash title="SQLite: set a busy timeout of 30 seconds"
+    # PostgreSQL: set a connection timeout
    PAPERLESS_DB_OPTIONS="connect_timeout=10"
    ```

@@ -420,12 +402,6 @@ Defaults to `/usr/share/nltk_data`

 : This is where paperless will store the classification model.

-    !!! warning
-
-        The classification model uses Python's pickle serialization format.
-        Ensure this file is only writable by the paperless user, as a
-        maliciously crafted model file could execute arbitrary code when loaded.
-
    Defaults to `PAPERLESS_DATA_DIR/classification_model.pickle`.

 ## Logging
@@ -446,20 +422,14 @@ Defaults to `/usr/share/nltk_data`

 #### [`PAPERLESS_SECRET_KEY=<key>`](#PAPERLESS_SECRET_KEY) {#PAPERLESS_SECRET_KEY}

-: **Required.** Paperless uses this to make session tokens and sign
-sensitive data. Paperless will refuse to start if this is not set.
+: Paperless uses this to make session tokens. If you expose paperless
+on the internet, you need to change this, since the default secret
+is well known.

    Use any sequence of characters. The more, the better. You don't
-    need to remember this. You can generate a suitable key with:
+    need to remember this. Just face-roll your keyboard.

-        python3 -c "import secrets; print(secrets.token_urlsafe(64))"
-
-    !!! warning
-
-        This setting has no default value. You **must** set it before
-        starting Paperless. Existing installations that relied on the
-        previous default value should set `PAPERLESS_SECRET_KEY` to
-        that value to avoid invalidating existing sessions and tokens.
+    Default is listed in the file `src/paperless/settings.py`.

 #### [`PAPERLESS_URL=<url>`](#PAPERLESS_URL) {#PAPERLESS_URL}

@@ -704,9 +674,6 @@ See the corresponding [django-allauth documentation](https://docs.allauth.org/en
 for a list of provider configurations. You will also need to include the relevant Django 'application' inside the
 [PAPERLESS_APPS](#PAPERLESS_APPS) setting to activate that specific authentication provider (e.g. `allauth.socialaccount.providers.openid_connect` for the [OIDC Connect provider](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html)).

-: For OpenID Connect providers, set `settings.token_auth_method` if your identity provider
-requires a specific token endpoint authentication method.
-
    Defaults to None, which does not enable any third party authentication systems.

 #### [`PAPERLESS_SOCIAL_AUTO_SIGNUP=<bool>`](#PAPERLESS_SOCIAL_AUTO_SIGNUP) {#PAPERLESS_SOCIAL_AUTO_SIGNUP}
@@ -800,14 +767,6 @@ If both the [PAPERLESS_ACCOUNT_DEFAULT_GROUPS](#PAPERLESS_ACCOUNT_DEFAULT_GROUPS

    Defaults to 1209600 (2 weeks)

-#### [`PAPERLESS_TOKEN_THROTTLE_RATE=<rate>`](#PAPERLESS_TOKEN_THROTTLE_RATE) {#PAPERLESS_TOKEN_THROTTLE_RATE}
-
-: Rate limit for the API token authentication endpoint (`/api/token/`), used to mitigate brute-force login attempts.
-Uses Django REST Framework's [throttle rate format](https://www.django-rest-framework.org/api-guide/throttling/#setting-the-throttling-policy),
-e.g. `5/min`, `100/hour`, `1000/day`.
-
-    Defaults to `5/min`
-
 ## OCR settings {#ocr}

 Paperless uses [OCRmyPDF](https://ocrmypdf.readthedocs.io/en/latest/)
@@ -839,14 +798,11 @@ parsing documents.

 #### [`PAPERLESS_OCR_MODE=<mode>`](#PAPERLESS_OCR_MODE) {#PAPERLESS_OCR_MODE}

-: Tell paperless when and how to perform ocr on your documents. Four
+: Tell paperless when and how to perform ocr on your documents. Three
 modes are available:

-    -   `auto` (default): Paperless detects whether a document already
-        has embedded text via pdftotext. If sufficient text is found,
-        OCR is skipped for that document (`--skip-text`). If no text is
-        present, OCR runs normally. This is the safest option for mixed
-        document collections.
+    -   `skip`: Paperless skips all pages and will perform ocr only on
+        pages where no text is present. This is the safest option.

    -   `redo`: Paperless will OCR all pages of your documents and
        attempt to replace any existing text layers with new text. This
@@ -864,59 +820,24 @@ modes are available:
        significantly larger and text won't appear as sharp when zoomed
        in.

-    -   `off`: Paperless never invokes the OCR engine. For PDFs, text
-        is extracted via pdftotext only. For image documents, text will
-        be empty. Archive file generation still works via format
-        conversion (no Tesseract or Ghostscript required).
+    The default is `skip`, which only performs OCR when necessary and
+    always creates archived documents.

-    The default is `auto`.
-
-    For the `skip`, `redo`, and `force` modes, read more about OCR
-    behaviour in the [OCRmyPDF
+    Read more about this in the [OCRmyPDF
    documentation](https://ocrmypdf.readthedocs.io/en/latest/advanced.html#when-ocr-is-skipped).

-#### [`PAPERLESS_ARCHIVE_FILE_GENERATION=<mode>`](#PAPERLESS_ARCHIVE_FILE_GENERATION) {#PAPERLESS_ARCHIVE_FILE_GENERATION}
+#### [`PAPERLESS_OCR_SKIP_ARCHIVE_FILE=<mode>`](#PAPERLESS_OCR_SKIP_ARCHIVE_FILE) {#PAPERLESS_OCR_SKIP_ARCHIVE_FILE}

-: Controls when paperless creates a PDF/A archive version of your
-documents. Archive files are stored alongside the original and are used
-for display in the web interface.
+: Specify when you would like paperless to skip creating an archived
+version of your documents. This is useful if you don't want to have two
+almost-identical versions of your documents in the media folder.

-    -   `auto` (default): Produce archives for scanned or image-based
-        documents. Skip archive generation for born-digital PDFs that
-        already contain embedded text. This is the recommended setting
-        for mixed document collections.
-    -   `always`: Always produce a PDF/A archive when the parser
-        supports it, regardless of whether the document already has
-        text.
-    -   `never`: Never produce an archive. Only the original file is
-        stored. Saves disk space but the web viewer will display the
-        original file directly.
+    -   `never`: Never skip creating an archived version.
+    -   `with_text`: Skip creating an archived version for documents
+    that already have embedded text.
+    -   `always`: Always skip creating an archived version.

-    **Behaviour by file type and mode** (`auto` column shows the default):
-
-    | Document type              | `never` | `auto` (default)           | `always` |
-    | -------------------------- | ------- | -------------------------- | -------- |
-    | Scanned image (TIFF, JPEG) | No      | **Yes**                    | Yes      |
-    | Image-based PDF            | No      | **Yes** (short/no text, untagged) | Yes |
-    | Born-digital PDF           | No      | No (tagged or has embedded text)  | Yes |
-    | Plain text, email, HTML    | No      | No                         | No       |
-    | DOCX / ODT (via Tika)      | Yes\*   | Yes\*                      | Yes\*    |
-
-    \* Tika always produces a PDF rendition for display; this counts as
-    the archive regardless of the setting.
-
-    !!! note
-
-        This setting applies to the built-in Tesseract parser. Parsers
-        that must always convert documents to PDF for display (e.g. DOCX,
-        ODT via Tika) will produce a PDF regardless of this setting.
-
-    !!! note
-
-        The **remote OCR parser** (Azure AI) always produces a searchable
-        PDF and stores it as the archive copy, regardless of this setting.
-        `ARCHIVE_FILE_GENERATION=never` has no effect when the remote
-        parser handles a document.
+    The default is `never`.

 #### [`PAPERLESS_OCR_CLEAN=<mode>`](#PAPERLESS_OCR_CLEAN) {#PAPERLESS_OCR_CLEAN}

@@ -1179,32 +1100,6 @@ should be a valid crontab(5) expression describing when to run.

    Defaults to `0 0 * * *` or daily at midnight.

-#### [`PAPERLESS_SEARCH_LANGUAGE=<language>`](#PAPERLESS_SEARCH_LANGUAGE) {#PAPERLESS_SEARCH_LANGUAGE}
-
-: Sets the stemmer language for the full-text search index.
-Stemming improves recall by matching word variants (e.g. "running" matches "run").
-Changing this setting causes the index to be rebuilt automatically on next startup.
-An invalid value raises an error at startup.
-
-: Use the ISO 639-1 two-letter code (e.g. `en`, `de`, `fr`). Lowercase full names
-(e.g. `english`, `german`, `french`) are also accepted. The capitalized names shown
-in the [Tantivy Language enum](https://docs.rs/tantivy/latest/tantivy/tokenizer/enum.Language.html)
-documentation are **not** valid — use the lowercase equivalent.
-
-: If not set, paperless infers the language from
-[`PAPERLESS_OCR_LANGUAGE`](#PAPERLESS_OCR_LANGUAGE). If the OCR language has no
-Tantivy stemmer equivalent, stemming is disabled.
-
-    Defaults to unset (inferred from `PAPERLESS_OCR_LANGUAGE`).
-
-#### [`PAPERLESS_ADVANCED_FUZZY_SEARCH_THRESHOLD=<float>`](#PAPERLESS_ADVANCED_FUZZY_SEARCH_THRESHOLD) {#PAPERLESS_ADVANCED_FUZZY_SEARCH_THRESHOLD}
-
-: When set to a float value, approximate/fuzzy matching is applied alongside exact
-matching. Fuzzy results rank below exact matches. A value of `0.5` is a reasonable
-starting point. Leave unset to disable fuzzy matching entirely.
-
-    Defaults to unset (disabled).
-
 #### [`PAPERLESS_SANITY_TASK_CRON=<cron expression>`](#PAPERLESS_SANITY_TASK_CRON) {#PAPERLESS_SANITY_TASK_CRON}

 : Configures the scheduled sanity checker frequency. The value should be a
@@ -1496,14 +1391,6 @@ ports.

 ## Incoming Mail {#incoming_mail}

-#### [`PAPERLESS_EMAIL_ALLOW_INTERNAL_HOSTS=<bool>`](#PAPERLESS_EMAIL_ALLOW_INTERNAL_HOSTS) {#PAPERLESS_EMAIL_ALLOW_INTERNAL_HOSTS}
-
-: If set to false, incoming mail account connections are blocked when the
-configured IMAP hostname resolves to a non-public address (for example,
-localhost, link-local, or RFC1918 private ranges).
-
-    Defaults to true, which allows internal hosts.
-
 ### Email OAuth {#email_oauth}

 #### [`PAPERLESS_OAUTH_CALLBACK_BASE_URL=<str>`](#PAPERLESS_OAUTH_CALLBACK_BASE_URL) {#PAPERLESS_OAUTH_CALLBACK_BASE_URL}
@@ -2014,57 +1901,49 @@ suggestions. This setting is required to be set to true in order to use the AI f

 #### [`PAPERLESS_AI_LLM_EMBEDDING_BACKEND=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_BACKEND) {#PAPERLESS_AI_LLM_EMBEDDING_BACKEND}

-: The embedding backend to use for RAG. This can be either "openai-like" or "huggingface". The
-"openai-like" backend uses an OpenAI-compatible embeddings API.
+: The embedding backend to use for RAG. This can be either "openai" or "huggingface".

    Defaults to None.

 #### [`PAPERLESS_AI_LLM_EMBEDDING_MODEL=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_MODEL) {#PAPERLESS_AI_LLM_EMBEDDING_MODEL}

-: The model to use for the embedding backend for RAG. This can be set to any of the embedding
-models supported by the current embedding backend. If not supplied, defaults to
-"text-embedding-3-small" for the OpenAI-compatible backend and
-"sentence-transformers/all-MiniLM-L6-v2" for Huggingface.
+: The model to use for the embedding backend for RAG. This can be set to any of the embedding models supported by the current embedding backend. If not supplied, defaults to "text-embedding-3-small" for OpenAI and "sentence-transformers/all-MiniLM-L6-v2" for Huggingface.

    Defaults to None.

 #### [`PAPERLESS_AI_LLM_BACKEND=<str>`](#PAPERLESS_AI_LLM_BACKEND) {#PAPERLESS_AI_LLM_BACKEND}

-: The AI backend to use. This can be either "openai-like" or "ollama". If set to "ollama", the AI
-features will be run locally on your machine. If set to "openai-like", the AI features will use
-an OpenAI-compatible API endpoint, including OpenAI itself and compatible providers. This
-setting is required to be set to use the AI features.
+: The AI backend to use. This can be either "openai" or "ollama". If set to "ollama", the AI
+features will be run locally on your machine. If set to "openai", the AI features will be run
+using the OpenAI API. This setting is required to be set to use the AI features.

    Defaults to None.

    !!! note

-        Remote AI providers may be paid services. If you use a hosted OpenAI-compatible API, you
-        are responsible for any usage charges incurred by Paperless-ngx features, and your
-        document data will be sent to the provider you configure.
+        The OpenAI API is a paid service. You will need to set up an OpenAI account and
+        will be charged for usage incurred by Paperless-ngx features and your document data
+        will (of course) be sent to the OpenAI API. Paperless-ngx does not endorse the use of the
+        OpenAI API in any way.

-        Paperless-ngx does not endorse any specific provider. Refer to your provider's terms of
-        service and privacy policy, and use at your own risk.
+        Refer to the OpenAI terms of service, and use at your own risk.

 #### [`PAPERLESS_AI_LLM_MODEL=<str>`](#PAPERLESS_AI_LLM_MODEL) {#PAPERLESS_AI_LLM_MODEL}

-: The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported
-by the current backend. If not supplied, defaults to "gpt-3.5-turbo" for the OpenAI-compatible
-backend and "llama3.1" for Ollama.
+: The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported by the
+current backend. If not supplied, defaults to "gpt-3.5-turbo" for OpenAI and "llama3.1" for Ollama.

    Defaults to None.

 #### [`PAPERLESS_AI_LLM_API_KEY=<str>`](#PAPERLESS_AI_LLM_API_KEY) {#PAPERLESS_AI_LLM_API_KEY}

-: The API key to use for the AI backend. This is typically required for the OpenAI-compatible
-backend (optional for others).
+: The API key to use for the AI backend. This is required for the OpenAI backend (optional for others).

    Defaults to None.

 #### [`PAPERLESS_AI_LLM_ENDPOINT=<str>`](#PAPERLESS_AI_LLM_ENDPOINT) {#PAPERLESS_AI_LLM_ENDPOINT}

-: The endpoint / url to use for the AI backend. This is required for the Ollama backend and may be
-used with the OpenAI-compatible backend to target a custom provider or local gateway.
+: The endpoint / url to use for the AI backend. This is required for the Ollama backend (optional for others).

    Defaults to None.

@@ -370,367 +370,121 @@ docker build --file Dockerfile --tag paperless:local .

 ## Extending Paperless-ngx

-Paperless-ngx supports third-party document parsers via a Python entry point
-plugin system. Plugins are distributed as ordinary Python packages and
-discovered automatically at startup — no changes to the Paperless-ngx source
-are required.
-
-!!! warning "Third-party plugins are not officially supported"
-
-    The Paperless-ngx maintainers do not provide support for third-party
-    plugins. Issues that are caused by or require changes to a third-party
-    plugin will be closed without further investigation. If you believe you
-    have found a bug in Paperless-ngx itself (not in a plugin), please
-    reproduce it with all third-party plugins removed before filing an issue.
+Paperless-ngx does not have any fancy plugin systems and will probably never
+have. However, some parts of the application have been designed to allow
+easy integration of additional features without any modification to the
+base code.

 ### Making custom parsers

-Paperless-ngx uses parsers to add documents. A parser is responsible for:
+Paperless-ngx uses parsers to add documents. A parser is
+responsible for:

- Extracting plain-text content from the document
- Generating a thumbnail image
- _optional:_ Detecting the document's creation date
- _optional:_ Producing a searchable PDF archive copy
+- Retrieving the content from the original
+- Creating a thumbnail
+- _optional:_ Retrieving a created date from the original
+- _optional:_ Creating an archived document from the original

-Custom parsers are distributed as ordinary Python packages and registered
-via a [setuptools entry point](https://setuptools.pypa.io/en/latest/userguide/entry_point.html).
-No changes to the Paperless-ngx source are required.
+Custom parsers can be added to Paperless-ngx to support more file types. In
+order to do that, you need to write the parser itself and announce its
+existence to Paperless-ngx.

-#### 1. Implementing the parser class
-
-Your parser must satisfy the `ParserProtocol` structural interface defined in
-`paperless.parsers`. The simplest approach is to write a plain class — no base
-class is required, only the right attributes and methods.
-
-**Class-level identity attributes**
-
-The registry reads these before instantiating the parser, so they must be
-plain class attributes (not instance attributes or properties):
+The parser itself must extend `documents.parsers.DocumentParser` and
+must implement the methods `parse` and `get_thumbnail`. You can provide
+your own implementation to `get_date` if you don't want to rely on
+Paperless-ngx' default date guessing mechanisms.

 ```python
-class MyCustomParser:
-    name    = "My Format Parser"   # human-readable name shown in logs
-    version = "1.0.0"              # semantic version string
-    author  = "Acme Corp"          # author / organisation
-    url     = "https://example.com/my-parser"  # docs or issue tracker
+class MyCustomParser(DocumentParser):
+
+    def parse(self, document_path, mime_type):
+        # This method does not return anything. Rather, you should assign
+        # whatever you got from the document to the following fields:
+
+        # The content of the document.
+        self.text = "content"
+
+        # Optional: path to a PDF document that you created from the original.
+        self.archive_path = os.path.join(self.tempdir, "archived.pdf")
+
+        # Optional: "created" date of the document.
+        self.date = get_created_from_metadata(document_path)
+
+    def get_thumbnail(self, document_path, mime_type):
+        # This should return the path to a thumbnail you created for this
+        # document.
+        return os.path.join(self.tempdir, "thumb.webp")
 ```

-**Declaring supported MIME types**
+If you encounter any issues during parsing, raise a
+`documents.parsers.ParseError`.

-Return a `dict` mapping MIME type strings to preferred file extensions
-(including the leading dot). Paperless-ngx uses the extension when storing
-archive copies and serving files for download.
+The `self.tempdir` directory is a temporary directory that is guaranteed
+to be empty and removed after consumption finished. You can use that
+directory to store any intermediate files and also use it to store the
+thumbnail / archived document.
+
+After that, you need to announce your parser to Paperless-ngx. You need to
+connect a handler to the `document_consumer_declaration` signal. Have a
+look in the file `src/paperless_tesseract/apps.py` on how that's done.
+The handler is a method that returns information about your parser:

 ```python
-@classmethod
-def supported_mime_types(cls) -> dict[str, str]:
+def myparser_consumer_declaration(sender, **kwargs):
    return {
-        "application/x-my-format": ".myf",
-        "application/x-my-format-alt": ".myf",
+        "parser": MyCustomParser,
+        "weight": 0,
+        "mime_types": {
+            "application/pdf": ".pdf",
+            "image/jpeg": ".jpg",
+        }
    }
 ```

-**Scoring**
-
-When more than one parser can handle a file, the registry calls `score()` on
-each candidate and picks the one with the highest result and equal scores favor third-party parsers over built-ins. Return `None` to
-decline handling a file even though the MIME type is listed as supported (for
-example, when a required external service is not configured).
-
-| Score  | Meaning                                                                           |
-| ------ | --------------------------------------------------------------------------------- |
-| `None` | Decline — do not handle this file                                                 |
-| `10`   | Default priority used by all built-in parsers                                     |
-| `20`   | Priority used by the remote OCR built-in parser, allowing it to replace Tesseract |
-| `> 10` | Override a built-in parser for the same MIME type                                 |
-
-```python
-@classmethod
-def score(
-    cls,
-    mime_type: str,
-    filename: str,
-    path: "Path | None" = None,
-) -> int | None:
-    # Inspect filename or file bytes here if needed.
-    return 10
-```
-
-**Archive and rendition flags**
-
-```python
-@property
-def can_produce_archive(self) -> bool:
-    """True if parse() can produce a searchable PDF archive copy."""
-    return True   # or False if your parser doesn't produce PDFs
-
-@property
-def requires_pdf_rendition(self) -> bool:
-    """True if the original format cannot be displayed by a browser
-    (e.g. DOCX, ODT) and the PDF output must always be kept."""
-    return False
-```
-
-**Context manager — temp directory lifecycle**
-
-Paperless-ngx always uses parsers as context managers. Create a temporary
-working directory in `__enter__` (or `__init__`) and remove it in `__exit__`
-regardless of whether an exception occurred. Store intermediate files,
-thumbnails, and archive PDFs inside this directory.
-
-```python
-import shutil
-import tempfile
-from pathlib import Path
-from typing import Self
-from types import TracebackType
-
-from django.conf import settings
-
-class MyCustomParser:
-    ...
-
-    def __init__(self, logging_group: object = None) -> None:
-        settings.SCRATCH_DIR.mkdir(parents=True, exist_ok=True)
-        self._tempdir = Path(
-            tempfile.mkdtemp(prefix="paperless-", dir=settings.SCRATCH_DIR)
-        )
-        self._text: str | None = None
-        self._archive_path: Path | None = None
-
-    def __enter__(self) -> Self:
-        return self
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: TracebackType | None,
-    ) -> None:
-        shutil.rmtree(self._tempdir, ignore_errors=True)
-```
-
-**Optional context — `configure()`**
-
-The consumer calls `configure()` with a `ParserContext` after instantiation
-and before `parse()`. If your parser doesn't need context, a no-op
-implementation is fine:
-
-```python
-from paperless.parsers import ParserContext
-
-def configure(self, context: ParserContext) -> None:
-    pass   # override if you need context.mailrule_id, etc.
-```
-
-**Parsing**
-
-`parse()` is the core method. It must not return a value; instead, store
-results in instance attributes and expose them via the accessor methods below.
-Raise `documents.parsers.ParseError` on any unrecoverable failure.
-
-```python
-from documents.parsers import ParseError
-
-def parse(
-    self,
-    document_path: Path,
-    mime_type: str,
-    *,
-    produce_archive: bool = True,
-) -> None:
-    try:
-        self._text = extract_text_from_my_format(document_path)
-    except Exception as e:
-        raise ParseError(f"Failed to parse {document_path}: {e}") from e
-
-    if produce_archive and self.can_produce_archive:
-        archive = self._tempdir / "archived.pdf"
-        convert_to_pdf(document_path, archive)
-        self._archive_path = archive
-```
-
-**Result accessors**
-
-```python
-def get_text(self) -> str | None:
-    return self._text
-
-def get_date(self) -> "datetime.datetime | None":
-    # Return a datetime extracted from the document, or None to let
-    # Paperless-ngx use its default date-guessing logic.
-    return None
-
-def get_archive_path(self) -> Path | None:
-    return self._archive_path
-
-def get_page_count(self, document_path: Path, mime_type: str) -> int | None:
-    # If the format doesn't have the concept of pages, return None
-    return count_pages(document_path)
-
-```
-
-**Thumbnail**
-
-`get_thumbnail()` may be called independently of `parse()`. Return the path
-to a WebP image inside `self._tempdir`. The image should be roughly 500 × 700
-pixels.
-
-```python
-def get_thumbnail(self, document_path: Path, mime_type: str) -> Path:
-    thumb = self._tempdir / "thumb.webp"
-    render_thumbnail(document_path, thumb)
-    return thumb
-```
-
-**Optional methods**
-
-These are called by the API on demand, not during the consumption pipeline.
-Implement them if your format supports the information; otherwise return
-`None` / `[]`.
-
-```python
-
-def extract_metadata(
-    self,
-    document_path: Path,
-    mime_type: str,
-) -> "list[MetadataEntry]":
-    # Must never raise. Return [] if metadata cannot be read.
-    from paperless.parsers import MetadataEntry
-    return [
-        MetadataEntry(
-            namespace="https://example.com/ns/",
-            prefix="ex",
-            key="Author",
-            value="Alice",
-        )
-    ]
-```
-
-#### 2. Registering via entry point
-
-Add the following to your package's `pyproject.toml`. The key (left of `=`)
-is an arbitrary name used only in log output; the value is the
-`module:ClassName` import path.
-
-```toml
-[project.entry-points."paperless_ngx.parsers"]
-my_parser = "my_package.parsers:MyCustomParser"
-```
-
-Install your package into the same Python environment as Paperless-ngx (or
-add it to the Docker image), and the parser will be discovered automatically
-on the next startup. No configuration changes are needed.
-
-To verify discovery, check the application logs at startup for a line like:
-
-```
-Loaded third-party parser 'My Format Parser' v1.0.0 by Acme Corp (entrypoint: 'my_parser').
-```
-
-#### 3. Utilities
-
-`paperless.parsers.utils` provides helpers you can import directly:
-
-| Function                                | Description                                                      |
-| --------------------------------------- | ---------------------------------------------------------------- |
-| `read_file_handle_unicode_errors(path)` | Read a file as UTF-8, replacing invalid bytes instead of raising |
-| `get_page_count_for_pdf(path)`          | Count pages in a PDF using pikepdf                               |
-| `extract_pdf_metadata(path)`            | Extract XMP metadata from a PDF as a `list[MetadataEntry]`       |
-
-#### Minimal example
-
-A complete, working parser for a hypothetical plain-XML format:
-
-```python
-from __future__ import annotations
-
-import shutil
-import tempfile
-from pathlib import Path
-from typing import Self
-from types import TracebackType
-import xml.etree.ElementTree as ET
-
-from django.conf import settings
-
-from documents.parsers import ParseError
-from paperless.parsers import ParserContext
-
-
-class XmlDocumentParser:
-    name    = "XML Parser"
-    version = "1.0.0"
-    author  = "Acme Corp"
-    url     = "https://example.com/xml-parser"
-
-    @classmethod
-    def supported_mime_types(cls) -> dict[str, str]:
-        return {"application/xml": ".xml", "text/xml": ".xml"}
-
-    @classmethod
-    def score(cls, mime_type: str, filename: str, path: Path | None = None) -> int | None:
-        return 10
-
-    @property
-    def can_produce_archive(self) -> bool:
-        return False
-
-    @property
-    def requires_pdf_rendition(self) -> bool:
-        return False
-
-    def __init__(self, logging_group: object = None) -> None:
-        settings.SCRATCH_DIR.mkdir(parents=True, exist_ok=True)
-        self._tempdir = Path(tempfile.mkdtemp(prefix="paperless-", dir=settings.SCRATCH_DIR))
-        self._text: str | None = None
-
-    def __enter__(self) -> Self:
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
-        shutil.rmtree(self._tempdir, ignore_errors=True)
-
-    def configure(self, context: ParserContext) -> None:
-        pass
-
-    def parse(self, document_path: Path, mime_type: str, *, produce_archive: bool = True) -> None:
-        try:
-            tree = ET.parse(document_path)
-            self._text = " ".join(tree.getroot().itertext())
-        except ET.ParseError as e:
-            raise ParseError(f"XML parse error: {e}") from e
-
-    def get_text(self) -> str | None:
-        return self._text
-
-    def get_date(self):
-        return None
-
-    def get_archive_path(self) -> Path | None:
-        return None
-
-    def get_thumbnail(self, document_path: Path, mime_type: str) -> Path:
-        from PIL import Image, ImageDraw
-        img = Image.new("RGB", (500, 700), color="white")
-        ImageDraw.Draw(img).text((10, 10), "XML Document", fill="black")
-        out = self._tempdir / "thumb.webp"
-        img.save(out, format="WEBP")
-        return out
-
-    def get_page_count(self, document_path: Path, mime_type: str) -> int | None:
-        return None
-
-    def extract_metadata(self, document_path: Path, mime_type: str) -> list:
-        return []
-```
-
-### Developing date parser plugins
+- `parser` is a reference to a class that extends `DocumentParser`.
+- `weight` is used whenever two or more parsers are able to parse a
+  file: The parser with the higher weight wins. This can be used to
+  override the parsers provided by Paperless-ngx.
+- `mime_types` is a dictionary. The keys are the mime types your
+  parser supports and the value is the default file extension that
+  Paperless-ngx should use when storing files and serving them for
+  download. We could guess that from the file extensions, but some
+  mime types have many extensions associated with them and the Python
+  methods responsible for guessing the extension do not always return
+  the same value.
+
+## Using Visual Studio Code devcontainer
+
+Another easy way to get started with development is to use Visual Studio
+Code devcontainers. This approach will create a preconfigured development
+environment with all of the required tools and dependencies.
+[Learn more about devcontainers](https://code.visualstudio.com/docs/devcontainers/containers).
+The .devcontainer/vscode/tasks.json and .devcontainer/vscode/launch.json files
+contain more information about the specific tasks and launch configurations (see the
+non-standard "description" field).
+
+To get started:
+
+1. Clone the repository on your machine and open the Paperless-ngx folder in VS Code.
+
+2. VS Code will prompt you with "Reopen in container". Do so and wait for the environment to start.
+
+3. In case your host operating system is Windows:
+   - The Source Control view in Visual Studio Code might show: "The detected Git repository is potentially unsafe as the folder is owned by someone other than the current user." Use "Manage Unsafe Repositories" to fix this.
+   - Git might have detecteded modifications for all files, because Windows is using CRLF line endings. Run `git checkout .` in the containers terminal to fix this issue.
+
+4. Initialize the project by running the task **Project Setup: Run all Init Tasks**. This
+   will initialize the database tables and create a superuser. Then you can compile the front end
+   for production or run the frontend in debug mode.
+
+5. The project is ready for debugging, start either run the fullstack debug or individual debug
+   processes. Yo spin up the project without debugging run the task **Project Start: Run all Services**
+
+## Developing Date Parser Plugins

 Paperless-ngx uses a plugin system for date parsing, allowing you to extend or replace the default date parsing behavior. Plugins are discovered using [Python entry points](https://setuptools.pypa.io/en/latest/userguide/entry_point.html).

-#### Creating a Date Parser Plugin
+### Creating a Date Parser Plugin

 To create a custom date parser plugin, you need to:

@@ -738,7 +492,7 @@ To create a custom date parser plugin, you need to:
 2. Implement the required abstract method
 3. Register your plugin via an entry point

-##### 1. Implementing the Parser Class
+#### 1. Implementing the Parser Class

 Your parser must extend `documents.plugins.date_parsing.DateParserPluginBase` and implement the `parse` method:

@@ -778,7 +532,7 @@ class MyDateParserPlugin(DateParserPluginBase):
        yield another_datetime
 ```

-##### 2. Configuration and Helper Methods
+#### 2. Configuration and Helper Methods

 Your parser instance is initialized with a `DateParserConfig` object accessible via `self.config`. This provides:

@@ -811,11 +565,11 @@ def _filter_date(
    """
 ```

-##### 3. Resource Management (Optional)
+#### 3. Resource Management (Optional)

 If your plugin needs to acquire or release resources (database connections, API clients, etc.), override the context manager methods. Paperless-ngx will always use plugins as context managers, ensuring resources can be released even in the event of errors.

-##### 4. Registering Your Plugin
+#### 4. Registering Your Plugin

 Register your plugin using a setuptools entry point in your package's `pyproject.toml`:

@@ -826,7 +580,7 @@ my_parser = "my_package.parsers:MyDateParserPlugin"

 The entry point name (e.g., `"my_parser"`) is used for sorting when multiple plugins are found. Paperless-ngx will use the first plugin alphabetically by name if multiple plugins are discovered.

-#### Plugin Discovery
+### Plugin Discovery

 Paperless-ngx automatically discovers and loads date parser plugins at runtime. The discovery process:

@@ -837,7 +591,7 @@ Paperless-ngx automatically discovers and loads date parser plugins at runtime.

 If multiple plugins are installed, a warning is logged indicating which plugin was selected.

-#### Example: Simple Date Parser
+### Example: Simple Date Parser

 Here's a minimal example that only looks for ISO 8601 dates:

@@ -869,30 +623,3 @@ class ISODateParserPlugin(DateParserPluginBase):
            if filtered_date is not None:
                yield filtered_date
 ```
-
-## Using Visual Studio Code devcontainer
-
-Another easy way to get started with development is to use Visual Studio
-Code devcontainers. This approach will create a preconfigured development
-environment with all of the required tools and dependencies.
-[Learn more about devcontainers](https://code.visualstudio.com/docs/devcontainers/containers).
-The .devcontainer/vscode/tasks.json and .devcontainer/vscode/launch.json files
-contain more information about the specific tasks and launch configurations (see the
-non-standard "description" field).
-
-To get started:
-
-1. Clone the repository on your machine and open the Paperless-ngx folder in VS Code.
-
-2. VS Code will prompt you with "Reopen in container". Do so and wait for the environment to start.
-
-3. In case your host operating system is Windows:
-   - The Source Control view in Visual Studio Code might show: "The detected Git repository is potentially unsafe as the folder is owned by someone other than the current user." Use "Manage Unsafe Repositories" to fix this.
-   - Git might have detecteded modifications for all files, because Windows is using CRLF line endings. Run `git checkout .` in the containers terminal to fix this issue.
-
-4. Initialize the project by running the task **Project Setup: Run all Init Tasks**. This
-   will initialize the database tables and create a superuser. Then you can compile the front end
-   for production or run the frontend in debug mode.
-
-5. The project is ready for debugging, start either run the fullstack debug or individual debug
-   processes. Yo spin up the project without debugging run the task **Project Start: Run all Services**
@@ -4,7 +4,7 @@ title: Home

 <div class="grid-left" markdown>
 ![image](assets/logo_full_black.svg#only-light){.index-logo}
-![image](assets/logo_full_eee.svg#only-dark){.index-logo}
+![image](assets/logo_full_white.svg#only-dark){.index-logo}

 **Paperless-ngx** is a _community-supported_ open-source document management system that transforms your
 physical documents into a searchable online archive so you can keep, well, _less paper_.
@@ -1,24 +1,5 @@
 # v3 Migration Guide

-## Secret Key is Now Required
-
-The `PAPERLESS_SECRET_KEY` environment variable is now required. This is a critical security setting used for cryptographic signing and should be set to a long, random value.
-
-### Action Required
-
-If you are upgrading an existing installation, you must now set `PAPERLESS_SECRET_KEY` explicitly.
-
-If your installation was relying on the previous built-in default key, you have two options:
-
- Set `PAPERLESS_SECRET_KEY` to that previous value to preserve existing sessions and tokens.
- Set `PAPERLESS_SECRET_KEY` to a new random value to improve security, understanding that this will invalidate existing sessions and other signed tokens.
-
-For new installations, or if you choose to rotate the key, you may generate a new secret key with:
-
-```bash
-python3 -c "import secrets; print(secrets.token_urlsafe(64))"
-```
-
 ## Consumer Settings Changes

 The v3 consumer command uses a [different library](https://watchfiles.helpmanual.io/) to unify
@@ -120,193 +101,5 @@ Users with any of the deprecated variables set should migrate to `PAPERLESS_DB_O
 Multiple options are combined in a single value:

 ```bash
-PAPERLESS_DB_OPTIONS="sslmode=require,sslrootcert=/certs/ca.pem,pool.max_size=10"
+PAPERLESS_DB_OPTIONS="sslmode=require;sslrootcert=/certs/ca.pem;pool.max_size=10"
 ```
-
-## OCR and Archive File Generation Settings
-
-The settings that control OCR behaviour and archive file generation have been redesigned. The old settings that coupled these two concerns together are **removed** — old values are not silently honoured; a startup warning is logged if any removed variable is still set in your environment.
-
-### Removed settings
-
-| Removed Setting                             | Replacement                                                           |
-| ------------------------------------------- | --------------------------------------------------------------------- |
-| `PAPERLESS_OCR_MODE=skip`                   | `PAPERLESS_OCR_MODE=auto` (new default)                               |
-| `PAPERLESS_OCR_MODE=skip_noarchive`         | `PAPERLESS_OCR_MODE=auto` + `PAPERLESS_ARCHIVE_FILE_GENERATION=never` |
-| `PAPERLESS_OCR_SKIP_ARCHIVE_FILE=never`     | `PAPERLESS_ARCHIVE_FILE_GENERATION=always`                            |
-| `PAPERLESS_OCR_SKIP_ARCHIVE_FILE=with_text` | `PAPERLESS_ARCHIVE_FILE_GENERATION=auto` (new default)                |
-| `PAPERLESS_OCR_SKIP_ARCHIVE_FILE=always`    | `PAPERLESS_ARCHIVE_FILE_GENERATION=never`                             |
-
-### What changed and why
-
-Previously, `OCR_MODE` conflated two independent concerns: whether to run OCR and whether to produce an archive. `skip` meant "skip OCR if text exists, but always produce an archive". `skip_noarchive` meant "skip OCR if text exists, and also skip the archive". This made it impossible to, for example, disable OCR entirely while still producing archives.
-
-The new settings are independent:
-
- [`PAPERLESS_OCR_MODE`](configuration.md#PAPERLESS_OCR_MODE) controls OCR: `auto` (default), `force`, `redo`, `off`.
- [`PAPERLESS_ARCHIVE_FILE_GENERATION`](configuration.md#PAPERLESS_ARCHIVE_FILE_GENERATION) controls archive production: `auto` (default), `always`, `never`.
-
-### Database configuration
-
-If you changed OCR settings via the admin UI (ApplicationConfiguration), the database values are **migrated automatically** during the upgrade. `mode` values (`skip` / `skip_noarchive`) are mapped to their new equivalents and `skip_archive_file` values are converted to the new `archive_file_generation` field. After upgrading, review the OCR settings in the admin UI to confirm the migrated values match your intent.
-
-### Action Required
-
-Remove any `PAPERLESS_OCR_SKIP_ARCHIVE_FILE` variable from your environment. If you relied on `OCR_MODE=skip` or `OCR_MODE=skip_noarchive`, update accordingly:
-
-```bash
-# v2: skip OCR when text present, always archive
-PAPERLESS_OCR_MODE=skip
-# v3: equivalent (auto is the new default)
-# No change needed — auto is the default
-
-# v2: skip OCR when text present, skip archive too
-PAPERLESS_OCR_MODE=skip_noarchive
-# v3: equivalent
-PAPERLESS_OCR_MODE=auto
-PAPERLESS_ARCHIVE_FILE_GENERATION=never
-
-# v2: always skip archive
-PAPERLESS_OCR_SKIP_ARCHIVE_FILE=always
-# v3: equivalent
-PAPERLESS_ARCHIVE_FILE_GENERATION=never
-
-# v2: skip archive only for born-digital docs
-PAPERLESS_OCR_SKIP_ARCHIVE_FILE=with_text
-# v3: equivalent (auto is the new default)
-PAPERLESS_ARCHIVE_FILE_GENERATION=auto
-```
-
-### Remote OCR parser
-
-If you use the **remote OCR parser** (Azure AI), note that it always produces a
-searchable PDF and stores it as the archive copy. `ARCHIVE_FILE_GENERATION=never`
-has no effect for documents handled by the remote parser — the archive is produced
-unconditionally by the remote engine.
-
-# Search Index (Whoosh -> Tantivy)
-
-The full-text search backend has been replaced with [Tantivy](https://github.com/quickwit-oss/tantivy).
-The index format is incompatible with Whoosh, so **the search index is automatically rebuilt from
-scratch on first startup after upgrading**. No manual action is required for the rebuild itself.
-
-### Note and custom field search syntax
-
-The old Whoosh index exposed `note` and `custom_field` as flat text fields that were included in
-unqualified searches (e.g. just typing `invoice` would match note content). With Tantivy these are
-now structured JSON fields accessed via dotted paths:
-
-| Old syntax           | New syntax                  |
-| -------------------- | --------------------------- |
-| `note:query`         | `notes.note:query`          |
-| `custom_field:query` | `custom_fields.value:query` |
-
-**Saved views are migrated automatically.** Any saved view filter rule that used an explicit
-`note:` or `custom_field:` field prefix in a fulltext query is rewritten to the new syntax by a
-data migration that runs on upgrade.
-
-**Unqualified queries are not migrated.** If you had a saved view with a plain search term (e.g.
-`invoice`) that happened to match note content or custom field values, it will no longer return
-those matches. Update those queries to use the explicit prefix, for example:
-
-```
-invoice OR notes.note:invoice OR custom_fields.value:invoice
-```
-
-Custom field names can also be searched with `custom_fields.name:fieldname`.
-
-## OpenID Connect Token Endpoint Authentication
-
-Some existing OpenID Connect setups may require an explicit token endpoint authentication method after upgrading to v3.
-
-#### Action Required
-
-If OIDC login fails at the callback with an `invalid_client` error, add `token_auth_method` to the provider `settings` in
-[`PAPERLESS_SOCIALACCOUNT_PROVIDERS`](configuration.md#PAPERLESS_SOCIALACCOUNT_PROVIDERS).
-
-For example:
-
-```json
-{
-  "openid_connect": {
-    "APPS": [
-      {
-        ...
-        "settings": {
-          "server_url": "https://login.example.com",
-          "token_auth_method": "client_secret_basic"
-        }
-      }
-    ]
-  }
-}
-```
-
-## Task History Cleared on Upgrade
-
-The task tracking system has been redesigned in this release. All existing task history records are dropped from the database during the upgrade. Previously completed, failed, or acknowledged tasks will no longer appear in the task list after upgrading.
-
-No user action is required.
-
-## Consume Script Positional Arguments Removed
-
-Pre- and post-consumption scripts no longer receive positional arguments. All information is
-now passed exclusively via environment variables, which have been available since earlier versions.
-
-### Pre-consumption script
-
-Previously, the original file path was passed as `$1`. It is now only available as
-`DOCUMENT_SOURCE_PATH`.
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-# $1 was the original file path
-process_document "$1"
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-process_document "${DOCUMENT_SOURCE_PATH}"
-```
-
-### Post-consumption script
-
-Previously, document metadata was passed as positional arguments `$1` through `$8`:
-
-| Argument | Environment Variable Equivalent |
-| -------- | ------------------------------- |
-| `$1`     | `DOCUMENT_ID`                   |
-| `$2`     | `DOCUMENT_FILE_NAME`            |
-| `$3`     | `DOCUMENT_SOURCE_PATH`          |
-| `$4`     | `DOCUMENT_THUMBNAIL_PATH`       |
-| `$5`     | `DOCUMENT_DOWNLOAD_URL`         |
-| `$6`     | `DOCUMENT_THUMBNAIL_URL`        |
-| `$7`     | `DOCUMENT_CORRESPONDENT`        |
-| `$8`     | `DOCUMENT_TAGS`                 |
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-DOCUMENT_ID=$1
-CORRESPONDENT=$7
-TAGS=$8
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-# Use environment variables directly
-echo "Document ${DOCUMENT_ID} from ${DOCUMENT_CORRESPONDENT} tagged: ${DOCUMENT_TAGS}"
-```
-
-### Action Required
-
-Update any pre- or post-consumption scripts that read `$1`, `$2`, etc. to use the
-corresponding environment variables instead. Environment variables have been the preferred
-option since v1.8.0.
@@ -633,11 +633,12 @@ hardware, but a few settings can improve performance:
  consumption, so you might want to lower these settings (example: 2
  workers and 1 thread to always have some computing power left for
  other tasks).
- Keep [`PAPERLESS_OCR_MODE`](configuration.md#PAPERLESS_OCR_MODE) at its default value `auto` and consider
+- Keep [`PAPERLESS_OCR_MODE`](configuration.md#PAPERLESS_OCR_MODE) at its default value `skip` and consider
  OCRing your documents before feeding them into Paperless. Some
  scanners are able to do this!
- Set [`PAPERLESS_ARCHIVE_FILE_GENERATION`](configuration.md#PAPERLESS_ARCHIVE_FILE_GENERATION) to `never` to skip archive
-  file generation entirely, saving disk space at the cost of in-browser PDF/A viewing.
+- Set [`PAPERLESS_OCR_SKIP_ARCHIVE_FILE`](configuration.md#PAPERLESS_OCR_SKIP_ARCHIVE_FILE) to `with_text` to skip archive
+  file generation for already OCRed documents, or `always` to skip it
+  for all documents.
 - If you want to perform OCR on the device, consider using
  `PAPERLESS_OCR_CLEAN=none`. This will speed up OCR times and use
  less memory at the expense of slightly worse OCR results.
@@ -134,9 +134,9 @@ following operations on your documents:
 !!! tip

    This process can be configured to fit your needs. If you don't want
-    paperless to create archived versions for born-digital documents, set
-    [`PAPERLESS_ARCHIVE_FILE_GENERATION=auto`](configuration.md#PAPERLESS_ARCHIVE_FILE_GENERATION)
-    (the default). To skip archives entirely, use `never`. Please read the
+    paperless to create archived versions for digital documents, you can
+    configure that by configuring
+    `PAPERLESS_OCR_SKIP_ARCHIVE_FILE=with_text`. Please read the
    [relevant section in the documentation](configuration.md#ocr).

 !!! note
@@ -302,19 +302,13 @@ Paperless-ngx includes several features that use AI to enhance the document mana

 !!! warning

-    Remember that Paperless-ngx will send document content to the AI provider you have configured,
-    so consider the privacy implications of using these features, especially if using a remote
-    model or API provider instead of the default local model.
+    Remember that Paperless-ngx will send document content to the AI provider you have configured, so consider the privacy implications of using these features, especially if using a remote model (e.g. OpenAI), instead of the default local model.

 The AI features work by creating an embedding of the text content and metadata of documents, which is then used for various tasks such as similarity search and question answering. This uses the FAISS vector store.

 ### AI-Enhanced Suggestions

-If enabled, Paperless-ngx can use an AI LLM model to suggest document titles, dates, tags,
-correspondents and document types for documents. This feature will always be "opt-in" and does not
-disable the existing classifier-based suggestion system. Currently, both remote
-(via OpenAI-compatible APIs) and local (via Ollama) models are supported, see
-[configuration](configuration.md#ai) for details.
+If enabled, Paperless-ngx can use an AI LLM model to suggest document titles, dates, tags, correspondents and document types for documents. This feature will always be "opt-in" and does not disable the existing classifier-based suggestion system. Currently, both remote (via the OpenAI API) and local (via Ollama) models are supported, see [configuration](configuration.md#ai) for details.

 ### Document Chat

@@ -404,27 +398,25 @@ Global permissions define what areas of the app and API endpoints users can acce
 determine if a user can create, edit, delete or view _any_ documents, but individual documents themselves
 still have "object-level" permissions.

-| Type             | Details                                                                                                                                                                                                                         |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| AppConfig        | _Change_ or higher permissions grants access to the "Application Configuration" area.                                                                                                                                           |
-| Correspondent    | Add, edit, delete or view Correspondents.                                                                                                                                                                                       |
-| CustomField      | Add, edit, delete or view Custom Fields.                                                                                                                                                                                        |
-| Document         | Add, edit, delete or view Documents.                                                                                                                                                                                            |
-| DocumentType     | Add, edit, delete or view Document Types.                                                                                                                                                                                       |
-| Group            | Add, edit, delete or view Groups.                                                                                                                                                                                               |
-| GlobalStatistics | View aggregate object counts and statistics. This does not grant access to view individual documents.                                                                                                                           |
-| MailAccount      | Add, edit, delete or view Mail Accounts.                                                                                                                                                                                        |
-| MailRule         | Add, edit, delete or view Mail Rules.                                                                                                                                                                                           |
-| Note             | Add, edit, delete or view Notes.                                                                                                                                                                                                |
-| PaperlessTask    | View or dismiss (_Change_) File Tasks.                                                                                                                                                                                          |
-| SavedView        | Add, edit, delete or view Saved Views.                                                                                                                                                                                          |
-| ShareLink        | Add, delete or view Share Links.                                                                                                                                                                                                |
-| StoragePath      | Add, edit, delete or view Storage Paths.                                                                                                                                                                                        |
-| SystemMonitoring | View the system status dialog, tasks summary and their API endpoints. Admin users also retain system status access.                                                                                                             |
-| Tag              | Add, edit, delete or view Tags.                                                                                                                                                                                                 |
-| UISettings       | Add, edit, delete or view the UI settings that are used by the web app.<br/>:warning: **Users that will access the web UI must be granted at least _View_ permissions.**                                                        |
-| User             | Add, edit, delete or view other user accounts via Settings > Users & Groups and `/api/users/`. These permissions are not needed for users to edit their own profile via "My Profile" or `/api/profile/`.                        |
-| Workflow         | Add, edit, delete or view Workflows.<br/>Note that Workflows are global; all users who can access workflows see the same set. Workflows have other permission implications — see [Workflow permissions](#workflow-permissions). |
+| Type          | Details                                                                                                                                                                                                                         |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| AppConfig     | _Change_ or higher permissions grants access to the "Application Configuration" area.                                                                                                                                           |
+| Correspondent | Add, edit, delete or view Correspondents.                                                                                                                                                                                       |
+| CustomField   | Add, edit, delete or view Custom Fields.                                                                                                                                                                                        |
+| Document      | Add, edit, delete or view Documents.                                                                                                                                                                                            |
+| DocumentType  | Add, edit, delete or view Document Types.                                                                                                                                                                                       |
+| Group         | Add, edit, delete or view Groups.                                                                                                                                                                                               |
+| MailAccount   | Add, edit, delete or view Mail Accounts.                                                                                                                                                                                        |
+| MailRule      | Add, edit, delete or view Mail Rules.                                                                                                                                                                                           |
+| Note          | Add, edit, delete or view Notes.                                                                                                                                                                                                |
+| PaperlessTask | View or dismiss (_Change_) File Tasks.                                                                                                                                                                                          |
+| SavedView     | Add, edit, delete or view Saved Views.                                                                                                                                                                                          |
+| ShareLink     | Add, delete or view Share Links.                                                                                                                                                                                                |
+| StoragePath   | Add, edit, delete or view Storage Paths.                                                                                                                                                                                        |
+| Tag           | Add, edit, delete or view Tags.                                                                                                                                                                                                 |
+| UISettings    | Add, edit, delete or view the UI settings that are used by the web app.<br/>:warning: **Users that will access the web UI must be granted at least _View_ permissions.**                                                        |
+| User          | Add, edit, delete or view Users.                                                                                                                                                                                                |
+| Workflow      | Add, edit, delete or view Workflows.<br/>Note that Workflows are global; all users who can access workflows see the same set. Workflows have other permission implications — see [Workflow permissions](#workflow-permissions). |

 #### Detailed Explanation of Object Permissions {#object-permissions}

@@ -434,8 +426,6 @@ still have "object-level" permissions.
 | View  | Confers the ability to view (not edit) a document, tag, etc.<br/>Users without 'view' (or higher) permissions will be shown _'Private'_ in place of the object name for example when viewing a document with a tag for which the user doesn't have permissions.                                                                          |
 | Edit  | Confers the ability to edit (and view) a document, tag, etc.                                                                                                                                                                                                                                                                             |

-For related metadata such as tags, correspondents, document types, and storage paths, object visibility and document assignment are intentionally distinct. A user may still retain or submit a known object ID when editing a document even if that related object is displayed as _Private_ or omitted from search and selection results. This allows documents to preserve existing assignments that the current user cannot necessarily inspect in detail.
-
 ### Password reset

 In order to enable the password reset feature you will need to setup an SMTP backend, see
@@ -814,20 +804,13 @@ contract you signed 8 years ago).

 When you search paperless for a document, it tries to match this query
 against your documents. Paperless will look for matching documents by
-inspecting their content, title, correspondent, type, tags, notes, and
-custom field values. Paperless returns a scored list of results, so that
-documents matching your query better will appear further up in the search
-results.
+inspecting their content, title, correspondent, type and tags. Paperless
+returns a scored list of results, so that documents matching your query
+better will appear further up in the search results.

 By default, paperless returns only documents which contain all words
-typed in the search bar. A few things to know about how matching works:
-
- **Word-order-independent**: "invoice unpaid" and "unpaid invoice" return the same results.
- **Accent-insensitive**: searching `resume` also finds `résumé`, `cafe` finds `café`.
- **Separator-agnostic**: punctuation and separators are stripped during indexing, so
-  searching a partial number like `1312` finds documents containing `A-1312/B`.
-
-Paperless also offers advanced search syntax if you want to drill down further.
+typed in the search bar. However, paperless also offers advanced search
+syntax if you want to drill down the results further.

 Matching documents with logical expressions:

@@ -856,70 +839,18 @@ Matching inexact words:
 produ*name
 ```

-Matching natural date keywords:
-
-```
-added:today
-modified:yesterday
-created:"previous week"
-added:"previous month"
-modified:"this year"
-```
-
-Supported date keywords: `today`, `yesterday`, `previous week`,
-`this month`, `previous month`, `this year`, `previous year`,
-`previous quarter`.
-
-#### Searching custom fields
-
-Custom field values are included in the full-text index, so a plain search
-already matches documents whose custom field values contain your search terms.
-To narrow by field name or value specifically:
-
-```
-custom_fields.value:policy
-custom_fields.name:"Contract Number"
-custom_fields.name:Insurance custom_fields.value:policy
-```
-
- `custom_fields.value` matches against the value of any custom field.
- `custom_fields.name` matches the name of the field (use quotes for multi-word names).
- Combine both to find documents where a specific named field contains a specific value.
-
-Because separators are stripped during indexing, individual parts of formatted
-codes are searchable on their own. A value stored as `A-1312/99.50` produces the
-tokens `a`, `1312`, `99`, `50` — each searchable independently:
-
-```
-custom_fields.value:1312
-custom_fields.name:"Contract Number" custom_fields.value:1312
-```
-
 !!! note

-    Custom date fields do not support relative date syntax (e.g. `[now to 2 weeks]`).
-    For date ranges on custom date fields, use the document list filters in the web UI.
-
-#### Searching notes
-
-Notes content is included in full-text search automatically. To search
-by note author or content specifically:
-
-```
-notes.user:alice
-notes.note:reminder
-notes.user:alice notes.note:insurance
-```
+    Inexact terms are hard for search indexes. These queries might take a
+    while to execute. That's why paperless offers auto complete and query
+    correction.

 All of these constructs can be combined as you see fit. If you want to
-learn more about the query language used by paperless, see the
-[Tantivy query language documentation](https://docs.rs/tantivy/latest/tantivy/query/struct.QueryParser.html).
-
-!!! note
-
-    Fuzzy (approximate) matching can be enabled by setting
-    [`PAPERLESS_ADVANCED_FUZZY_SEARCH_THRESHOLD`](configuration.md#PAPERLESS_ADVANCED_FUZZY_SEARCH_THRESHOLD).
-    When enabled, paperless will include near-miss results ranked below exact matches.
+learn more about the query language used by paperless, paperless uses
+Whoosh's default query language. Head over to [Whoosh query
+language](https://whoosh.readthedocs.io/en/latest/querylang.html). For
+details on what date parsing utilities are available, see [Date
+parsing](https://whoosh.readthedocs.io/en/latest/dates.html#parsing-date-queries).

 ## Keyboard shortcuts / hotkeys

@@ -30,25 +30,11 @@
 			"**/.idea": true,
 			"**/.venv": true,
 			"**/.coverage": true,
-			"**/coverage.json": true,
-			"htmlcov/": true,
-			"coverage.xml": true,
-			"junit.xml": true
+			"**/coverage.json": true
 		},
-		"python.languageServer": "Pylance",
-		"python.defaultInterpreterPath": "${workspaceFolder:paperless-ngx}/.venv/bin/python3",
-		"python.analysis.extraPaths": ["${workspaceFolder:paperless-ngx}/src"],
+		"python.defaultInterpreterPath": ".venv/bin/python3",
 		"python.analysis.inlayHints.pytestParameters": true,
 		"python.testing.pytestEnabled": true,
-		"python.testing.unittestEnabled": false,
-		"[python]": {
-			"editor.defaultFormatter": "charliermarsh.ruff",
-			"editor.formatOnSave": true,
-			"editor.codeActionsOnSave": {
-				"source.fixAll.ruff": "explicit",
-				"source.organizeImports.ruff": "explicit"
-			}
-		}
 	},
 	"extensions": {
 		"recommendations": ["ms-python.python", "charliermarsh.ruff", "editorconfig.editorconfig"],
@@ -14,6 +14,7 @@
 # Paths and folders

 #PAPERLESS_CONSUMPTION_DIR=../consume
+#PAPERLESS_CONSUMPTION_FAILED_DIR=../consume/failed
 #PAPERLESS_DATA_DIR=../data
 #PAPERLESS_EMPTY_TRASH_DIR=
 #PAPERLESS_MEDIA_ROOT=../media
@@ -23,8 +24,7 @@

 # Security and hosting

-# Required. Generate with: python3 -c "import secrets; print(secrets.token_urlsafe(64))"
-PAPERLESS_SECRET_KEY=change-me
+#PAPERLESS_SECRET_KEY=change-me
 #PAPERLESS_URL=https://example.com
 #PAPERLESS_CSRF_TRUSTED_ORIGINS=https://example.com # can be set using PAPERLESS_URL
 #PAPERLESS_ALLOWED_HOSTS=example.com,www.example.com # can be set using PAPERLESS_URL
@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "2.20.15"
+version = "2.20.11"
 description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -13,6 +13,7 @@ classifiers = [
 ]
 # TODO: Move certain things to groups and then utilize that further
 # This will allow testing to not install a webserver, mysql, etc
+
 dependencies = [
  "azure-ai-documentintelligence>=1.0.2",
  "babel>=2.17",
@@ -24,10 +25,11 @@ dependencies = [
  "dateparser~=1.2",
  # WARNING: django does not use semver.
  #          Only patch versions are guaranteed to not introduce breaking changes.
-  "django~=5.2.13",
-  "django-allauth[mfa,socialaccount]~=65.15.0",
+  "django~=5.2.10",
+  "django-allauth[mfa,socialaccount]~=65.14.0",
  "django-auditlog~=3.4.1",
  "django-cachalot~=2.9.0",
+  "django-celery-results~=2.6.0",
  "django-compression-middleware~=0.5.0",
  "django-cors-headers~=4.9.0",
  "django-extensions~=4.1",
@@ -40,12 +42,12 @@ dependencies = [
  "djangorestframework~=3.16",
  "djangorestframework-guardian~=0.4.0",
  "drf-spectacular~=0.28",
-  "drf-spectacular-sidecar~=2026.4.1",
+  "drf-spectacular-sidecar~=2026.3.1",
  "drf-writable-nested~=0.7.1",
  "faiss-cpu>=1.10",
  "filelock~=3.25.2",
  "flower~=2.0.1",
-  "gotenberg-client~=0.14.0",
+  "gotenberg-client~=0.13.1",
  "httpx-oauth~=0.16",
  "ijson>=3.2",
  "imap-tools~=1.11.0",
@@ -53,12 +55,12 @@ dependencies = [
  "langdetect~=1.0.9",
  "llama-index-core>=0.14.12",
  "llama-index-embeddings-huggingface>=0.6.1",
-  "llama-index-embeddings-openai-like>=0.2.2",
+  "llama-index-embeddings-openai>=0.5.1",
  "llama-index-llms-ollama>=0.9.1",
-  "llama-index-llms-openai-like>=0.7.1",
+  "llama-index-llms-openai>=0.6.13",
  "llama-index-vector-stores-faiss>=0.5.2",
  "nltk~=3.9.1",
-  "ocrmypdf~=17.4.0",
+  "ocrmypdf~=17.3.0",
  "openai>=1.76",
  "pathvalidate~=3.3.1",
  "pdf2image~=1.17.0",
@@ -73,57 +75,61 @@ dependencies = [
  "scikit-learn~=1.8.0",
  "sentence-transformers>=4.1",
  "setproctitle~=1.3.4",
-  "tantivy~=0.26.0",
-  "tika-client~=0.11.0",
-  "torch~=2.11.0",
+  "tika-client~=0.10.0",
+  "torch~=2.10.0",
  "watchfiles>=1.1.1",
  "whitenoise~=6.11",
+  "whoosh-reloaded>=2.7.5",
  "zxing-cpp~=3.0.0",
 ]
-[project.optional-dependencies]
-mariadb = [
+
+optional-dependencies.mariadb = [
  "mysqlclient~=2.2.7",
 ]
-postgres = [
+optional-dependencies.postgres = [
  "psycopg[c,pool]==3.3",
  # Direct dependency for proper resolution of the pre-built wheels
  "psycopg-c==3.3",
  "psycopg-pool==3.3",
 ]
-webserver = [
+optional-dependencies.webserver = [
  "granian[uvloop]~=2.7.0",
 ]

 [dependency-groups]
+
 dev = [
-  { include-group = "docs" },
-  { include-group = "lint" },
-  { include-group = "testing" },
+  { "include-group" = "docs" },
+  { "include-group" = "testing" },
+  { "include-group" = "lint" },
 ]
+
 docs = [
  "zensical>=0.0.21",
 ]
+
+testing = [
+  "daphne",
+  "factory-boy~=3.3.1",
+  "faker~=40.8.0",
+  "imagehash",
+  "pytest~=9.0.0",
+  "pytest-cov~=7.0.0",
+  "pytest-django~=4.12.0",
+  "pytest-env~=1.5.0",
+  "pytest-httpx",
+  "pytest-mock~=3.15.1",
+  #"pytest-randomly~=4.0.1",
+  "pytest-rerunfailures~=16.1",
+  "pytest-sugar",
+  "pytest-xdist~=3.8.0",
+]
+
 lint = [
  "prek~=0.3.0",
  "ruff~=0.15.0",
 ]
-testing = [
-  "daphne",
-  "factory-boy~=3.3.1",
-  "faker~=40.12.0",
-  "imagehash",
-  "pytest~=9.0.3",
-  "pytest-cov~=7.1.0",
-  "pytest-django~=4.12.0",
-  "pytest-env~=1.6.0",
-  "pytest-httpx",
-  "pytest-mock~=3.15.1",
-  # "pytest-randomly~=4.0.1",
-  "pytest-rerunfailures~=16.1",
-  "pytest-sugar",
-  "pytest-xdist~=3.8.0",
-  "time-machine>=2.13",
-]
+
 typing = [
  "celery-types",
  "django-filter-stubs",
@@ -143,27 +149,29 @@ typing = [
  "types-python-dateutil",
  "types-pytz",
  "types-redis",
-  "types-regex",
-  "types-setuptools"
+  "types-setuptools",
 ]

 [tool.uv]
 required-version = ">=0.9.0"
+package = false
 environments = [
  "sys_platform == 'darwin'",
  "sys_platform == 'linux'",
 ]
-package = false
+
 [[tool.uv.index]]
 name = "pytorch-cpu"
 url = "https://download.pytorch.org/whl/cpu"
 explicit = true
+
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
+
 torch = [
  { index = "pytorch-cpu" },
 ]
@@ -178,12 +186,10 @@ respect-gitignore = true
 # https://docs.astral.sh/ruff/settings/
 fix = true
 show-fixes = true
+
 output-format = "grouped"
-[tool.ruff.format]
-line-ending = "lf"
-[tool.ruff.lint]
 # https://docs.astral.sh/ruff/rules/
-extend-select = [
+lint.extend-select = [
  "COM",  # https://docs.astral.sh/ruff/rules/#flake8-commas-com
  "DJ",   # https://docs.astral.sh/ruff/rules/#flake8-django-dj
  "EXE",  # https://docs.astral.sh/ruff/rules/#flake8-executable-exe
@@ -208,52 +214,121 @@ extend-select = [
  "UP",   # https://docs.astral.sh/ruff/rules/#pyupgrade-up
  "W",    # https://docs.astral.sh/ruff/rules/#pycodestyle-e-w
 ]
-ignore = [
+lint.ignore = [
  "DJ001",
  "PLC0415",
  "RUF012",
  "SIM105",
 ]
 # Migrations
-per-file-ignores."*/migrations/*.py" = [
+lint.per-file-ignores."*/migrations/*.py" = [
  "E501",
  "SIM",
  "T201",
 ]
 # Testing
-per-file-ignores."*/tests/*.py" = [
+lint.per-file-ignores."*/tests/*.py" = [
  "E501",
  "SIM117",
 ]
-per-file-ignores.".github/scripts/*.py" = [
+lint.per-file-ignores.".github/scripts/*.py" = [
  "E501",
  "INP001",
  "SIM117",
 ]
 # Docker specific
-per-file-ignores."docker/rootfs/usr/local/bin/wait-for-redis.py" = [
+lint.per-file-ignores."docker/rootfs/usr/local/bin/wait-for-redis.py" = [
  "INP001",
  "T201",
 ]
-per-file-ignores."docker/wait-for-redis.py" = [
+lint.per-file-ignores."docker/wait-for-redis.py" = [
  "INP001",
  "T201",
 ]
-per-file-ignores."src/documents/models.py" = [
+lint.per-file-ignores."src/documents/models.py" = [
  "SIM115",
 ]
-isort.force-single-line = true
+lint.per-file-ignores."src/paperless_tesseract/tests/test_parser.py" = [
+  "RUF001",
+]
+lint.isort.force-single-line = true

 [tool.codespell]
 write-changes = true
 ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober,commitish"
-skip = """\
-  src-ui/src/locale/*,src-ui/pnpm-lock.yaml,src-ui/e2e/*,src/paperless_mail/tests/samples/*,src/paperless/tests/samples\
-  /mail/*,src/documents/tests/samples/*,*.po,*.json\
-  """
+skip = "src-ui/src/locale/*,src-ui/pnpm-lock.yaml,src-ui/e2e/*,src/paperless_mail/tests/samples/*,src/documents/tests/samples/*,*.po,*.json"

-[tool.pyproject-fmt]
-table_format = "long"
+[tool.pytest]
+minversion = "9.0"
+pythonpath = [ "src" ]
+
+strict_config = true
+strict_markers = true
+strict_parametrization_ids = true
+strict_xfail = true
+
+testpaths = [
+  "src/documents/tests/",
+  "src/paperless/tests/",
+  "src/paperless_mail/tests/",
+  "src/paperless_tesseract/tests/",
+  "src/paperless_tika/tests",
+  "src/paperless_text/tests/",
+  "src/paperless_remote/tests/",
+  "src/paperless_ai/tests",
+]
+
+addopts = [
+  "--pythonwarnings=all",
+  "--cov",
+  "--cov-report=html",
+  "--cov-report=xml",
+  "--numprocesses=auto",
+  "--maxprocesses=16",
+  "--dist=loadscope",
+  "--durations=50",
+  "--durations-min=0.5",
+  "--junitxml=junit.xml",
+  "-o",
+  "junit_family=legacy",
+]
+
+norecursedirs = [ "src/locale/", ".venv/", "src-ui/" ]
+
+DJANGO_SETTINGS_MODULE = "paperless.settings"
+
+markers = [
+  "live: Integration tests requiring external services (Gotenberg, Tika, nginx, etc)",
+  "nginx: Tests that make HTTP requests to the local nginx service",
+  "gotenberg: Tests requiring Gotenberg service",
+  "tika: Tests requiring Tika service",
+  "greenmail: Tests requiring Greenmail service",
+  "date_parsing: Tests which cover date parsing from content or filename",
+  "management: Tests which cover management commands/functionality",
+]
+
+[tool.pytest_env]
+PAPERLESS_DISABLE_DBHANDLER = "true"
+PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
+PAPERLESS_CHANNELS_BACKEND = "channels.layers.InMemoryChannelLayer"
+
+[tool.coverage.report]
+exclude_also = [
+  "if settings.AUDIT_LOG_ENABLED:",
+  "if AUDIT_LOG_ENABLED:",
+  "if TYPE_CHECKING:",
+]
+
+[tool.coverage.run]
+source = [
+  "src/",
+]
+omit = [
+  "*/tests/*",
+  "manage.py",
+  "paperless/wsgi.py",
+  "paperless/auth.py",
+]

 [tool.mypy]
 mypy_path = "src"
@@ -276,72 +351,6 @@ python-platform = "linux"
 [tool.django-stubs]
 django_settings_module = "paperless.settings"

-[tool.pytest]
-minversion = "9.0"
-pythonpath = [ "src" ]
-strict_config = true
-strict_markers = true
-strict_parametrization_ids = true
-strict_xfail = true
-testpaths = [
-  "src/documents/tests/",
-  "src/paperless/tests/",
-  "src/paperless_mail/tests/",
-  "src/paperless_ai/tests",
-]
-addopts = [
-  "--pythonwarnings=all",
-  "--cov",
-  "--cov-report=html",
-  "--cov-report=xml",
-  "--numprocesses=auto",
-  "--maxprocesses=16",
-  "--dist=loadscope",
-  "--durations=50",
-  "--durations-min=0.5",
-  "--junitxml=junit.xml",
-  "-o",
-  "junit_family=legacy",
-]
-norecursedirs = [ "src/locale/", ".venv/", "src-ui/" ]
-DJANGO_SETTINGS_MODULE = "paperless.settings"
-markers = [
-  "live: Integration tests requiring external services (Gotenberg, Tika, nginx, etc)",
-  "nginx: Tests that make HTTP requests to the local nginx service",
-  "gotenberg: Tests requiring Gotenberg service",
-  "tika: Tests requiring Tika service",
-  "greenmail: Tests requiring Greenmail service",
-  "date_parsing: Tests which cover date parsing from content or filename",
-  "management: Tests which cover management commands/functionality",
-  "search: Tests for the Tantivy search backend",
-  "api: Tests for REST API endpoints",
-]
-
-[tool.pytest_env]
-PAPERLESS_SECRET_KEY = "test-secret-key-do-not-use-in-production"
-PAPERLESS_DISABLE_DBHANDLER = "true"
-PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
-PAPERLESS_CHANNELS_BACKEND = "channels.layers.InMemoryChannelLayer"
-# I don't think anything hits this, but just in case, basically infinite
-PAPERLESS_TOKEN_THROTTLE_RATE = "1000/min"
-
-[tool.coverage.report]
-exclude_also = [
-  "if settings.AUDIT_LOG_ENABLED:",
-  "if AUDIT_LOG_ENABLED:",
-  "if TYPE_CHECKING:",
-]
-[tool.coverage.run]
-source = [
-  "src/",
-]
-omit = [
-  "*/tests/*",
-  "manage.py",
-  "paperless/wsgi.py",
-  "paperless/auth.py",
-]
-
 [tool.mypy-baseline]
 baseline_path = ".mypy-baseline.txt"
 sort_baseline = true
@@ -0,0 +1,16 @@
+                         9w
+                       {@@N
+                     Q@@@@H
+                  G@@@@@@@\
+               SilN@@@@@@@
+            *Q  *@@@@@@@@S        /= = = = = = = = = = = = = = = = = =\
+          *@   B@@@@@@@@N        ||                                   ||
+ N       R$  A@@@@@@@@@@         ||           PAPERLESS-NGX           ||
+x@@     $U  B@@@@@@@@@R          ||                                   ||
+N@@N^   @  N@@@@@@@@@*            \= = = = = = = = = = = = = = = = = =/
+|@@@u   @ E@@@@@@@@l
+ Q@@@ \ Px@@@@@@P
+  1@@S`  @@@o'
+    z$  ;
+       v
+      /
@@ -0,0 +1,329 @@
+%PDF-1.6
+%âãÏÓ
+3 0 obj
+<</Metadata 7 0 R/OCProperties<</D<</ON[8 0 R 22 0 R]/Order 23 0 R/RBGroups[]>>/OCGs[8 0 R 22 0 R]>>/Pages 4 0 R/Type/Catalog>>
+endobj
+7 0 obj
+<</Length 8109/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="ï»¿" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 7.1-c000 79.a8731b9, 2021/09/09-00:37:38        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/">
+         <xmp:CreateDate>2018-12-29T21:47:38Z</xmp:CreateDate>
+         <xmp:CreatorTool>Chromium</xmp:CreatorTool>
+         <xmp:ModifyDate>2022-02-26T20:11:14-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2022-02-26T20:11:14-08:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>256</xmpGImg:width>
+                  <xmpGImg:height>76</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgATAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYqlnmXzJ&#xA;pHlvR7jV9VmENpAP9k7n7MaD9pm7DBKQAssZSAFl5x+RvnjUfN2r+br+8+BWmtJLaCtVijZZUVB8&#xA;liFT3O+VYp8RLVhnxEvWsub3Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FWG+f/zU8seTLdlvJfrWqMKwaZCw9U1Gxc7iNfdvoByueQRa55BF8t+evzB8&#xA;w+c9T+t6pLxgjJFpYx1EMKn+Ud2PdjufltmJOZlzcOczI7vVP+cVYSbjzJNX4VSzSnuxmP8Axrl2&#xA;n6t2m6voLMlynYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FVk88FvBJPPIsMESl5ZZCFRVUVLMx2AA74q8A/Mv/nIqV2l0ryYeEYqkusuPiPY/V0Ybf67fQB1z&#xA;GyZugcXJn6B4TcXFxczyXFxK808rF5ZZGLuzHclmNSScxnGU8VfTH/OMOlNB5R1LUXFDfXnBPdII&#xA;wAf+CkYZl4Bs5enGz2TL3IdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVYj5X/MGw13zf5i8vRFRJosiJDv8UqgcJ2/55zfD92QjOyQ1xnZIZdk2x8v/np+a1zr2qTe&#xA;XNJmMeh2MhjuHQ0+tTIaMWI6xow+EdD9rwpiZclmhycPNks0OTyPKGh2Kr4YZZ5khhQySysEjjUV&#xA;ZmY0AA8ScVfbnkXy2nlryjpeiinqWkAE5HQzPV5SPnIxzYQjQp2MI0KT3JMnYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXw9oPm/WdE8zx+Y7OWl+szTSg14SCQ1kj&#xA;cd1etD/XNeJEG3XRkQbfUt9+Ytlqv5U6n5q0ZykqWcw9Ov7y3uuPHi3TdGYH3G/fMwzuNhzDkuNh&#xA;8f5guC7FXYq9q/5x5/LaXUNTTzdqUVNPsWP6NRx/e3A29QA/sxdj/N8jmRhhe7kYMdmy+ksynLdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir4a836BP5f8AM2pa&#xA;NOpVrOd40r+1HWsbivZkIYZr5CjTrpRo0y3ytqd6dCuLK3J9DzFYXmn3cP8ANe6dCLi3kUdjJG6R&#xA;e5qcnE7e9nE7e953lTU7FXrv5W/kPquuzQ6r5kiew0RSHS1eqXFyOwpsY4z3Y7n9nryF+PCTuW/H&#xA;hJ3PJ9NWlpbWltFa2sSwW0CiOGGMBURFFAqgdAMywHMAVcVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdiryr86/yjfzbbprOjKq69aJwaI0UXMQ3Ccugdf2SevQ9&#xA;qU5cfFuObRlxcW45vL/ym0y40i+vNc8xwvZaP5Raa5uopk4yPezxCGKDi1DypuPeleuU4xW56NOI&#xA;VueiJ8n/APOP2q+Z7WLXbq6j0XStQLT2tmqNNOsLMSgoxRQCv2TyO29MMcJO6Y4Cd3snk78mvI3l&#xA;Z0uLa0N7qKUIvrykrqw7otAifNVr75fHEA5EcUYs4yxsdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVeRedfy/wBa8z/mjBbyQyxeUJYra81aQlfSnntP&#xA;URUWhrUpIqUNNqnsMolAmXk0TgTLyeuIiIioihUUBVVRQADYAAZe3t4q7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq//2Q==</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+         <pdf:Producer>Skia/PDF m64</pdf:Producer>
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>2409.000000</stDim:w>
+            <stDim:h>909.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+         <xmpMM:InstanceID>uuid:e5f59418-0be8-dd42-a564-bc1f41615750</xmpMM:InstanceID>
+         <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+         <xmpMM:DocumentID>uuid:c2483dfa-3a53-3149-80a7-6822614a9dee</xmpMM:DocumentID>
+         <dc:format>application/pdf</dc:format>
+         <illustrator:CreatorSubTool>Adobe Illustrator</illustrator:CreatorSubTool>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+endstream
+endobj
+4 0 obj
+<</Count 1/Kids[5 0 R]/Type/Pages>>
+endobj
+5 0 obj
+<</ArtBox[152.941 154.947 2262.04 755.845]/BleedBox[0.0 0.0 2409.0 909.0]/Contents 24 0 R/CropBox[0.0 0.0 2409.0 909.0]/LastModified(D:20220226201114-08'00')/MediaBox[0 0 2409 909]/Parent 4 0 R/PieceInfo<</Illustrator 25 0 R>>/Resources<</ExtGState<</GS0 26 0 R>>/Properties<</MC0 22 0 R>>>>/Thumb 27 0 R/TrimBox[0.0 0.0 2409.0 909.0]/Type/Page>>
+endobj
+24 0 obj
+<</Filter/FlateDecode/Length 3540>>stream
+H‰ì—ÍŽ¹„ïýõU"™ü½Z|2Ã?ÀÀ»{Øõûþ"ÉªîI¼;ö° i²ø“ÌŒˆÌüð·�Û‡¿~ÛŸþüq»ý|ÛcK™ÿvýúå_·nÿ¾ÅMÿ~ùñöá/ÿÛ�ÿ¹ýÌ0ð/n}Ô£Æ´ÙÈG¨£l/Ÿnú¢ÿc:jÛnGëeKv¤·=Æ#uÛ,�?/·=v¾o9%—mOý¨ŒòÑjÛvf»ÕsÈâ’Ž1Òõ½¦£Ç¡Í¹¥moáH9?œÝ&¿{Ø¶÷xX�—ak´rýÞÏokç~š½ŽÞïg¯»÷Óòbx€¿olßïÆëm¡ÝWÌ—ï§õË3WLÏíËüpYÜæŸ8‘«»butŒûtM´ÂÄØ^ñn9d+²®6;†ž3ÚÑ
+Æ—vd³k,—q©õûŠÞ�Ò5¶£h>†8ßÕË8Jä’ÐqN«G	Yf–#Ëá5ÏD“sø’ÇÑkòM<»š<š�¡=xÅru¯X~œGh)k†qÈ¹¾Æ�ºûsÝÂ%Íß";
+þ’Ñ=\ŽXÚ†�Ùâý-]&t‡¯�eã±Yn[ÎÀµ·Ë[k¨Mwžß9¾Qw6öÍ`‹ÖªÇßÇ|m-›2çÏÆŠÕˆMÁ»‡wNütûáö÷öÅhíˆ±~“<þ�ìzæ_á„Z¬�Ôô[Ë�,©_¬ãÅžh¸ä��èÊ�ü“ê<ÐOÛ.úsŸé§‹ïô›vío¦Ÿ^öH?=ü‘òÌ3ÿ›¯ò/á<Ÿn\Ü’€Ú‚^áL¹i!“P^ÀF£`�Â]°?Ç|Î˜¯‰wœ‹v|'–8²˜']^|_ÌtƒïÌm\8îÔÝã�ù<»‡'mÈD%–ûŠ*q™uÕ‘vßÕGÑ_3‘4aèöëä}Ó_˜»¨pnülb‘‰	î.H+ÌæiÚÉÄeû�©…r¢öÿ]aDò�¶Ç ¾¼%XêÚHŒrdE…ÕÁ*g§ÌÏ×[„hl_�
+`F,�B|Rä.¹\È¶%Òf†tX–�ÿú,�tÑ-É�ÕÇ	�øk'²	X;
+u�‹à]Ê{#ÔpsD™¬ë‰{!“�Á"Nr
+õ
+T;ïˆÁt#Ž
+ekìiÒdq>Ú8’¼}Ž_n+‡�ø²øwPX´‘†&‚üà˜0ÖHÖ‰…%îÊäQÂ TVÝ¢“¾“qûð@^©¸àå4¡%¸¥Ì¡é]Ië=]3~å^a£ÁÝèçg’ÄJÆB5�ÎÖ0;°¯‘�\É‚).�Y¬qf;ÆckÈŽŸév5^©ø±s�ˆIâàzŽk÷�³ÑpQÇ8Ç±%ËŠÁWx[ -6Çˆz||š‚=¦ŠG^ÇúØ�-J…†,%y›Ðò´kÌß�<Jüš4™ªÂÃ@ËrÐÖü¿óþŠ›y`’·«ÞžÐXåyðnÜ.OÅîâpå	Ž5œX�íš(è¯ˆq2Ø‚ÀSÚÊ&wÉ¥1{¼ZÂQãˆyØž~ßÏ˜Z”ÛU¢e…_B~1µ4¤ã( ·á`ÐÎýØŽátóÒ“7FÈcªkA	Xû3Ž¯çÈ#«d³Æà3@Ièr}�V
+F	“Ôa½9xIéÉëØ¡ZŠaGx°¤9”v`R#þýšÀR³Š‹z„d79LKžùTôt¥+\7†Ò•
+™¢ì VApï®¡àcÄ/Ma}I*9ÂãÏ=\EH¬¼³Éæ ]¶k'©»/z‡ãCÂÀèòm%
+peJ—”Tpž¢ö›•´<)iùº’Bõ ¤ý%ý
+JjßIIíû)i{£¤í;)©ýO%Ío•´þ_Jê”äØìB*–KH‘ão	éP]$™É¨Sù�¨Tˆ)ÔUgRBÜÎ.“I¿_µj¢À—"¿$d'|í>Zò¥Êüœa½÷‚T1ÝËGpe>]¬j.Ì“Œf¥¼ãÓüÏ2þkb]QÁ¾[¡[ìŽ¥1Èdî^®-…jTá.É Žàâ¤‚}  qVÂ®Ñå<ú–¾œÛ9\Ô“©lë¨Ò9dÕ`7Ë×„ô¡))	#b5O‰¨B¬i^Ì+šËtW³ÔÐ„Ü(E*^5|„Àj¾�å}^ÖâÃS¥í¢Ê¿z³dòQi*«Eõ>›�hDƒ/:~Œj.mf>1µN[x»/T_ œéÏðD”]¡ÏþU.Ò'zÕT«	�ªÓ•ú�D,WtaŸv¶kBšžo+¥ç5ì$tóôyNdÏÌî—t5¡ë,ìO®DÖ¼óÌ’8äæLîzÒÌgÖšš²§Áî4xy	ìêw¡fÞKé“VÄÙyrsqè}øÆ®/8ªw*^"H[’JùY+Ám’Èœc¸g³=[3@TË!#aâÍC[’¬B˜½œ÷‰KE–R™?ý¾F¸�:‚fr�	cÂ�ÂOÎ*Ï¼té±ÍÖ¶™·¶
+	©‡ƒd2sôpƒý«7óÚ(†I÷�½Þ8«9¶)) ¦5Ï„8_³ÔBC¢0;Œb,˜‘"ir}ØfŽ~–´IÙˆã7%ý!i_”´ü,iù¤åß«¤…º$M
+_#Q“~¨¥w5%ûwÓ´þžšÖÞ_ÓâïUÓâ¯Ô´þŽ’Ö…SÒ�«'I£‚³Ä e5-I•vOŽß£0ý¦çJA
+%/HÞ“J˜NÙ£fÞÝÐáuN^;¢4•«¯ŽÙOY<‡ÞD9~ð dU¸·žüPþ[Xç™ÙUN�I¹†IÎŸÏ	’éü¨›m•°o'L"RÏ	Ž ·¨N‹Ñ§~N’�¡;n‚ÛÃÅÁôWXBÓ‘¶Æ™÷Ñ‹ªvo±‹ÊøÀ’ïÃ¿ôú„ÉYŒŸ �XÖî#ìÕI²&x™š"EZò>ŸÁ£A˜Y[ÞI59¸$ÕiŸº0uo¸RÖðÇ¾’þ(õI:DÐ{Le�<‘dÇõ¼�Š¼!x”–ÝA=Î�àDg5.¯I®Hy?×ðA.Ò ¸(fŒ©å³‚ªæÚàrJ£·²dCÅL
+L¿²¢†qJgb›I�cWœÝ%d Éd³zªì:ü;ö¶8¶sæÒ¸VÏÃbS¢—Ü°èg‡êÈ?Ý‘],g'&Sò˜©>Î]Fw°$ÝµLßWÊÖK³ûÒgÚ¤ÈX`ÓÁ«ID"‹ÃEJ'‘õÓquô[Ê+¶�PÛIÎ™äB³’%ìkoýä¢ÉÀê�ã¿8Ø<ch¦‹Q}ñîŠ›	
+Í›GáARýÀÛ�Á „–WªEì†ÊT3‹›ˆÓhó”c2uõL_dd÷�½ÍqQ‰A,Zð¤©|žìšyõ¸ôu[Ô-ØÕ”ˆ¹ÍñÃRóŽ”ÏÐèíêlcñØ%2ìÊžå…mó±E÷ºÐôVH3Êžé,g~R�†#¼Z�Ù>OîÅ!:;ÈP„n
+I‘æ&øzszV7¡„Â»¢3¦”ÈXŽªÅY>F=:ûê˜ecô‚¶¬ÔV^Òilc=Þ$�^É$¯K’l•Rjþ’dI€ÇäNÉôòL‰JY˜š¤TYÀÅÝqL�U¥Žaæzê¢HŽ$ôú(D/T›Û¯±	î¿d—=rÛ0F{ŸÂÐ YgRú*â"irÿ"ï-@HŠ{R$±ûí÷ã„6§�©á¯g3[ýÂ~¢»i<�o¯ÀƒÎfû5Ë2�Fç66¢M‘³)t+
+b÷ó¸ÚbJRT8kÝÊÛÚ®éÝb£Ø¦©«vAaÀùuôÞiVË&1Vµé9cD�åJÞ {µ�5pÁÇk’‡Uâ:/~¬fŠàh½¸k6y]gÓó¯™eM†~Â«=<Ç0>ñcíÌµ{4UoÞüýßqz?5[ø§.í²užIà&)�ýTù¹ êTçR¹8µ/oð{í4†aý?ÁÏå8FŒRÏ�ù>0%Ý'ó�2pÿÞJ‚{€3J/nV†›•˜æšr7P?H™öA«ßÝNœº»Pþ¹ª‡Ïîm´€Ž�"Fàr‹�§ÇOØdš«e»ê²†AÂš…¾Öf=*V;J<}ç]Ë˜ä8x3ÊXá¼E®œÔÀÊ:G8û‘hÐñ`×¼©&gT<Õ‘ŸÖV7öÙ…}pËÛµH-Z3?þy~ØÖÆ51¨EjWeœ÷œ�ìY63Ó»YSn£Ö³ä·i3ï¼?Bþ›:[@Å9L7¡u´ÖÝ
+Ìµ^CA†I|T“0Êçk'Çœ&ã*Tü›)þß_Ï³Ës�æÒójoNÙâ„ƒÍá
+ú.¸(‚ç¤ê�åy(Å@™7mÚÌ˜Ê¶PuÚÚªÚœ”P°¶�åJçUÒÙÃgéˆ^À’}æÉ–t9jËjHÉ5t]î!:>H|H>@‰êDë8p€s:¿â‰ÜlSÀ¬Ì
+EŒ÷¨/^6“p=ëR [�B°Ú ëIžf�ŽÝ-Ð‰µ+‡®ªÆ\q²9EÂÊ$NÅ“ƒ:=á
+aÇ¸Çy§Ñ±œÝVö�$8(fóÉ~†/ç{²'<RdN87¸.O9ƒÛºû¶ÅWÜvås˜ÙvÁÖüS ²^ÚxŸÔùóëÇ'ÿþ	0B¸|–
+endstream
+endobj
+27 0 obj
+<</BitsPerComponent 8/ColorSpace 28 0 R/Filter[/ASCII85Decode/FlateDecode]/Height 39/Length 181/Width 105>>stream
+8;Z]!\Ij?G$j8@t/k5dUU3<am*`9`037'CAm[R>[,!)9)1.3+''h?`o>gmB[ET8ck
+@lE>-DRC'5>'BJ23HlQilI&Ga&7If\2VcDkpR`P&Ag+(rGsf,$]V4,Oi!oYPO?6G/
+Ye+**Y]%)+Lu]7C/1+obTM<jR!k7bhp#"6_FO&2i!:ndgO8~>
+endstream
+endobj
+28 0 obj
+[/Indexed/DeviceRGB 255 29 0 R]
+endobj
+29 0 obj
+<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0
+b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup`
+E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn
+6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1
+VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH<
+PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O(
+l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
+endstream
+endobj
+22 0 obj
+<</Intent 30 0 R/Name(Layer 1)/Type/OCG/Usage 31 0 R>>
+endobj
+30 0 obj
+[/View/Design]
+endobj
+31 0 obj
+<</CreatorInfo<</Creator(Adobe Illustrator 26.0)/Subtype/Artwork>>>>
+endobj
+26 0 obj
+<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
+endobj
+25 0 obj
+<</LastModified(D:20220226201114-08'00')/Private 32 0 R>>
+endobj
+32 0 obj
+<</AIMetaData 33 0 R/AIPDFPrivateData1 34 0 R/ContainerVersion 12/CreatorVersion 26/RoundtripStreamType 2/RoundtripVersion 26>>
+endobj
+33 0 obj
+<</Length 1444>>stream
+%!PS-Adobe-3.0 
+%%Creator: Adobe Illustrator(R) 24.0
+%%AI8_CreatorVersion: 26.0.3
+%%For: (Michael Shamoon) ()
+%%Title: (White logo - no background.pdf)
+%%CreationDate: 2/26/22 8:11 PM
+%%Canvassize: 16383
+%%BoundingBox: 152 154 2263 756
+%%HiResBoundingBox: 152.941359391029 154.946950299891 2262.04187549133 755.845102922764
+%%DocumentProcessColors: Cyan Magenta Yellow Black
+%AI5_FileFormat 14.0
+%AI12_BuildNumber: 778
+%AI3_ColorUsage: Color
+%AI7_ImageSettings: 0
+%%RGBProcessColor: 0 0 0 ([Registration])
+%AI3_Cropmarks: 0 0 2409 909
+%AI3_TemplateBox: 1203.5 454.5 1203.5 454.5
+%AI3_TileBox: 826.5 166.5 1560.5 742.5
+%AI3_DocumentPreview: None
+%AI5_ArtSize: 14400 14400
+%AI5_RulerUnits: 6
+%AI24_LargeCanvasScale: 1
+%AI9_ColorModel: 1
+%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
+%AI5_TargetResolution: 800
+%AI5_NumLayers: 1
+%AI17_Begin_Content_if_version_gt:24 4
+%AI10_OpenToVie: -2651 3020 0.25059563884769 0 7787.44597860344 8164.54751330906 2548 1389 18 0 0 6 45 0 0 0 1 1 0 1 1 0 1
+%AI17_Alternate_Content
+%AI9_OpenToView: -2651 3020 0.25059563884769 2548 1389 18 0 0 6 45 0 0 0 1 1 0 1 1 0 1
+%AI17_End_Versioned_Content
+%AI5_OpenViewLayers: 7
+%AI17_Begin_Content_if_version_gt:24 4
+%AI17_Alternate_Content
+%AI17_End_Versioned_Content
+%%PageOrigin:704 -46
+%AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
+%AI9_Flatten: 1
+%AI12_CMSettings: 00.MS
+%%EndComments
+
+endstream
+endobj
+34 0 obj
+<</Length 33953>>stream
+%AI24_ZStandard_Data(µ/ýX<ž¿EZ-�D¤™€æ£Ù¥¶[ã*DÞJï§ënYÉwzOê°@Yþ=
+)œàr�²
+}€h>@>@$F"ôãr�’.)™�HØ
+KË†�j…Ãq
+E`ð è‡YXZª>Tü!ò¹TÕ¸A×À”Ÿ�Qìt€h4îRØdBFs2Ê�š�´lÉµdˆ:-¢Hæd”–
+â€àd”ÙÅ�ŠKÑ™‡c4(Vš¦X‰b'S6 1Å
+“y8p+cÁa3á.±€_&ÔAõ!êl&\âeÑñáÀºPÀêpM´,0O´ˆbÇµ@U»Œˆ:‰•Pm�2ŸƒMK¢€Dv´X$+Q@ƒI±H"H¦”( Š
+£°:Ïš€@ìHE;Ù•Î¤‚‚¡€G*ŠˆŒÃf4À±ŒÒÙŒv¤‚À*�X—N«³Ù„É,¤€¸¤¤Èô¡ð0!i™],
+±A"˜ˆ"+2‰b'ƒÒpâ`"KDÂŽ
+H*2‰@bƒ´A—ÖÀ à>)¹É®D‚Ë¢d¦€x!Ù)“`Ñp°/&‘¥³	±T›uY”•fEÔµHÊñhiùÀRAl²ËDÔÙp@#j@!âUÂ5€…¥eD‰AK†¨³É®—¡(„t6ê°‰ø‰0Àˆ:„�ÎFÃ@s"Rél"²%Z%„¨\2xT2 )‰�]«ÑÃ†Ae�±z„�‡
+c“ñ’‘Àép° m…“]‚Bl�F*‹„,¢ÓÙhˆX$š] ¢Ø!e'£ÌðÅÎAFgb© ²kJÃ‰“e>‘¤•AFg£±±9HP�}è0eVˆ
+ê%ÔÙì«XVo (|6Ù•¡©i†ìZHX Ð0aàTÁHDà"Dãj!mZÑ*::T¡Ü–Ð+¤·-»F^žÁÛha°qzò²d D+ =‚L```Š
+¢Vv��,NÁã˜B !ÂÈVÜ£Ä°É.…Œ†ƒØ24 +bÀƒ ”†‡ÀB@J;ÛöÒÀÉƒ´à@<˜ ³É.æhN®8¼³ÙPp >Ÿ’ƒø8" Ž��(ä:BŸƒç!SL§a£NüQ:%hÄ‡à‚“]Áj=™‰Xx(¾¤œ»Iˆ“+Íã¨ìCàÀ”…�ÆFBc<ˆ88 ¬xD'Ü'%³Ë�¥Ñ±9Cf¡¡!"G¾ )XŒGv"»4O„Âˆ„Æ ‚%UÊ@:½™3ht6YI'ÄÒ’]ûÁ2Ze´
+|IvÒ°�]J6`úHqL x,hJ`8m<¢ËA
+ËCÀÈ`G(¥†”ŠuHm*J"ë)!Àì:Ù@X8² ‘ñ +©YXZv˜(|ïµÙgc€!x ‚®d×Kv2Ê•�ÕYP•xŒü™�´ì8ÑTÙ5‚NcÁb¡€³0*Í³m™B!m[F@vQ|
+øä¢W	+®@¡o`Ä°i}$GsÓñ`mÙ•€ ¡!«!@ÁlZ
+*Ö¶5˜²ÃdB
+\
+˜¼lÙ•ÀÑœô, œdÅÈ(Ó9XR…ˆf5Œbò&/›Ë‚�)#H0Ù5 p'ZNé‚Ùpd[JAÂ$³‹aÄhY¸P@±HŽ„LR »$X0HHH4JL": 
+‡‰Ñ™|¼�‰ÕGƒ€‡�GÆV)"€r¢±Â¡’:øÈhD\h#Š�	G*È®d�‚86.¶.ÙI,T2±<Á#‰¨ÈÕ«´Ñ+»Tá+R€Hˆe$b¤¡/F�Åq…‡‚Vv…|F;ð¤hàã$A”¤�þX¤X2‚Çâ¸	I(³c[6
+^%4p‘1”!!-Ò 4+ž]Ò9`%T¬€tÉg°6¬MƒpÀ‘Âydq\v]t(”pTLn² Ù@ù ÙH²%úŽÁƒƒŒNÁÉ¦jS´<ã"¨áhNNlidó`1l[vYtÅÄA…Š@”'ŒlaÈ.
+ˆŽPŽ„tLa€O€C†rd£%SàN^¶ìZ©
+XX<Yì‘€¬-»V�´ñP>-’ídca
+=’-»VÞFCJ
+L‰°°-²AV†£9iÒ�l ,†mcU œ„¼¬Z°–ÕÙe€u6/°‚] �l+o£á‚¥‚xNž@½m¬Š
+'V%mÙ?Œôäƒ¢-�Î€ÍSÒE,<¤•H7Tüa†¢a“]ïbƒ´ Yu"P<Z `;(‘w6+Pˆ�É£ÀqU ’…ì
+e‹óÀñ=X´\„pJ,`”ÞÈcñbqñ‚qØ¶�f2ÊÎ	†CŸ&"RrB"ãaBÂ…å�AQ´¬€0çUœ�Œ‡÷¼@Œô‚]IE,X$›]¬Žòè(Áð`FD)Ÿ-$5a�&wAC@c|2NFÙ2á��BiãJpx xŽ½8� °²qe>òŒ<$r‰@AùKh™)€±á
+©Y2Eàqp2NNüÐâ!Ò%Œdp"-=¼Ä-Ä�ª€Y�]šÆSïAPÒæ„@%Aòá0hÑ@8¨+ P´È Y Ââ<lh"D'qä,Žcygã0q2J�SJÅ3á™Ë‚Ê&#Y)œˆø`¸ðd×‘’XŒŠ‡��ÅËzH+›–Âce2;!™"5lŒXD1Ñêp`
+^ÐÐk±á$·V6‹
+'9(›?ñÎ&»0Í¤*i ‡[À®V´U	CêTaJ‘°VJ;™H›èÓ
+�22ÃiEúDè§”S+¥™$L)ÕGâÓ"¡¨¶’'UR'Õ©EÚh¥T¡–ÆByáxyj±4ÐžP¬T)%‘Á²©ÐÚ<-ª-ô°l$‹MkUJeÑZ‹j[)©R*‹H›hÒ&z¤
+M©N›
+õRO›
+…:‘R(-/+Z‹´i)Mtú¨P<š
+©E"hÒ&ÚÕP§ŽçKÊ¨XH[Çê´•XÈ¥ J±¤^0Ö)E…i¬EJ�R‹„”^XXé„ZHXëE5	…‘N˜V"¡V˜ª…™4-…½¨ØTXÂ	K�H**©SëdÒ°”
+K‘P+ìE5€Æby`.ÊH‘0	ÓP§,EÂTR'H,,¥ca˜¶ÒÂ´�„i,m¥#9À°”
+3i,„Jh*¤“(£UÂíô�¢
+h±H!ˆM…Ê–ÓÖ±qªØH¦©Åae¬Jx´µy>ÊbÙH*ÚF‡I”¡*áùd<EU@ÓP%Hc½h(”ª”:m(Í¤j1VÕb¡Z¬Õ
+Õbm«•Ém+ÕßÂ{Qß'Bƒm°2´”ZJºÒR¹•:¹–Ò¾˜X+•[ ´R¥R$Ò©•"¹U´Öi«–[ ”zIq¬Í´ Z±6ŠªÀê„*¹UZZ'É™¶’6ÕÊê„Jq¦•ÒN,%
+Åm¨ÒŠÊ¦r¦”R9±4“CQ@QµR§MK�P)šÉ±´¨¬ËÖ©…¢*pJ ÅÚT)©“¦BZ¥IÓP(	Å±´¨¤T‹¥m«U‰¤¢¥kEZµ¨JŠr¬Õ¦™H+,ÇZÀm«
+…”Ò@�Z¹"¡6MUª´"€ÓP¤jUb9ÓVêèªVŠ†‚ê4RËÉm«Õú«ZT)Û
+erT
+J@C9ÖŠQ^X®•JÙ\JŠÊm«Õ¦	pÚ@Ø(˜IK�R4Pf#¥N(º±[À±V,––j‘P)-�åX«MÅ ZqÛjUÚK‹Êªµi¤T%·
+ÀŠ”2�FPph)›–�ÒpÊÀ°\	OéÂT))	Õ–"¡PV'–JcmšÚ–A¡H(”ª¤’"mš
+iåPT8œK•:aª_jGr`¨Jx°U	Ï
+µ:¡>Ê"�PìÔJyÆ‘�q82"0Õo±H-Õ3i¦MUÒ68h¬–Æby4
+©µ©Vˆà´J'PcP�T´
+€†Zµ¨JØê„*¡H(˜
+[j+uÚV›&€jµÂÒ,°(áÑÖËªõ‚ÁX+D‚µ¼œLš�k;…¾þ¯Tñµ©Åqb�>R´ŠÝÛÇ×¨s×ý‘R•4Žh¦”
+¥}ž2Äà§¦»å†*©Ó
+ë”"}hœZ$”¶‘®€åJ•�i*¤•©m-ê%$áaÉŒR*œ6ÕÈ7E«à@¡´w¤hºoS´ŠÕ…Ò>ÚÒX))¤–;í†˜»�
+K)R‹u©¤NÐN°SZ+îº™.¡o´R´ŠÖ)åÑJÑ*Fè%Ò
+#]%åÑJ¤PkEå´á˜ŠzCl**db:m¢¿Ì¢ÚZ,mSÙ´‹´�©Z/LÂÃÂ"µ¨V¬
+¥*µ;LB‘L&Òê13�6l€RJÛH+VŠ´µ°(áQÁZ/*–’*Å²p{�tB‘°S+EzÚ
+€ÖÂ´Ô	ÕzQa›–‚%JJuj‘P/-'¶i+Ò
+‹
+ÓZ$”ŠuÂrÃÛT(U‰„Eg÷'€“„§uB�PHh˜&À¦±´-S•ðxHÚæY©¶RX¢EÕj©P2õ©gª‹©»Ò2�€ðÃÝ·®0B—ùZ+*'me€´Òö¢âÐJ'” …¥¥T)“ÆRR¡ô„¢ql$X`m$X`-C‹ªÅz)™°R™ª%¤	¤¡V-$Ö‚,õ‚rÚZ-RJÛL¨ÓJ‰�ÕÒ84
+é´‘PR‹d"µ´–Õø‚"	�ÒLª”‚fR¥P-0d4“ê¢Â„ÃÀ`ÒZ%
+¥q°$2J¥‚Ixxp0
+J¢h)Ú“L/ª‚F¦Vh…«€!JLQ˜Ùðdd0eÙH�P+Ö	”ÁZ)	Îó?a|3b©µ�.2˜Jê´µ84“ªtJyp0�b¦�¤BimžŒIv%`šM©NK•‘ÁL²kCÕ�Ò6Z©“*EÒ68X@Ú6Ï)¥:µJ§Œc’]¤	M©“ÞÞëT‘q•2®K (Z«¥¡H¦T–¢�8ØÅÀ¹L ˜bzm€`y™°$!€Y`©0Å
+`‰M`y
+‚ååÁÓÇêõ½5£K,>�Ð·ß‹�
+»ŸëoG�ÿ\bþbÇþ×ºû]^X^$½0°ÔP«–çJÀ´ÒÓ�´P/¤
+D s-`)¨Rœ‹¥¡hq´6OÌLÅ2W1Í\šÌeJE8LÃY)½¨:0ŽfÓL¶i*¤ÉSPpL£H+˜)õ¢Zµ¨>ZëôÂ�mš)uJYi‘2@ZZŠ„Êh¥N¤Š�”"¡4N,SJCA`+,”SÅJ©EÇ¦j�L˜§VI[±6tZY‘6•
+Eú´6Okó¬´H)ŒTJ¥ê@©TØ
+ëeƒÀ6Õ"•´k
+U:µ6RFë„R¡´À±R¡4R-›*Ee0
+¦m$TH³:‘\Ó¨¤N%ÒÖ�e0M«¤@ÁÀLšN›ªUÒ>2—*%%±zQm¢ÔIå•a/.•Ô©•:m)Õ…Éê¥¥q¨¨Pª-#Ë.V+¥µ´¨>¦TD–].Óâc²)Õ"¡BÛ
+]ßÇ¸17ª&tÛ7�6‘É·Öù©“ÊiÃÐTHÙ@;}¸I31¥" µH©Mk¡<&¯ÞØƒŠEÈŠÁöÅ^ÆdVÿv×O!ÖÍùàGïvÿ±Äâû†�ŸGO_—Xn2¦þV[ÐNªŽ”¶Â0I•ðdWc½-LRN&”ÖJ©>&©“ŠaòÊÚ´H-/°õ‚R±´�–¦²‘:”„
+µ6�‰£4“Ê"Jx²K±
+E*qh*©Â¤WÂ“][`µN)�MC½ldvs´6�–R]`ÐNhÛ�¹ËçO1wo!êä®½1wœ«µH¨U‹Ö3b1{Y,©e¥Ú4$)Õé¤¢mÈ$¶!ÚÈ²+±–JêÔjiš
+©EÂä%<Ù…-h*$–‡	Kx²þc›†ÒòraB�^ LV%<ŠµH-›*¤¡N!—ðdK‰„‚À B¡´ŒÔJi*$,Eàƒ-°6Jõa±´’jËh¥´–—’
+”eW¿ß�›ê
+�ûcÌÛj§Û·‹i„1nz|]»bqS#GgíèXÚÆi”e×óÇøíbíŠ+¶„JêdJ½¨ ²ìbÈO±M'‹$@ŠôÉ²Ë"S]€Ø.ç-g±E¥T'MŠiåL©Õ¦ÂR"¡`ª¦€©TT(Lk�Vd°
+Õ:udÙ¥É`š”JÕBZáÀPi¥t²È`›*”e»to±…”êÄÚ´(áÉ²+]/¦ÙÈlªik±^P(	[ØT-’¶}²ìÂÒ±‚†¢2y820YÙ•±¡4"2*’…QDJVd ¤<ž“Š&#%dìiPYp4^ÖÃÒá”a�l8³À)ÉdDØøD€€~(Zf—·´à‡ED(¤�Ð'äã$¤Ñ$ÞÙ´Š…+‰w6™!�M’xg“v$Þ1(øH†‡MLˆÈ8PûD¼'³«€t²,R²'+’""%ïl^CÄöK±áÞÙ¨èïl4$(�MàðÎ†óÑí€Ò;€¶;¸$„“Ù¥ÞÙd†I$âTðÂáQ�"$" £å
+B#ÍBdŒ¨"¥”áÉ.‡‚Ø`xpÐl‡w6
+°™Œ’=4JªÞÙ@	‡’r4¼³Ñ…’f„EÂÂ”4¼³qå�ÂHó¡`¤ÎÔ*"Í®„”Œ‚„HU>+…ö%	Ù¥PÚTlH¨¡X9HÐä„|#±+‰’¼gôÀ9'
+\êÄ$eQÒÀÉƒgÙ(
+æ�<# (Q'U!ÂPÂ"2XbˆÁÄâ<˜>/»@6D$ŸˆD‰€^>ÙëŒ "LšÝ8h8y6T²÷Ð9Ü†*P6º-¨,8Ùo”ôeÃâäIÈtlx41a€é=-*%Œñ¶Á�NŽ�’›Ãˆ[�Š*°<h<¨´ÓÊ  2$<n
+Võp¡"ºàh\<$ Ëê!»T¤¤KËƒ{HyOL�¨4m©L)†+ã`¯¼:ð`<+AQUÃJÅé§B”(,’U‰8©z‰Ð¯XV[œ`8ôæAä*Dª¹È®‰K,àT	˜qT”Â;…ME‚0•Dhf¡ãB@ 6ÓMJ8'ä"Qì¸�sRa”ÐàœÜP-'�…¥eÆ„¤%)b€§{Ta…E²FÊ"CpÂ10m0x˜3.=ïl|#šÈg™0„æƒñ˜Yœ„,>ž¡£A}´<»º@‹“.
+[2)©ÅÉÌƒŠ4KZ%�–�{-,™‹ÅÉš0¦dQØÄ‚¢%,I€„…“
+,mb
+'U+;[‚ÂI%€ÂI�DŠ&Ç…Ô¤”f·CAB8i’uh¡ìÁ¨'4ŸT<8©ád‹ÛœŒ’@Ag³éðÎ†Y8,8L ƒƒà‘ÁÉF'7Œ’ÂŠe5Di8q ´‘EepÒdÀ
+Ov=dpòãáÀº!âäKÉjF@ !ÁÀ”NBTò•4”(†G…¡€9…OgÓ�]ú‘pNkÁ#¥+2—ƒ�V@K’–—É‚NvTTtÅ¡Ê01	mº"%FÞÁ±HÀT¬\0 &“L#È`bf!%]:Õ‹J+…Â‚²¸h("((+#¬% x	ÙBDR!šKÈJ�ˆ2‚bÒÙ¬j$¤b1Ê–��-#¤£ÊxaÉ XÉè¸|
+XZ†HÉ†’Qb’ÑÙ”Œ”„d¤>20(ÑJvµ´Šhd$„d’]ªÌÈÈ‚`5ó²/B ¶Ž
+â ¢ð…ÒË–]"*[âJL"�. ðFa@Ãà¤¾,Æ³*Ã;ÉˆBqá�b ˆ˜ØÚõIGND\&·L‹“.	�Mr\g$B7£„ÎF¡3¡{‘ÐÙhš“#ƒÑ‹†€ˆ\y
+b€!`y°V\Âˆ‡ƒ€Í¦ºèŒãZà4lÛGÛlÖ…ÄÉ�„Î®ìZølMv1H 0ô¶aLBÙURÀ£Ã3‚°á°ðÙ4
+±‚�†æôÉ¸�8ùH(OÅbò<{@â„f;(Ð( ²+¡À‰‡´¼Æ‹Â¦¢-%“õ°D2ž àppD Øxéð‡–ìÊ®ìú`áäÁ	&“°mÌÄ"cb�¦ÃGh0Yò‘€Y¸ Á„œ+m0,�
+¦â€£€áˆQÀ,‚sÚ„+m0ÙõàJL¹Ð`^‹„"¤íJëXx>X¬;„P6ª
+•lptEB�”G’’ñ°�d(2sàò±Ê®ìÊ®ì:€xÈ®UÈÆÁÇÃ	Ç%õÀqBŠÈ®ìÊ.6™À”
+C*`46V.	˜Ì.J�ò\ P%!ÕTKå
+WtÕ€²Q‰–Gçmxt�)è‹	b?
+ŸìÚh˜ �ñÛ–]Ù•±à°m ‚�Î(»v@vµxFíZÙ•]$�è`¡%ÂÀB;<Rë@ E?% Íãá�Îv‘’Xˆ‚L³R‰H³‹€³4ˆD PÃ‡D•±Þ�FR,ŸÏŠcðÒÙD�L†"»NZÄÂÃFÅ�I¨eBÔ1è08lbvm°L0<(IË$4@€s �]+
+*¤Z›]ÙuÁ:� 
+±N- Çãò §ŒQÄHÉ§Ã“]& /Œ¸D,<|HTYv‰öck‘ÐQyaL�|²Ë´QC'ˆ¡‚ÖÆyÀÈ ½€
+JPPŽ�B²E0¬:R.NÞÈ3`…ôJU‚gÂ7 Ð…FÉó�«ÏEÄ€ˆMñ¡"<n	¼Œˆ³Kãå`E%0‹édjeÁa±TW,#šÅ`É‘Sf9&!NF ˜xt2–
+fåm4¬¼�†ÍÊ€I$Â�H#—_Á¼pxX¶¨1d×6à£Ã³"rÚD°'ÃÑqÄ¤tBŠ@}x�`e�ÒØ4dhiÂlÙFª�ƒ�‡Í tú<¸„F"T²iÈpÀ(�6eá”TCÊg;Ùp “•†“ÒfWsŒDè–ÊV8..ä àa óÂá™x$@™žì:q…H20 R ‘†
+t@‚am°4R@
+êðdW…Á(Á$´‚ñN"0-“�DÅÇƒöÁJ÷ hÊâ`X:L*@L‚ó	mæÂ•6šŒÈ3a2IÀ„µÁ<dD6˜‹Žf7@	#šÅ¨Ú€'N#�÷ŒN¢€ƒÉf×æ	
+…‘/�@	AÃ;Þpivé…w6Ri(5€‚(±	'5'=#Õ \xgƒ¡¢! Ÿ„(»”Â;
+Ï¬è˜<,'ŸÑÇw6
+õHPŠMC‡DóNn2JSfÕ¡¸øpà‰†Þ,$œ\äÄIpŸ”$Á<ì�*¤³ÙŒ6.)š‘w6€v0j™xgã2-Nf:CË-Ä;ÒŠ!¤�Óá IÀŒ^6˜‰Ž&#r¡¡@0iÉÁ�
+qvq¼†�„çá=.4»‘
+@‹:©XpX ½ 8¡(çäY-NF–R„Av2àŒ†¨³qïl„ÂÓ :XY
+5jy›ˆe•'³k31¡ÎãAPGp2J�–€Š5ÐÅÎA�ƒ”Ê‚�¤ ò:xâ�Í(äáÀ(.â�
+´ØˆP«8xˆ@,Ê’X>$Íx AU4@RçÁÂITv2JWAá¤„€’
+1eV�‹@,GÃÁ*|�44¡	'£t(œÌ®g`JRBÊ	wxg³a*N %M	ˆ�Ëê)O‡gEñ+ŸÏg¡Áã¥g#„“$€(ŒÐ[ù¤hJ4È‚Fƒ~t#ÂI�+Ðl�Ku80H'Y&É*
+‹ds#ƒ“®"ƒ“/
+œLp‚n>±E%ÁÉ(×CÄÉìjµÄÞ¸ACÄIN…ˆ“›GÃÁ–(„D%›‘†àd”šQveÅCÉ‰u*6áAÀBI„",,d2¦Ì.’Lw8©Òé±úpà‘(<#��ˆ
+Ç9÷Iyg“0 )#ïlXXZfä#çœŒ’5â‚“Q&˜€@lH[áxHÃÁRÐ˜„FZ
+H*!1Ê„^²Ð¦dÀ
+«BÕâ�,ºÒ3¢‘RÀtP'
+¦Ä€£€É`�†�¥³ÁL�2�	 /!RE‚Zˆ�°<œ4¤¼ÇåKëa@,™]--ÒÒá!Å‚£áðPR‘Š¦ä†1@RÉiÃ(H„X¡ÍH„0¨x…ˆmt°âÏÂ vƒÇÉA�;yÙ@©Ì”-.�ŒÅ&n>J"šìbX)ÈlCq1sñR›K�Ç
+G+J;¨àH±dÕGÁÂ+	àl„<˜
+ˆÍJ©ÁÓªð„D@-VCO*TCÃ@³ÙµzH±à€hØ0Ë„?`H¤
+G°^¸R¡ –”*Ã;“V�YGGÈƒIY¼`€@
+ `Ä–ÈJ(‚Ì'd,+"ŽŒÅ2@2ŒŠÉÇCJ¼aŒL'…ƒÖn[k£9™�&/ÛGJ_6ÕkãDlÛ¦‘±8Éì:á“lñ†I¦€””$Æ
+Ij<D2ó¡0 _J>ÕÊ�LYayäÇI¢##[päŠ†ÂH•”–Š4¹�¨H…¨!ÊŠ“*”
+ŠP.(ˆHN�ˆˆT±œ:6Ù²Á `]:O�‡Y•`<z€1ØŒd˜�”Ñ±áÕ3! Åy8mt:N8*<!ëA°øð�£°àdB>T³k´y,<ŒÄò°±%OJ&ºx'UîÄ"[5t^V^V<D8¼÷IQpŸ”ä|4¸ÌB
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;}
+</style>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st0" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;}
+</style>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st0" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#17541F;}
+</style>
+<rect class="st0" width="3212.8" height="1212.8"/>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st1" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#17541F;}
+</style>
+<path class="st0" d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path class="st0" d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path class="st0" d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path class="st0" d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7
+	c-8.4-2.1-15.7-3.1-22-3.1c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path class="st0" d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path class="st0" d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path class="st0" d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path class="st0" d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path class="st0" d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path class="st0" d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path class="st0" d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2
+		c-4.2-5.4-6.6-11.9-7.1-19.6h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9
+		v-24.7c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3
+		c-4-7.3-6-15.5-6-24.6s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8
+		h19.4v107.8C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16
+		c-2.6-4.8-6.1-8.5-10.5-11.1c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4
+		c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1
+		C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path class="st0" d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35
+		L2968.8,996.6z"/>
+</g>
+<path class="st0" d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st1" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="900"
+   height="900"
+   id="svg3923"
+   sodipodi:docname="square.svg"
+   inkscape:export-filename="/tmp/test.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata3929">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3927" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2096"
+     id="namedview3925"
+     showgrid="false"
+     inkscape:zoom="1.1360927"
+     inkscape:cx="635.07139"
+     inkscape:cy="606.383"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3921" />
+  <g
+     transform="matrix(10.638298,0,0,10.638298,106.38298,-206.38301)"
+     id="g3921">
+    <defs
+       id="SvgjsDefs1018" />
+    <g
+       id="SvgjsG1019"
+       featureKey="root"
+       style="fill:#ffffff" />
+    <g
+       id="SvgjsG1020"
+       featureKey="symbol1"
+       transform="matrix(0.10341565,0,0,0.10341565,-11.43874,18.048418)"
+       inkscape:export-filename="/tmp/test.png"
+       inkscape:export-xdpi="116.02285"
+       inkscape:export-ydpi="116.02285"
+       style="fill:#17541f">
+      <defs
+         id="defs3911" />
+      <g
+         id="g3915">
+        <path
+           d="M 231,798 C 227,779 219,741 218,741 49,640 69,465 125,365 c 12,126 235,213 105,367 -1,2 6,26 12,48 26,-44 65,-97 63,-102 C 145,288 645,258 749,16 c 47,234 -24,596 -426,688 -2,1 -73,126 -76,127 0,-2 -30,-1 -26,-11 2,-6 6,-14 10,-22 z M 330,625 C 267,476 452,312 544,271 356,439 324,564 330,625 Z m -104,79 c 51,-59 -9,-160 -45,-193 61,105 57,166 45,193 z"
+           style="fill:#17541f"
+           id="path3913"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
@@ -23,7 +23,7 @@ ExecStart=/bin/sh -c '\
  [ -n "$PAPERLESS_WEBSERVER_WORKERS" ] && export GRANIAN_WORKERS=$PAPERLESS_WEBSERVER_WORKERS; \
  # URL path prefix: only set if PAPERLESS_FORCE_SCRIPT_NAME exists \
  [ -n "$PAPERLESS_FORCE_SCRIPT_NAME" ] && export GRANIAN_URL_PATH_PREFIX=$PAPERLESS_FORCE_SCRIPT_NAME; \
-  exec granian --interface asginl --ws --loop uvloop "paperless.asgi:application"'
+  exec granian --interface asginl --ws "paperless.asgi:application"'

 [Install]
 WantedBy=multi-user.target
@@ -468,7 +468,7 @@
        "time": 0.951,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__in=9",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__in=9",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
@@ -534,7 +534,7 @@
        "time": 0.653,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=10&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=9",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=9",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
@@ -883,7 +883,7 @@
        "time": 0.93,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=4",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=4",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
@@ -961,7 +961,7 @@
        "time": -1,
        "request": {
          "method": "GET",
-          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true&tags__id__all=4",
+          "url": "http://localhost:8000/api/documents/?page=1&page_size=50&ordering=-created&truncate_content=true&tags__id__all=4",
          "httpVersion": "HTTP/1.1",
          "cookies": [],
          "headers": [
@@ -16,7 +16,7 @@ test('basic filtering', async ({ page }) => {
  await expect(page).toHaveURL(/tags__id__all=9/)
  await expect(page.locator('pngx-document-list')).toHaveText(/8 documents/)
  await page.getByRole('button', { name: 'Document type' }).click()
-  await page.getByRole('menuitem', { name: /^Invoice Test/ }).click()
+  await page.getByRole('menuitem', { name: 'Invoice Test 3' }).click()
  await expect(page).toHaveURL(/document_type__id__in=1/)
  await expect(page.locator('pngx-document-list')).toHaveText(/3 documents/)
  await page.getByRole('button', { name: 'Reset filters' }).first().click()
@@ -49,11 +49,11 @@ test('text filtering', async ({ page }) => {
  await page.getByRole('main').getByRole('combobox').click()
  await page.getByRole('main').getByRole('combobox').fill('test')
  await expect(page.locator('pngx-document-list')).toHaveText(/32 documents/)
-  await expect(page).toHaveURL(/text=test/)
+  await expect(page).toHaveURL(/title_content=test/)
  await page.getByRole('button', { name: 'Title & content' }).click()
  await page.getByRole('button', { name: 'Title', exact: true }).click()
  await expect(page.locator('pngx-document-list')).toHaveText(/9 documents/)
-  await expect(page).toHaveURL(/title_search=test/)
+  await expect(page).toHaveURL(/title__icontains=test/)
  await page.getByRole('button', { name: 'Title', exact: true }).click()
  await page.getByRole('button', { name: 'Advanced search' }).click()
  await expect(page).toHaveURL(/query=test/)
@@ -1,6 +1,6 @@
 {
  "name": "paperless-ngx-ui",
-  "version": "2.20.15",
+  "version": "2.20.11",
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "ng": "ng",
@@ -11,17 +11,17 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/cdk": "^21.2.4",
-    "@angular/common": "~21.2.6",
-    "@angular/compiler": "~21.2.6",
-    "@angular/core": "~21.2.6",
-    "@angular/forms": "~21.2.6",
-    "@angular/localize": "~21.2.6",
-    "@angular/platform-browser": "~21.2.6",
-    "@angular/platform-browser-dynamic": "~21.2.6",
-    "@angular/router": "~21.2.6",
+    "@angular/cdk": "^21.2.2",
+    "@angular/common": "~21.2.4",
+    "@angular/compiler": "~21.2.4",
+    "@angular/core": "~21.2.4",
+    "@angular/forms": "~21.2.4",
+    "@angular/localize": "~21.2.4",
+    "@angular/platform-browser": "~21.2.4",
+    "@angular/platform-browser-dynamic": "~21.2.4",
+    "@angular/router": "~21.2.4",
    "@ng-bootstrap/ng-bootstrap": "^20.0.0",
-    "@ng-select/ng-select": "^21.7.0",
+    "@ng-select/ng-select": "^21.4.1",
    "@ngneat/dirty-check-forms": "^3.0.3",
    "@popperjs/core": "^2.11.8",
    "bootstrap": "^5.3.8",
@@ -29,41 +29,41 @@
    "mime-names": "^1.0.0",
    "ngx-bootstrap-icons": "^1.9.3",
    "ngx-color": "^10.1.0",
-    "ngx-cookie-service": "^21.3.1",
+    "ngx-cookie-service": "^21.1.0",
    "ngx-device-detector": "^11.0.0",
    "ngx-ui-tour-ng-bootstrap": "^18.0.0",
-    "pdfjs-dist": "^5.6.205",
+    "pdfjs-dist": "^5.4.624",
    "rxjs": "^7.8.2",
    "tslib": "^2.8.1",
    "utif": "^3.1.0",
-    "uuid": "^14.0.0",
+    "uuid": "^13.0.0",
    "zone.js": "^0.16.1"
  },
  "devDependencies": {
    "@angular-builders/custom-webpack": "^21.0.3",
    "@angular-builders/jest": "^21.0.3",
-    "@angular-devkit/core": "^21.2.6",
-    "@angular-devkit/schematics": "^21.2.6",
-    "@angular-eslint/builder": "21.3.1",
-    "@angular-eslint/eslint-plugin": "21.3.1",
-    "@angular-eslint/eslint-plugin-template": "21.3.1",
-    "@angular-eslint/schematics": "21.3.1",
-    "@angular-eslint/template-parser": "21.3.1",
-    "@angular/build": "^21.2.6",
-    "@angular/cli": "~21.2.6",
-    "@angular/compiler-cli": "~21.2.6",
+    "@angular-devkit/core": "^21.2.2",
+    "@angular-devkit/schematics": "^21.2.2",
+    "@angular-eslint/builder": "21.3.0",
+    "@angular-eslint/eslint-plugin": "21.3.0",
+    "@angular-eslint/eslint-plugin-template": "21.3.0",
+    "@angular-eslint/schematics": "21.3.0",
+    "@angular-eslint/template-parser": "21.3.0",
+    "@angular/build": "^21.2.2",
+    "@angular/cli": "~21.2.2",
+    "@angular/compiler-cli": "~21.2.4",
    "@codecov/webpack-plugin": "^1.9.1",
-    "@playwright/test": "^1.59.0",
+    "@playwright/test": "^1.58.2",
    "@types/jest": "^30.0.0",
-    "@types/node": "^25.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.58.0",
-    "@typescript-eslint/parser": "^8.58.0",
-    "@typescript-eslint/utils": "^8.58.0",
-    "eslint": "^10.1.0",
-    "jest": "30.3.0",
-    "jest-environment-jsdom": "^30.3.0",
+    "@types/node": "^25.3.3",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
+    "@typescript-eslint/utils": "^8.54.0",
+    "eslint": "^10.0.2",
+    "jest": "30.2.0",
+    "jest-environment-jsdom": "^30.2.0",
    "jest-junit": "^16.0.0",
-    "jest-preset-angular": "^16.1.2",
+    "jest-preset-angular": "^16.1.1",
    "jest-websocket-mock": "^2.5.0",
    "prettier-plugin-organize-imports": "^4.3.0",
    "ts-node": "~10.9.1",
@@ -219,7 +219,7 @@ export class AppComponent implements OnInit, OnDestroy {
      },
      {
        anchorId: 'tour.file-tasks',
-        content: $localize`Tasks helps you track background work, what needs attention, and what recently completed.`,
+        content: $localize`File Tasks shows you documents that have been consumed, are waiting to be, or may have failed during the process.`,
        route: '/tasks',
        backdropConfig: {
          offset: 0,
@@ -7,7 +7,7 @@
  <button class="btn btn-sm btn-outline-primary" (click)="tourService.start()">
    <i-bs class="me-2" name="airplane"></i-bs><ng-container i18n>Start tour</ng-container>
  </button>
-  @if (canViewSystemStatus) {
+  @if (permissionsService.isAdmin()) {
    <button class="btn btn-sm btn-outline-primary position-relative ms-md-5 me-1" (click)="showSystemStatus()"
      [disabled]="!systemStatus">
      @if (!systemStatus) {
@@ -26,8 +26,6 @@
      }
      <ng-container i18n>System Status</ng-container>
    </button>
-  }
-  @if (permissionsService.isAdmin()) {
    <a class="btn btn-sm btn-primary" href="admin/" target="_blank">
      <ng-container i18n>Open Django Admin</ng-container>
      <i-bs class="ms-2" name="arrow-up-right"></i-bs>
@@ -29,11 +29,7 @@ import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
-import {
-  PermissionAction,
-  PermissionType,
-  PermissionsService,
-} from 'src/app/services/permissions.service'
+import { PermissionsService } from 'src/app/services/permissions.service'
 import { GroupService } from 'src/app/services/rest/group.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { UserService } from 'src/app/services/rest/user.service'
@@ -332,13 +328,7 @@ describe('SettingsComponent', () => {

  it('should load system status on initialize, show errors if needed', () => {
    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
-    jest
-      .spyOn(permissionsService, 'currentUserCan')
-      .mockImplementation(
-        (action, type) =>
-          action === PermissionAction.View &&
-          type === PermissionType.SystemMonitoring
-      )
+    jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
    completeSetup()
    expect(component['systemStatus']).toEqual(status) // private
    expect(component.systemStatusHasErrors).toBeTruthy()
@@ -354,13 +344,7 @@ describe('SettingsComponent', () => {
  it('should open system status dialog', () => {
    const modalOpenSpy = jest.spyOn(modalService, 'open')
    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
-    jest
-      .spyOn(permissionsService, 'currentUserCan')
-      .mockImplementation(
-        (action, type) =>
-          action === PermissionAction.View &&
-          type === PermissionType.SystemMonitoring
-      )
+    jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
    completeSetup()
    component.showSystemStatus()
    expect(modalOpenSpy).toHaveBeenCalledWith(SystemStatusDialogComponent, {
@@ -429,7 +429,7 @@ export class SettingsComponent
      this.settingsForm.patchValue(currentFormValue)
    }

-    if (this.canViewSystemStatus) {
+    if (this.permissionsService.isAdmin()) {
      this.systemStatusService.get().subscribe((status) => {
        this.systemStatus = status
      })
@@ -647,16 +647,6 @@ export class SettingsComponent
      .setValue(Array.from(hiddenFields))
  }

-  public get canViewSystemStatus(): boolean {
-    return (
-      this.permissionsService.isAdmin() ||
-      this.permissionsService.currentUserCan(
-        PermissionAction.View,
-        PermissionType.SystemMonitoring
-      )
-    )
-  }
-
  showSystemStatus() {
    const modal: NgbModalRef = this.modalService.open(
      SystemStatusDialogComponent,
@@ -1,16 +1,41 @@
 <pngx-page-header
-  title="Tasks"
+  title="File Tasks"
  i18n-title
-  info="Tasks shows detailed information about document consumption and system tasks."
+  info="File Tasks shows you documents that have been consumed, are waiting to be, or may have failed during the process."
  i18n-info
  >
  <div class="btn-toolbar col col-md-auto align-items-center gap-2">
    <button class="btn btn-sm btn-outline-secondary me-2" (click)="clearSelection()" [hidden]="selectedTasks.size === 0">
      <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Clear selection</ng-container>
    </button>
-    <button class="btn btn-sm btn-outline-primary me-2" (click)="dismissTasks()" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }" [disabled]="visibleTasks.length === 0">
+    <button class="btn btn-sm btn-outline-primary me-2" (click)="dismissTasks()" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }" [disabled]="tasksService.total === 0">
      <i-bs name="check2-all" class="me-1"></i-bs>{{dismissButtonText}}
    </button>
+    <div class="form-inline d-flex align-items-center">
+      <div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
+        <span class="input-group-text text-muted" i18n>Filter by</span>
+        @if (filterTargets.length > 1) {
+          <div ngbDropdown>
+            <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{filterTargetName}}</button>
+            <div class="dropdown-menu shadow" ngbDropdownMenu>
+              @for (t of filterTargets; track t.id) {
+                <button ngbDropdownItem [class.active]="filterTargetID === t.id" (click)="filterTargetID = t.id">{{t.name}}</button>
+              }
+            </div>
+          </div>
+        } @else {
+          <span class="input-group-text">{{filterTargetName}}</span>
+        }
+        @if (filterText?.length) {
+          <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()">
+            <i-bs width="1em" height="1em" name="x"></i-bs>
+          </button>
+        }
+        <input #filterInput class="form-control form-control-sm" type="text"
+          (keyup)="filterInputKeyup($event)"
+          [(ngModel)]="filterText">
+      </div>
+    </div>
    <div class="form-check form-switch mb-0 ms-2">
      <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
      <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
@@ -23,263 +48,164 @@
  <div class="visually-hidden" i18n>Loading...</div>
 }

-<div class="task-controls mb-3 btn-toolbar align-items-center" role="toolbar">
-  <div class="task-view-scope btn-group btn-group-sm me-3" role="group">
-    <input
-      type="radio"
-      class="btn-check"
-      [checked]="selectedSection === TaskSection.All"
-      id="section-all"
-      (click)="setSection(TaskSection.All)"
-      (keydown)="setSection(TaskSection.All)" />
-    <label class="btn btn-outline-primary" for="section-all">
-      <ng-container i18n>All</ng-container>
-    </label>
-    @for (section of sections; track section) {
-      <input
-        type="radio"
-        class="btn-check"
-        [checked]="selectedSection === section"
-        id="section-{{section}}"
-        (click)="setSection(section)"
-        (keydown)="setSection(section)" />
-      <label class="btn btn-outline-primary" for="section-{{section}}">
-        {{ sectionLabel(section) }}
-        @if (sectionCount(section) > 0) {
-          <span class="badge ms-2" [class.bg-danger]="section === TaskSection.NeedsAttention" [class.bg-secondary]="section !== TaskSection.NeedsAttention">{{sectionCount(section)}}</span>
+<ng-template let-tasks="tasks" #tasksTemplate>
+  <table class="table table-striped align-middle border shadow-sm">
+    <thead>
+      <tr>
+        <th scope="col">
+          <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="all-tasks" [disabled]="currentTasks.length === 0" [(ngModel)]="togggleAll" (click)="toggleAll($event); $event.stopPropagation();">
+            <label class="form-check-label" for="all-tasks"></label>
+          </div>
+        </th>
+        <th scope="col" i18n>Name</th>
+        <th scope="col" class="d-none d-lg-table-cell" i18n>Created</th>
+        @if (activeTab !== 'started' && activeTab !== 'queued') {
+          <th scope="col" class="d-none d-lg-table-cell" i18n>Results</th>
        }
-      </label>
-    }
-  </div>
-
-  <div class="ms-3 me-2 text-muted"><ng-container i18n>Filter by</ng-container>:</div>
-
-  <div ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary me-3" ngbDropdownToggle>{{selectedTaskTypeLabel}}</button>
-    <div class="dropdown-menu shadow" ngbDropdownMenu>
-      <button ngbDropdownItem [class.active]="selectedTaskType === null" (click)="setTaskType(null)" i18n>All types</button>
-      @for (option of taskTypeOptions; track option.value) {
-        <button ngbDropdownItem [class.active]="selectedTaskType === option.value" [disabled]="isTaskTypeOptionDisabled(option.value)" (click)="setTaskType(option.value)">{{option.label}}</button>
-      }
-    </div>
-  </div>
-  <div ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary me-3" ngbDropdownToggle>{{selectedTriggerSourceLabel}}</button>
-    <div class="dropdown-menu shadow" ngbDropdownMenu>
-      <button ngbDropdownItem [class.active]="selectedTriggerSource === null" (click)="setTriggerSource(null)" i18n>All sources</button>
-      @for (option of triggerSourceOptions; track option.value) {
-        <button ngbDropdownItem [class.active]="selectedTriggerSource === option.value" [disabled]="isTriggerSourceOptionDisabled(option.value)" (click)="setTriggerSource(option.value)">{{option.label}}</button>
-      }
-    </div>
-  </div>
-
-  <div class="form-inline d-flex align-items-center flex-grow-1 task-search">
-    <div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
-      <div ngbDropdown>
-        <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{filterTargetName}}</button>
-        <div class="dropdown-menu shadow" ngbDropdownMenu>
-          @for (t of filterTargets; track t.id) {
-            <button ngbDropdownItem [class.active]="filterTargetID === t.id" (click)="filterTargetID = t.id">{{t.name}}</button>
-          }
-        </div>
-      </div>
-      @if (filterText?.length) {
-        <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()">
-          <i-bs width="1em" height="1em" name="x"></i-bs>
-        </button>
-      }
-      <input #filterInput class="form-control form-control-sm" type="text"
-        (keyup)="filterInputKeyup($event)"
-        [(ngModel)]="filterText">
-    </div>
-  </div>
-
-  @if (isFiltered) {
-    <button class="btn btn-link py-0 ms-md-auto" (click)="resetFilters()">
-      <i-bs width="1em" height="1em" name="x"></i-bs><small i18n>Reset filters</small>
-    </button>
-  }
-
-  <ngb-pagination
-    class="ms-md-3 mb-0"
-    [pageSize]="pageSize"
-    [collectionSize]="totalTasks"
-    [page]="page"
-    [maxSize]="5"
-    [rotate]="true"
-    size="sm"
-    aria-label="Tasks pagination"
-    (pageChange)="setPage($event)">
-  </ngb-pagination>
-</div>
-
-<ng-template let-tasks="tasks" let-section="section" #tasksTemplate>
-  <div class="section-header d-flex align-items-center justify-content-between mb-2">
-    <div>
-      <h5 class="mb-0">{{ sectionLabel(section) }}</h5>
-      <div class="small text-muted">
-        <ng-container i18n>{tasks.length, plural, =1 {1 task} other {{{tasks.length}} tasks}}</ng-container>
-      </div>
-    </div>
-  </div>
-
-  <div class="card border table-responsive mb-3">
-    <table class="table table-striped align-middle shadow-sm mb-0 tasks-table">
-      <thead>
-        <tr>
-          <th scope="col" class="select-col">
+        <th scope="col" class="d-table-cell d-lg-none" i18n>Info</th>
+        <th scope="col" i18n>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task.id) {
+        <tr (click)="toggleSelected(task, $event); $event.stopPropagation();">
+          <td>
            <div class="form-check">
-              <input
-                type="checkbox"
-                class="form-check-input"
-                [id]="'all-tasks-' + section"
-                [disabled]="tasks.length === 0"
-                [checked]="areAllSelected(tasks)"
-                (click)="toggleSection(section, $event); $event.stopPropagation();"
-                (keydown)="toggleSection(section, $event); $event.stopPropagation();" />
-              <label class="form-check-label" for="all-tasks-{{section}}"><span class="visually-hidden">Check all</span></label>
+              <input type="checkbox" class="form-check-input" id="task{{task.id}}" [checked]="selectedTasks.has(task.id)" (click)="toggleSelected(task, $event); $event.stopPropagation();">
+              <label class="form-check-label" for="task{{task.id}}"></label>
            </div>
-          </th>
-          <th scope="col" class="name-col-header" i18n>Name</th>
-          <th scope="col" class="d-none d-lg-table-cell created-col" i18n>Created</th>
-          @if (sectionShowsResults(section)) {
-            <th scope="col" class="d-none d-lg-table-cell results-col" i18n>Results</th>
-          }
-          <th scope="col" class="d-table-cell d-lg-none" i18n>Info</th>
-          <th scope="col" class="actions-col" i18n>Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        @for (task of tasks; track task.id) {
-          <tr (click)="toggleSelected(task); $event.stopPropagation();" (keydown)="toggleSelected(task); $event.stopPropagation();">
-            <td class="select-col">
-              <div class="form-check">
-                <input
-                  type="checkbox"
-                  class="form-check-input"
-                  id="task{{task.id}}"
-                  [checked]="selectedTasks.has(task.id)"
-                  (click)="toggleSelected(task); $event.stopPropagation();"
-                  (keydown)="toggleSelected(task); $event.stopPropagation();" />
-                <label class="form-check-label" for="task{{task.id}}"></label>
-              </div>
-            </td>
-            <td class="overflow-auto name-col">
-              <div>{{ taskDisplayName(task) }}</div>
-              <div class="small text-muted">
-                @if (taskShowsSeparateTypeLabel(task)) {
-                  <span>{{ task.task_type_display }}</span>
-                  <span class="mx-1">&bull;</span>
-                }
-                <span>{{ task.trigger_source_display }}</span>
-              </div>
-            </td>
-            <td class="d-none d-lg-table-cell created-col">{{ task.date_created | customDate:'short' }}</td>
-            @if (sectionShowsResults(section)) {
-              <td class="d-none d-lg-table-cell results-col">
-                @if (taskHasLongResultMessage(task)) {
-                  <div class="result" (click)="expandTask(task); $event.stopPropagation();"
-                    [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
-                    <span class="small d-none d-md-inline-block font-monospace text-muted">{{ taskResultPreview(task) }}</span>
-                  </div>
-                }
-                @if (taskHasResultMessage(task) && !taskHasLongResultMessage(task)) {
-                  <span class="small d-none d-md-inline-block font-monospace text-muted">{{ taskResultMessage(task) }}</span>
-                }
-                @if (duplicateDocumentId(task)) {
-                  <div class="small text-warning-emphasis d-flex align-items-center gap-1 mt-1">
-                    <i-bs class="lh-1" width="1em" height="1em" name="exclamation-triangle"></i-bs>
-                    <span>{{ duplicateTaskLabel(task) }}</span>
-                  </div>
-                }
-                <ng-template #resultPopover>
-                  <pre class="small mb-0">{{ taskResultPopoverMessage(task) }}@if (taskResultMessageOverflowsPopover(task)) {
-                    &hellip;
-                  }</pre>
-                  @if (taskResultMessageOverflowsPopover(task)) {
-                    <br/><em>(<ng-container i18n>click for full output</ng-container>)</em>
-                  }
-                </ng-template>
-              </td>
-            }
-            <td class="d-lg-none">
-              <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();">
-                <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
-              </button>
-            </td>
-            <td scope="row" class="actions-col">
-              <div class="btn-group" role="group">
-                <button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }">
-                  <i-bs name="check" class="me-1"></i-bs><ng-container i18n>Dismiss</ng-container>
-                </button>
-                <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
-                  @if (task.related_document_ids?.[0]) {
-                    <a class="btn btn-sm btn-outline-primary" [routerLink]="['/documents', task.related_document_ids[0]]" (click)="dismissTask(task)">
-                      <i-bs name="file-text" class="me-1"></i-bs><ng-container i18n>Open Document</ng-container>
-                    </a>
-                  }
-                </ng-container>
-              </div>
-            </td>
-          </tr>
-        <tr>
-          <td class="px-2 py-0" [class.border-0]="expandedTask !== task.id" [attr.colspan]="sectionShowsResults(section) ? 5 : 4">
-            <div #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="task-detail-panel bg-darker small mb-0">
-              <div class="p-2 p-lg-3 ms-lg-3">
-                @if (taskHasResultMessage(task)) {
-                  <div class="detail-section mb-3">
-                    <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Result message</div>
-                    <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ taskResultMessage(task) }}</pre>
-                  </div>
-                }
-
-                @if (duplicateDocumentId(task); as duplicateDocumentId) {
-                  <div class="detail-section mb-3">
-                    <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Duplicate</div>
-                    <div class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">
-                      <div class="d-flex align-items-center justify-content-between gap-3">
-                        <div class="text-break">{{ duplicateTaskLabel(task) }}</div>
-                        <button
-                          class="btn btn-sm btn-outline-primary"
-                          type="button"
-                          (click)="openDuplicateDocument(duplicateDocumentId)">
-                          <ng-container i18n>Open</ng-container>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                }
-
-                <div class="row g-3">
-                  <div class="col-12 col-xl-6">
-                    <div class="detail-section h-100">
-                      <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Input data</div>
-                      <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ task.input_data | json }}</pre>
-                    </div>
-                  </div>
-                  <div class="col-12 col-xl-6">
-                    <div class="detail-section h-100">
-                      <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Result data</div>
-                      <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ (task.result_data ?? {}) | json }}</pre>
-                    </div>
-                  </div>
+          </td>
+          <td class="overflow-auto name-col">{{ task.task_file_name }}</td>
+          <td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td>
+          @if (activeTab !== 'started' && activeTab !== 'queued') {
+            <td class="d-none d-lg-table-cell">
+              @if (task.result?.length > 50) {
+                <div class="result" (click)="expandTask(task); $event.stopPropagation();"
+                  [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
+                  <span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result | slice:0:50 }}&hellip;</span>
                </div>
-              </div>
+              }
+              @if (task.result?.length <= 50) {
+                <span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result }}</span>
+              }
+              <ng-template #resultPopover>
+                <pre class="small mb-0">{{ task.result | slice:0:300 }}@if (task.result.length > 300) {
+                  &hellip;
+                }</pre>
+                @if (task.result?.length > 300) {
+                  <br/><em>(<ng-container i18n>click for full output</ng-container>)</em>
+                }
+              </ng-template>
+              @if (task.duplicate_documents?.length > 0) {
+                <div class="small text-warning-emphasis d-flex align-items-center gap-1">
+                  <i-bs class="lh-1" width="1em" height="1em" name="exclamation-triangle"></i-bs>
+                  <span i18n>Duplicate(s) detected</span>
+                </div>
+              }
+            </td>
+          }
+          <td class="d-lg-none">
+            <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();">
+              <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
+            </button>
+          </td>
+          <td scope="row">
+            <div class="btn-group" role="group">
+              @if (task.status === PaperlessTaskStatus.Failed) {
+                <ng-container *ngTemplateOutlet="retryDropdown; context: { task: task }"></ng-container>
+              }
+              <button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }">
+                <i-bs name="check" class="me-1"></i-bs><ng-container i18n>Dismiss</ng-container>
+              </button>
+              <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
+                @if (task.related_document) {
+                  <button class="btn btn-sm btn-outline-primary" (click)="dismissAndGo(task); $event.stopPropagation();">
+                    <i-bs name="file-text" class="me-1"></i-bs><ng-container i18n>Open Document</ng-container>
+                  </button>
+                }
+              </ng-container>
            </div>
          </td>
        </tr>
+        <tr>
+          <td class="p-0" [class.border-0]="expandedTask !== task.id" colspan="5">
+            <pre #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="small mb-0"><div class="small p-1 p-lg-3 ms-lg-3">{{ task.result }}</div></pre>
+          </td>
+        </tr>
      }
-      </tbody>
-    </table>
+    </tbody>
+  </table>
+
+  <div class="pb-3 d-sm-flex justify-content-between align-items-center">
+    @if (tasks.length > 0) {
+      <div class="pb-2 pb-sm-0">
+        <ng-container i18n>{tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}}</ng-container>
+        @if (selectedTasks.size > 0) {
+          <ng-container i18n>&nbsp;({{selectedTasks.size}} selected)</ng-container>
+        }
+      </div>
+    }
+    @if (tasks.length > pageSize) {
+      <ngb-pagination [(page)]="page" [pageSize]="pageSize" [collectionSize]="tasks.length" maxSize="8" size="sm"></ngb-pagination>
+    }
  </div>
 </ng-template>

-@if (visibleSections.length > 0) {
-  @for (section of visibleSections; track section) {
-    <div class="mb-4">
-      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks: tasksForSection(section), section: section}"></ng-container>
+<ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" class="nav-tabs" (hidden)="duringTabChange()" (navChange)="beforeTabChange()">
+  <li ngbNavItem="failed">
+    <a ngbNavLink i18n>Failed@if (tasksService.failedFileTasks.length > 0) {
+      <span class="badge bg-danger ms-2">{{tasksService.failedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="completed">
+    <a ngbNavLink i18n>Complete@if (tasksService.completedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.completedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="started">
+    <a ngbNavLink i18n>Started@if (tasksService.startedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.startedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="queued">
+    <a ngbNavLink i18n>Queued@if (tasksService.queuedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.queuedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+</ul>
+<div [ngbNavOutlet]="nav"></div>
+
+<ng-template #retryDropdown let-task="task">
+  <div ngbDropdown>
+    <button class="btn btn-sm btn-outline-primary" (click)="$event.stopImmediatePropagation()" ngbDropdownToggle>
+      <i-bs name="arrow-repeat"></i-bs>&nbsp;<ng-container i18n>Retry</ng-container>
+    </button>
+    <div ngbDropdownMenu class="shadow retry-dropdown">
+      <div class="p-2">
+        <ul class="list-group list-group-flush">
+            <li class="list-group-item small" i18n>
+              <pngx-input-check [(ngModel)]="retryClean" i18n-title title="Attempt to clean pdf"></pngx-input-check>
+            </li>
+        </ul>
+        <div class="d-flex justify-content-end">
+          <button class="btn btn-sm btn-outline-primary" (click)="retryTask(task); $event.stopPropagation();">
+            <ng-container i18n>Proceed</ng-container>
+          </button>
+        </div>
+      </div>
    </div>
-  }
-} @else {
-  <div class="alert alert-secondary fst-italic" i18n>No tasks match the current filters.</div>
-}
+  </div>
+</ng-template>
@@ -16,39 +16,6 @@ pre {
    cursor: pointer;
 }

-.tasks-table {
-    width: 100%;
-}
-
-@media (min-width: 992px) {
-    .tasks-table {
-        table-layout: fixed;
-    }
-
-    .tasks-table .select-col {
-        width: 3rem;
-    }
-
-    .tasks-table .created-col {
-        width: 13rem;
-        white-space: nowrap;
-    }
-
-    .tasks-table .results-col {
-        width: 24%;
-    }
-
-    .tasks-table .actions-col {
-        width: 18rem;
-        white-space: nowrap;
-    }
-
-    .tasks-table .name-col,
-    .tasks-table .results-col {
-        overflow: hidden;
-    }
-}
-
 .btn .spinner-border-sm {
    width: 0.8rem;
    height: 0.8rem;
@@ -63,12 +30,14 @@ pre {
 .input-group .dropdown .btn {
    border-top-right-radius: 0;
    border-bottom-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
 }

 .z-10 {
    z-index: 10;
 }

-tbody tr:nth-last-child(2) td {
-    border-bottom: none !important;
+.retry-dropdown {
+    width: 300px;
 }
@@ -9,17 +9,21 @@ import { FormsModule } from '@angular/forms'
 import { By } from '@angular/platform-browser'
 import { Router } from '@angular/router'
 import { RouterTestingModule } from '@angular/router/testing'
-import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbModule,
+  NgbNavItem,
+} from '@ng-bootstrap/ng-bootstrap'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { throwError } from 'rxjs'
+import { of, throwError } from 'rxjs'
 import { routes } from 'src/app/app-routing.module'
 import {
  PaperlessTask,
+  PaperlessTaskName,
  PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
  PaperlessTaskType,
 } from 'src/app/data/paperless-task'
-import { Results } from 'src/app/data/results'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -28,132 +32,92 @@ import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
+import { CheckComponent } from '../../common/input/check/check.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { TasksComponent, TaskSection } from './tasks.component'
+import { TasksComponent, TaskTab } from './tasks.component'

 const tasks: PaperlessTask[] = [
  {
    id: 467,
    task_id: '11ca1a5b-9f81-442c-b2c8-7e4ae53657f1',
-    input_data: { filename: 'test.pdf' },
+    task_file_name: 'test.pdf',
    date_created: new Date('2023-03-01T10:26:03.093116Z'),
    date_done: new Date('2023-03-01T10:26:07.223048Z'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Failure,
-    status_display: 'Failure',
-    result_data: {
-      error_message:
-        'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
-    },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Failed,
+    result: 'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
    acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
  },
  {
    id: 466,
    task_id: '10ca1a5b-3c08-442c-b2c8-7e4ae53657f1',
-    input_data: { filename: '191092.pdf' },
+    task_file_name: '191092.pdf',
    date_created: new Date('2023-03-01T09:26:03.093116Z'),
    date_done: new Date('2023-03-01T09:26:07.223048Z'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Failure,
-    status_display: 'Failure',
-    result_data: { duplicate_of: 311 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Failed,
+    result:
+      '191092.pd: Not consuming 191092.pdf: It is a duplicate of 191092 (#311)',
    acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
  },
  {
    id: 465,
    task_id: '3612d477-bb04-44e3-985b-ac580dd496d8',
-    input_data: { filename: 'Scan Jun 6, 2023 at 3.19 PM.pdf' },
+    task_file_name: 'Scan Jun 6, 2023 at 3.19 PM.pdf',
    date_created: new Date('2023-06-06T15:22:05.722323-07:00'),
    date_done: new Date('2023-06-06T15:22:14.564305-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
    status: PaperlessTaskStatus.Pending,
-    status_display: 'Pending',
-    result_data: null,
+    result: null,
    acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
  },
  {
    id: 464,
    task_id: '2eac4716-2aa6-4dcd-9953-264e11656d7e',
-    input_data: { filename: 'paperless-mail-l4dkg8ir' },
+    task_file_name: 'paperless-mail-l4dkg8ir',
    date_created: new Date('2023-06-04T11:24:32.898089-07:00'),
    date_done: new Date('2023-06-04T11:24:44.678605-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.EmailConsume,
-    trigger_source_display: 'Email Consume',
-    status: PaperlessTaskStatus.Success,
-    status_display: 'Success',
-    result_data: { document_id: 422, duplicate_of: 99 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Complete,
+    result: 'Success. New document id 422 created',
    acknowledged: false,
-    related_document_ids: [422],
+    related_document: 422,
  },
  {
    id: 463,
    task_id: '28125528-1575-4d6b-99e6-168906e8fa5c',
-    input_data: { filename: 'onlinePaymentSummary.pdf' },
+    task_file_name: 'onlinePaymentSummary.pdf',
    date_created: new Date('2023-06-01T13:49:51.631305-07:00'),
    date_done: new Date('2023-06-01T13:49:54.190220-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Success,
-    status_display: 'Success',
-    result_data: { document_id: 421 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Complete,
+    result: 'Success. New document id 421 created',
    acknowledged: false,
-    related_document_ids: [421],
+    related_document: 421,
  },
  {
    id: 462,
    task_id: 'a5b9ca47-0c8e-490f-a04c-6db5d5fc09e5',
-    input_data: { filename: 'paperless-mail-_rrpmqk6' },
+    task_file_name: 'paperless-mail-_rrpmqk6',
    date_created: new Date('2023-06-07T02:54:35.694916Z'),
    date_done: null,
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.EmailConsume,
-    trigger_source_display: 'Email Consume',
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
    status: PaperlessTaskStatus.Started,
-    status_display: 'Started',
-    result_data: null,
+    result: null,
    acknowledged: false,
-    related_document_ids: [],
-  },
-  {
-    id: 461,
-    task_id: 'bb79efb3-1e78-4f31-b4be-0966620b0ce1',
-    input_data: { dry_run: false, scope: 'global' },
-    date_created: new Date('2023-06-07T03:54:35.694916Z'),
-    date_done: null,
-    task_type: PaperlessTaskType.SanityCheck,
-    task_type_display: 'Sanity Check',
-    trigger_source: PaperlessTaskTriggerSource.System,
-    trigger_source_display: 'System',
-    status: PaperlessTaskStatus.Started,
-    status_display: 'Started',
-    result_data: { issues_found: 0 },
-    acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
  },
 ]

-const paginatedTasks: Results<PaperlessTask> = {
-  count: tasks.length,
-  results: tasks,
-}
-
 describe('TasksComponent', () => {
  let component: TasksComponent
  let fixture: ComponentFixture<TasksComponent>
@@ -175,6 +139,7 @@ describe('TasksComponent', () => {
        PageHeaderComponent,
        IfPermissionsDirective,
        CustomDatePipe,
+        CheckComponent,
        ConfirmDialogComponent,
      ],
      providers: [
@@ -202,193 +167,62 @@ describe('TasksComponent', () => {
    component = fixture.componentInstance
    jest.useFakeTimers()
    fixture.detectChanges()
-
    httpTestingController
      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
+        `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
      )
-      .flush(paginatedTasks)
+      .flush(tasks)
+  })

-    httpTestingController
-      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '25' &&
-          req.params.get('page') === '1'
+  it('should display file tasks in 4 tabs by status', () => {
+    const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavItem))
+
+    let currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Failed
+    ).length
+    component.activeTab = TaskTab.Failed
+    fixture.detectChanges()
+    expect(tabButtons[0].nativeElement.textContent).toEqual(
+      `Failed${currentTasksLength}`
+    )
+    expect(
+      fixture.debugElement.queryAll(
+        By.css('table td > .form-check input[type="checkbox"]')
      )
-      .flush(paginatedTasks)
-  })
-
-  it('should display task sections with counts', () => {
-    expect(component.selectedSection).toBe(TaskSection.All)
-    expect(component.selectedTaskType).toBeNull()
-    expect(component.selectedTriggerSource).toBeNull()
+    ).toHaveLength(currentTasksLength)

+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Complete
+    ).length
+    component.activeTab = TaskTab.Completed
    fixture.detectChanges()
+    expect(tabButtons[1].nativeElement.textContent).toEqual(
+      `Complete${currentTasksLength}`
+    )

-    const viewScope = fixture.debugElement.query(By.css('.task-view-scope'))
-    const text = viewScope.nativeElement.textContent
-
-    expect(text).toContain('All')
-    expect(text).toContain('Needs attention')
-    expect(text).toContain('2')
-    expect(text).toContain('In progress')
-    expect(text).toContain('3')
-    expect(text).toContain('Recently completed')
-  })
-
-  it('should filter visible sections by selected status', () => {
-    component.setSection(TaskSection.InProgress)
+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Started
+    ).length
+    component.activeTab = TaskTab.Started
    fixture.detectChanges()
+    expect(tabButtons[2].nativeElement.textContent).toEqual(
+      `Started${currentTasksLength}`
+    )

-    expect(component.visibleSections).toEqual([TaskSection.InProgress])
-    expect(fixture.nativeElement.textContent).toContain('In progress')
-    expect(fixture.nativeElement.textContent).not.toContain('Recent completed')
-  })
-
-  it('should filter tasks by task type', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(component.tasksForSection(TaskSection.InProgress)[0].task_type).toBe(
-      PaperlessTaskType.SanityCheck
+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Pending
+    ).length
+    component.activeTab = TaskTab.Queued
+    fixture.detectChanges()
+    expect(tabButtons[3].nativeElement.textContent).toEqual(
+      `Queued${currentTasksLength}`
    )
  })

-  it('should filter tasks by trigger source', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTriggerSource(PaperlessTaskTriggerSource.EmailConsume)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(
-      component.tasksForSection(TaskSection.InProgress)[0].trigger_source
-    ).toBe(PaperlessTaskTriggerSource.EmailConsume)
-  })
-
-  it('should reset all active filters together', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-    component.setTriggerSource(PaperlessTaskTriggerSource.System)
-    component.filterText = 'system'
-    jest.advanceTimersByTime(150)
-
-    expect(component.isFiltered).toBe(true)
-
-    component.resetFilters()
-
-    expect(component.selectedSection).toBe(TaskSection.InProgress)
-    expect(component.selectedTaskType).toBeNull()
-    expect(component.selectedTriggerSource).toBeNull()
-    expect(component.filterText).toBe('')
-    expect(component.isFiltered).toBe(false)
-  })
-
-  it('should keep header controls focused on actions and auto refresh', () => {
-    fixture.detectChanges()
-
-    const header = fixture.debugElement.query(By.css('pngx-page-header'))
-    const headerText = header.nativeElement.textContent
-
-    expect(headerText).toContain('Dismiss visible')
-    expect(headerText).toContain('Auto refresh')
-    expect(headerText).not.toContain('All types')
-    expect(headerText).not.toContain('All sources')
-    expect(headerText).not.toContain('Reset filters')
-  })
-
-  it('should render the view scope row above the filter bar', () => {
-    fixture.detectChanges()
-
-    const controls = fixture.debugElement.query(By.css('.task-controls'))
-    const viewScope = controls.query(By.css('.task-view-scope'))
-    const search = controls.query(By.css('.task-search'))
-
-    expect(viewScope).not.toBeNull()
-    expect(search).not.toBeNull()
-    expect(
-      viewScope.nativeElement.compareDocumentPosition(search.nativeElement) &
-        Node.DOCUMENT_POSITION_FOLLOWING
-    ).toBeTruthy()
-  })
-
-  it('should render pagination controls next to the task filter', () => {
-    fixture.detectChanges()
-
-    const controls = fixture.debugElement.query(By.css('.task-controls'))
-    const search = controls.query(By.css('.task-search'))
-    const pagination = controls.query(By.css('ngb-pagination'))
-
-    expect(search).not.toBeNull()
-    expect(pagination).not.toBeNull()
-  })
-
-  it('should load a different task page when pagination changes', () => {
-    component.setPage(2)
-
-    const pageTwoTasks = {
-      count: 30,
-      results: [tasks[0]],
-    }
-
-    httpTestingController
-      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '25' &&
-          req.params.get('page') === '2'
-      )
-      .flush(pageTwoTasks)
-
-    expect(component.page).toBe(2)
-    expect(component.totalTasks).toBe(30)
-    expect(component.pagedTasks).toEqual([tasks[0]])
-  })
-
-  it('should expose stable task type options and disable empty ones', () => {
-    expect(component.taskTypeOptions.map((option) => option.value)).toContain(
-      PaperlessTaskType.TrainClassifier
-    )
-    expect(
-      component.isTaskTypeOptionDisabled(PaperlessTaskType.TrainClassifier)
-    ).toBe(true)
-    expect(
-      component.isTaskTypeOptionDisabled(PaperlessTaskType.ConsumeFile)
-    ).toBe(false)
-  })
-
-  it('should fall back to the raw selected task type label when no option matches', () => {
-    component.selectedTaskType = 'unknown_task_type' as PaperlessTaskType
-
-    expect(component.selectedTaskTypeLabel).toBe('unknown_task_type')
-  })
-
-  it('should expose stable trigger source options and disable empty ones', () => {
-    expect(
-      component.triggerSourceOptions.map((option) => option.value)
-    ).toContain(PaperlessTaskTriggerSource.ApiUpload)
-    expect(
-      component.isTriggerSourceOptionDisabled(
-        PaperlessTaskTriggerSource.ApiUpload
-      )
-    ).toBe(true)
-    expect(
-      component.isTriggerSourceOptionDisabled(
-        PaperlessTaskTriggerSource.EmailConsume
-      )
-    ).toBe(false)
-  })
-
-  it('should fall back to the raw selected trigger source label when no option matches', () => {
-    component.selectedTriggerSource =
-      'unknown_trigger_source' as PaperlessTaskTriggerSource
-
-    expect(component.selectedTriggerSourceLabel).toBe('unknown_trigger_source')
+  it('should to go page 1 between tab switch', () => {
+    component.page = 10
+    component.duringTabChange()
+    expect(component.page).toEqual(1)
  })

  it('should support expanding / collapsing one task at a time', () => {
@@ -400,31 +234,6 @@ describe('TasksComponent', () => {
    expect(component.expandedTask).toBeUndefined()
  })

-  it('should show structured task details when expanded', () => {
-    component.setSection(TaskSection.InProgress)
-    component.expandTask(tasks[6])
-    fixture.detectChanges()
-
-    const detailText = fixture.nativeElement.textContent
-
-    expect(detailText).toContain('Input data')
-    expect(detailText).toContain('Result data')
-    expect(detailText).toContain('"scope": "global"')
-    expect(detailText).toContain('"issues_found": 0')
-  })
-
-  it('should show duplicate warnings and duplicate details when present', () => {
-    component.setSection(TaskSection.Completed)
-    component.expandTask(tasks[3])
-    fixture.detectChanges()
-
-    const content = fixture.nativeElement.textContent
-
-    expect(content).toContain('Duplicate of document #99')
-    expect(content).toContain('Duplicate')
-    expect(content).toContain('Open')
-  })
-
  it('should support dismiss single task', () => {
    const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
    component.dismissTask(tasks[0])
@@ -435,7 +244,7 @@ describe('TasksComponent', () => {
    component.toggleSelected(tasks[0])
    component.toggleSelected(tasks[1])
    component.toggleSelected(tasks[3])
-    component.toggleSelected(tasks[3])
+    component.toggleSelected(tasks[3]) // uncheck, for coverage
    const selected = new Set([tasks[0].id, tasks[1].id])
    expect(component.selectedTasks).toEqual(selected)
    let modal: NgbModalRef
@@ -484,70 +293,41 @@ describe('TasksComponent', () => {
    expect(component.selectedTasks.size).toBe(0)
  })

-  it('should support dismiss visible tasks', () => {
-    component.setSection(TaskSection.NeedsAttention)
+  it('should support dismiss all tasks', () => {
    let modal: NgbModalRef
    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
    const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
    component.dismissTasks()
    expect(modal).not.toBeUndefined()
    modal.componentInstance.confirmClicked.emit()
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([467, 466]))
+    expect(dismissSpy).toHaveBeenCalledWith(new Set(tasks.map((t) => t.id)))
  })

-  it('should dismiss the currently visible scoped and filtered tasks', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-    component.setTriggerSource(PaperlessTaskTriggerSource.System)
-
-    const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
-
-    component.dismissTasks()
-
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([461]))
-  })
-
-  it('should support toggling a full section', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    fixture.detectChanges()
-
+  it('should support toggle all tasks', () => {
    const toggleCheck = fixture.debugElement.query(
-      By.css('#all-tasks-needs_attention')
+      By.css('table input[type=checkbox]')
+    )
+    toggleCheck.nativeElement.dispatchEvent(new MouseEvent('click'))
+    fixture.detectChanges()
+    expect(component.selectedTasks).toEqual(
+      new Set(
+        tasks
+          .filter((t) => t.status === PaperlessTaskStatus.Failed)
+          .map((t) => t.id)
+      )
    )
-    expect(toggleCheck).not.toBeNull()
    toggleCheck.nativeElement.dispatchEvent(new MouseEvent('click'))
    fixture.detectChanges()
-    expect(component.selectedTasks).toEqual(new Set([467, 466]))
-  })
-
-  it('should remove a full section from selection when toggled off', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    component.selectedTasks = new Set([467, 466])
-
-    component.toggleSection(TaskSection.NeedsAttention, {
-      target: { checked: false },
-    } as unknown as PointerEvent)
-
    expect(component.selectedTasks).toEqual(new Set())
  })

  it('should support dismiss and open a document', () => {
-    const dismissSpy = jest.spyOn(component, 'dismissTask')
-
-    fixture.detectChanges()
-
-    const openDocumentLink = fixture.debugElement
-      .queryAll(By.css('a'))
-      .find((link) => link.nativeElement.textContent.includes('Open Document'))
-
-    expect(openDocumentLink).not.toBeNull()
-
-    openDocumentLink.triggerEventHandler(
-      'click',
-      new MouseEvent('click', { ctrlKey: true })
-    )
-
-    expect(dismissSpy).toHaveBeenCalledWith(tasks[3])
+    const routerSpy = jest.spyOn(router, 'navigate')
+    component.dismissAndGo(tasks[3])
+    expect(routerSpy).toHaveBeenCalledWith([
+      'documents',
+      tasks[3].related_document,
+    ])
  })

  it('should auto refresh, allow toggle', () => {
@@ -560,127 +340,73 @@ describe('TasksComponent', () => {
  })

  it('should filter tasks by file name', () => {
-    fixture.detectChanges()
    const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
    )
-    expect(input).not.toBeNull()
    input.nativeElement.value = '191092'
    input.nativeElement.dispatchEvent(new Event('input'))
-    jest.advanceTimersByTime(150)
+    jest.advanceTimersByTime(150) // debounce time
    fixture.detectChanges()
    expect(component.filterText).toEqual('191092')
-    expect(component.tasksForSection(TaskSection.NeedsAttention)).toHaveLength(
-      1
-    )
-  })
-
-  it('should match task type and source in name filtering', () => {
-    component.setSection(TaskSection.InProgress)
-    component.filterText = 'system'
-    jest.advanceTimersByTime(150)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(component.tasksForSection(TaskSection.InProgress)[0].task_type).toBe(
-      PaperlessTaskType.SanityCheck
-    )
-  })
-
-  it('should fall back to task type when filename is unavailable', () => {
-    component.setSection(TaskSection.InProgress)
-    fixture.detectChanges()
-
-    const nameColumn = fixture.debugElement.queryAll(
-      By.css('tbody td.name-col')
-    )
-    const sanityTaskRow = nameColumn.find((cell) =>
-      cell.nativeElement.textContent.includes('Sanity Check')
-    )
-
-    expect(sanityTaskRow.nativeElement.textContent).toContain('Sanity Check')
-    expect(sanityTaskRow.nativeElement.textContent).toContain('System')
+    expect(
+      fixture.debugElement.queryAll(By.css('table tbody tr')).length
+    ).toEqual(2) // 1 task x 2 lines
  })

  it('should filter tasks by result', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    component.filterTargetID = 1
+    component.activeTab = TaskTab.Failed
    fixture.detectChanges()
+    component.filterTargetID = 1
    const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
    )
-    expect(input).not.toBeNull()
    input.nativeElement.value = 'duplicate'
    input.nativeElement.dispatchEvent(new Event('input'))
-    jest.advanceTimersByTime(150)
+    jest.advanceTimersByTime(150) // debounce time
    fixture.detectChanges()
    expect(component.filterText).toEqual('duplicate')
-    expect(component.tasksForSection(TaskSection.NeedsAttention)).toHaveLength(
-      2
-    )
-  })
-
-  it('should prefer explicit reason in the result message', () => {
    expect(
-      component.taskResultMessage({
-        ...tasks[0],
-        result_data: { reason: 'Manual review required', duplicate_of: 311 },
-      })
-    ).toBe('Manual review required')
-  })
-
-  it('should return null preview and popover text when there is no result message', () => {
-    expect(component.taskResultPreview(tasks[2])).toBeNull()
-    expect(component.taskResultPopoverMessage(tasks[2])).toBe('')
-    expect(component.taskResultMessageOverflowsPopover(tasks[2])).toBe(false)
-  })
-
-  it('should navigate to a duplicate document details page', () => {
-    const routerSpy = jest.spyOn(router, 'navigate')
-
-    component.openDuplicateDocument(99)
-
-    expect(routerSpy).toHaveBeenCalledWith(['documents', 99, 'details'])
-  })
-
-  it('should report when a result message overflows the popover limit', () => {
-    const longMessage = 'x'.repeat(350)
-    const task = {
-      ...tasks[0],
-      result_data: { error_message: longMessage },
-    }
-
-    expect(component.taskResultPopoverMessage(task)).toBe(
-      longMessage.slice(0, 300)
-    )
-    expect(component.taskResultMessageOverflowsPopover(task)).toBe(true)
+      fixture.debugElement.queryAll(By.css('table tbody tr')).length
+    ).toEqual(4) // 2 tasks x 2 lines
  })

  it('should support keyboard events for filtering', () => {
-    fixture.detectChanges()
    const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
    )
-    expect(input).not.toBeNull()
    input.nativeElement.value = '191092'
    input.nativeElement.dispatchEvent(
      new KeyboardEvent('keyup', { key: 'Enter' })
    )
-    expect(component.filterText).toEqual('191092')
+    expect(component.filterText).toEqual('191092') // no debounce needed
    input.nativeElement.dispatchEvent(
      new KeyboardEvent('keyup', { key: 'Escape' })
    )
    expect(component.filterText).toEqual('')
  })

-  it('should keep clearing selection independent from resetting filters', () => {
-    component.setTaskType(PaperlessTaskType.ConsumeFile)
-    component.toggleSelected(tasks[0])
-    expect(component.selectedTasks.size).toBe(1)
+  it('should reset filter and target on tab switch', () => {
+    component.filterText = '191092'
+    component.filterTargetID = 1
+    component.activeTab = TaskTab.Completed
+    component.beforeTabChange()
+    expect(component.filterText).toEqual('')
+    expect(component.filterTargetID).toEqual(0)
+  })

-    component.clearSelection()
-
-    expect(component.selectedTasks.size).toBe(0)
-    expect(component.selectedTaskType).toBe(PaperlessTaskType.ConsumeFile)
-    expect(component.isFiltered).toBe(true)
+  it('should retry a task, show toast on error or success', () => {
+    const retrySpy = jest.spyOn(tasksService, 'retryTask')
+    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
+    const toastErrorSpy = jest.spyOn(toastService, 'showError')
+    retrySpy.mockReturnValueOnce(of({ task_id: '123' }))
+    component.retryTask(tasks[0])
+    expect(retrySpy).toHaveBeenCalledWith(tasks[0], false)
+    expect(toastInfoSpy).toHaveBeenCalledWith('Retrying task...')
+    retrySpy.mockReturnValueOnce(throwError(() => new Error('test')))
+    component.retryTask(tasks[0])
+    expect(toastErrorSpy).toHaveBeenCalledWith(
+      'Failed to retry task',
+      new Error('test')
+    )
  })
 })
@@ -1,11 +1,12 @@
-import { JsonPipe, NgTemplateOutlet } from '@angular/common'
+import { NgTemplateOutlet, SlicePipe } from '@angular/common'
 import { Component, inject, OnDestroy, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { Router, RouterLink } from '@angular/router'
+import { Router } from '@angular/router'
 import {
  NgbCollapseModule,
  NgbDropdownModule,
  NgbModal,
+  NgbNavModule,
  NgbPaginationModule,
  NgbPopoverModule,
 } from '@ng-bootstrap/ng-bootstrap'
@@ -19,25 +20,21 @@ import {
  takeUntil,
  timer,
 } from 'rxjs'
-import {
-  PaperlessTask,
-  PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
-  PaperlessTaskType,
-} from 'src/app/data/paperless-task'
+import { PaperlessTask, PaperlessTaskStatus } from 'src/app/data/paperless-task'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
+import { CheckComponent } from '../../common/input/check/check.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'

-export enum TaskSection {
-  All = 'all',
-  NeedsAttention = 'needs_attention',
-  InProgress = 'in_progress',
+export enum TaskTab {
+  Queued = 'queued',
+  Started = 'started',
  Completed = 'completed',
+  Failed = 'failed',
 }

 enum TaskFilterTargetID {
@@ -50,82 +47,6 @@ const FILTER_TARGETS = [
  { id: TaskFilterTargetID.Result, name: $localize`Result` },
 ]

-const SECTION_LABELS = {
-  [TaskSection.All]: $localize`All`,
-  [TaskSection.NeedsAttention]: $localize`Needs attention`,
-  [TaskSection.InProgress]: $localize`In progress`,
-  [TaskSection.Completed]: $localize`Recently completed`,
-}
-
-const TASK_TYPE_OPTIONS: Array<{
-  value: PaperlessTaskType
-  label: string
-}> = [
-  {
-    value: PaperlessTaskType.ConsumeFile,
-    label: $localize`Consume File`,
-  },
-  {
-    value: PaperlessTaskType.TrainClassifier,
-    label: $localize`Train Classifier`,
-  },
-  {
-    value: PaperlessTaskType.SanityCheck,
-    label: $localize`Sanity Check`,
-  },
-  { value: PaperlessTaskType.MailFetch, label: $localize`Mail Fetch` },
-  { value: PaperlessTaskType.LlmIndex, label: $localize`LLM Index` },
-  {
-    value: PaperlessTaskType.EmptyTrash,
-    label: $localize`Empty Trash`,
-  },
-  {
-    value: PaperlessTaskType.CheckWorkflows,
-    label: $localize`Check Workflows`,
-  },
-  {
-    value: PaperlessTaskType.BulkUpdate,
-    label: $localize`Bulk Update`,
-  },
-  {
-    value: PaperlessTaskType.ReprocessDocument,
-    label: $localize`Reprocess Document`,
-  },
-  {
-    value: PaperlessTaskType.BuildShareLink,
-    label: $localize`Build Share Link`,
-  },
-  {
-    value: PaperlessTaskType.BulkDelete,
-    label: $localize`Bulk Delete`,
-  },
-]
-
-const TRIGGER_SOURCE_OPTIONS: Array<{
-  value: PaperlessTaskTriggerSource
-  label: string
-}> = [
-  {
-    value: PaperlessTaskTriggerSource.Scheduled,
-    label: $localize`Scheduled`,
-  },
-  { value: PaperlessTaskTriggerSource.WebUI, label: $localize`Web UI` },
-  {
-    value: PaperlessTaskTriggerSource.ApiUpload,
-    label: $localize`API Upload`,
-  },
-  {
-    value: PaperlessTaskTriggerSource.FolderConsume,
-    label: $localize`Folder Consume`,
-  },
-  {
-    value: PaperlessTaskTriggerSource.EmailConsume,
-    label: $localize`Email Consume`,
-  },
-  { value: PaperlessTaskTriggerSource.System, label: $localize`System` },
-  { value: PaperlessTaskTriggerSource.Manual, label: $localize`Manual` },
-]
-
@Component({
  selector: 'pngx-tasks',
  templateUrl: './tasks.component.html',
@@ -134,13 +55,14 @@ const TRIGGER_SOURCE_OPTIONS: Array<{
    PageHeaderComponent,
    IfPermissionsDirective,
    CustomDatePipe,
-    JsonPipe,
+    CheckComponent,
+    SlicePipe,
    FormsModule,
    ReactiveFormsModule,
    NgTemplateOutlet,
-    RouterLink,
    NgbCollapseModule,
    NgbDropdownModule,
+    NgbNavModule,
    NgbPaginationModule,
    NgbPopoverModule,
    NgxBootstrapIconsModule,
@@ -155,22 +77,16 @@ export class TasksComponent
  private readonly router = inject(Router)
  private readonly toastService = inject(ToastService)

-  readonly TaskSection = TaskSection
-  readonly sections = [
-    TaskSection.NeedsAttention,
-    TaskSection.InProgress,
-    TaskSection.Completed,
-  ]
+  public PaperlessTaskStatus = PaperlessTaskStatus
+  public activeTab: TaskTab
  public selectedTasks: Set<number> = new Set()
+  public togggleAll: boolean = false
  public expandedTask: number
-  public autoRefreshEnabled: boolean = true
-  public readonly pageSize = 25
+
+  public pageSize: number = 25
  public page: number = 1
-  public totalTasks: number = 0
-  public pagedTasks: PaperlessTask[] = []
-  public selectedSection: TaskSection = TaskSection.All
-  public selectedTaskType: PaperlessTaskType | null = null
-  public selectedTriggerSource: PaperlessTaskTriggerSource | null = null
+
+  public autoRefreshEnabled: boolean = true

  private _filterText: string = ''
  get filterText() {
@@ -182,86 +98,26 @@ export class TasksComponent

  public filterTargetID: TaskFilterTargetID = TaskFilterTargetID.Name
  public get filterTargetName(): string {
-    return FILTER_TARGETS.find((t) => t.id == this.filterTargetID).name
+    return this.filterTargets.find((t) => t.id == this.filterTargetID).name
  }
  private filterDebounce: Subject<string> = new Subject<string>()

  public get filterTargets(): Array<{ id: number; name: string }> {
-    return FILTER_TARGETS
+    return [TaskTab.Failed, TaskTab.Completed].includes(this.activeTab)
+      ? FILTER_TARGETS
+      : FILTER_TARGETS.slice(0, 1)
  }

-  public get taskTypeOptions(): Array<{
-    value: PaperlessTaskType
-    label: string
-  }> {
-    return TASK_TYPE_OPTIONS
-  }
-
-  public get triggerSourceOptions(): Array<{
-    value: PaperlessTaskTriggerSource
-    label: string
-  }> {
-    return TRIGGER_SOURCE_OPTIONS
-  }
-
-  public get selectedTaskTypeLabel(): string {
-    if (this.selectedTaskType === null) {
-      return $localize`All types`
-    }
-
-    return (
-      this.taskTypeOptions.find(
-        (option) => option.value === this.selectedTaskType
-      )?.label ?? this.selectedTaskType
-    )
-  }
-
-  public get selectedTriggerSourceLabel(): string {
-    if (this.selectedTriggerSource === null) {
-      return $localize`All sources`
-    }
-
-    return (
-      this.triggerSourceOptions.find(
-        (option) => option.value === this.selectedTriggerSource
-      )?.label ?? this.selectedTriggerSource
-    )
-  }
+  public retryClean: boolean = false

  get dismissButtonText(): string {
    return this.selectedTasks.size > 0
      ? $localize`Dismiss selected`
-      : $localize`Dismiss visible`
-  }
-
-  get visibleSections(): TaskSection[] {
-    const sections =
-      this.selectedSection === TaskSection.All
-        ? this.sections
-        : [this.selectedSection]
-
-    return sections.filter(
-      (section) => this.tasksForSection(section).length > 0
-    )
-  }
-
-  get visibleTasks(): PaperlessTask[] {
-    return this.visibleSections.flatMap((section) =>
-      this.tasksForSection(section)
-    )
-  }
-
-  get isFiltered(): boolean {
-    return (
-      this.selectedTaskType !== null ||
-      this.selectedTriggerSource !== null ||
-      this._filterText.length > 0
-    )
+      : $localize`Dismiss all`
  }

  ngOnInit() {
    this.tasksService.reload()
-    this.reloadPage()
    timer(5000, 5000)
      .pipe(
        filter(() => this.autoRefreshEnabled),
@@ -269,7 +125,6 @@ export class TasksComponent
      )
      .subscribe(() => {
        this.tasksService.reload()
-        this.reloadPage(false)
      })

    this.filterDebounce
@@ -279,10 +134,7 @@ export class TasksComponent
        distinctUntilChanged(),
        filter((query) => !query.length || query.length > 2)
      )
-      .subscribe((query) => {
-        this._filterText = query
-        this.clearSelection()
-      })
+      .subscribe((query) => (this._filterText = query))
  }

  ngOnDestroy() {
@@ -296,25 +148,20 @@ export class TasksComponent

  dismissTasks(task: PaperlessTask = undefined) {
    let tasks = task ? new Set([task.id]) : new Set(this.selectedTasks.values())
-    if (!task && tasks.size == 0) {
-      tasks = new Set(this.visibleTasks.map((t) => t.id))
-    }
-
+    if (!task && tasks.size == 0)
+      tasks = new Set(this.tasksService.allFileTasks.map((t) => t.id))
    if (tasks.size > 1) {
      let modal = this.modalService.open(ConfirmDialogComponent, {
        backdrop: 'static',
      })
-      modal.componentInstance.title = $localize`Confirm Dismiss`
-      modal.componentInstance.messageBold = $localize`Dismiss ${tasks.size} tasks?`
+      modal.componentInstance.title = $localize`Confirm Dismiss All`
+      modal.componentInstance.messageBold = $localize`Dismiss all ${tasks.size} tasks?`
      modal.componentInstance.btnClass = 'btn-warning'
      modal.componentInstance.btnCaption = $localize`Dismiss`
      modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
        modal.componentInstance.buttonsEnabled = false
        modal.close()
        this.tasksService.dismissTasks(tasks).subscribe({
-          next: () => {
-            this.reloadPage(false)
-          },
          error: (e) => {
            this.toastService.showError($localize`Error dismissing tasks`, e)
            modal.componentInstance.buttonsEnabled = true
@@ -322,11 +169,8 @@ export class TasksComponent
        })
        this.clearSelection()
      })
-    } else if (tasks.size === 1) {
+    } else {
      this.tasksService.dismissTasks(tasks).subscribe({
-        next: () => {
-          this.reloadPage(false)
-        },
        error: (e) =>
          this.toastService.showError($localize`Error dismissing task`, e),
      })
@@ -334,6 +178,22 @@ export class TasksComponent
    }
  }

+  dismissAndGo(task: PaperlessTask) {
+    this.dismissTask(task)
+    this.router.navigate(['documents', task.related_document])
+  }
+
+  retryTask(task: PaperlessTask) {
+    this.tasksService.retryTask(task, this.retryClean).subscribe({
+      next: () => {
+        this.toastService.showInfo($localize`Retrying task...`)
+      },
+      error: (e) => {
+        this.toastService.showError($localize`Failed to retry task`, e)
+      },
+    })
+  }
+
  expandTask(task: PaperlessTask) {
    this.expandedTask = this.expandedTask == task.id ? undefined : task.id
  }
@@ -344,177 +204,75 @@ export class TasksComponent
      : this.selectedTasks.add(task.id)
  }

-  toggleSection(section: TaskSection, event: PointerEvent) {
-    const sectionTasks = this.tasksForSection(section)
+  get currentTasks(): PaperlessTask[] {
+    let tasks: PaperlessTask[] = []
+    switch (this.activeTab) {
+      case TaskTab.Queued:
+        tasks = this.tasksService.queuedFileTasks
+        break
+      case TaskTab.Started:
+        tasks = this.tasksService.startedFileTasks
+        break
+      case TaskTab.Completed:
+        tasks = this.tasksService.completedFileTasks
+        break
+      case TaskTab.Failed:
+        tasks = this.tasksService.failedFileTasks
+        break
+    }
+    if (this._filterText.length) {
+      tasks = tasks.filter((t) => {
+        if (this.filterTargetID == TaskFilterTargetID.Name) {
+          return t.task_file_name
+            .toLowerCase()
+            .includes(this._filterText.toLowerCase())
+        } else if (this.filterTargetID == TaskFilterTargetID.Result) {
+          return t.result.toLowerCase().includes(this._filterText.toLowerCase())
+        }
+      })
+    }
+    return tasks
+  }
+
+  toggleAll(event: PointerEvent) {
    if ((event.target as HTMLInputElement).checked) {
-      sectionTasks.forEach((task) => this.selectedTasks.add(task.id))
+      this.selectedTasks = new Set(this.currentTasks.map((t) => t.id))
    } else {
-      sectionTasks.forEach((task) => this.selectedTasks.delete(task.id))
+      this.clearSelection()
    }
  }

-  areAllSelected(tasks: PaperlessTask[]): boolean {
-    return (
-      tasks.length > 0 && tasks.every((task) => this.selectedTasks.has(task.id))
-    )
-  }
-
-  taskDisplayName(task: PaperlessTask): string {
-    return task.input_data?.filename?.toString() || task.task_type_display
-  }
-
-  taskShowsSeparateTypeLabel(task: PaperlessTask): boolean {
-    return this.taskDisplayName(task) !== task.task_type_display
-  }
-
-  taskResultMessage(task: PaperlessTask): string | null {
-    if (!task.result_data) {
-      return null
-    }
-
-    const documentId = task.result_data?.['document_id']
-    if (typeof documentId === 'number') {
-      return $localize`Success. New document id ${documentId} created`
-    }
-
-    const reason = task.result_data?.['reason']
-    if (typeof reason === 'string') {
-      return reason
-    }
-
-    const duplicateOf = task.result_data?.['duplicate_of']
-    if (typeof duplicateOf === 'number') {
-      return $localize`Duplicate of document #${duplicateOf}`
-    }
-
-    const errorMessage = task.result_data?.['error_message']
-    if (typeof errorMessage === 'string') {
-      return errorMessage
-    }
-
-    return null
-  }
-
-  taskResultPreview(task: PaperlessTask): string | null {
-    const message = this.taskResultMessage(task)
-    if (!message) {
-      return null
-    }
-
-    return message.length > 50 ? `${message.slice(0, 50)}...` : message
-  }
-
-  taskHasLongResultMessage(task: PaperlessTask): boolean {
-    return (this.taskResultMessage(task)?.length ?? 0) > 50
-  }
-
-  taskHasResultMessage(task: PaperlessTask): boolean {
-    return !!this.taskResultMessage(task)
-  }
-
-  duplicateDocumentId(task: PaperlessTask): number | null {
-    const duplicateOf = task.result_data?.['duplicate_of']
-    return typeof duplicateOf === 'number' ? duplicateOf : null
-  }
-
-  duplicateTaskLabel(task: PaperlessTask): string {
-    return $localize`Duplicate of document #${this.duplicateDocumentId(task)}`
-  }
-
-  openDuplicateDocument(documentId: number) {
-    this.router.navigate(['documents', documentId, 'details'])
-  }
-
-  taskResultPopoverMessage(task: PaperlessTask): string {
-    return this.taskResultMessage(task)?.slice(0, 300) ?? ''
-  }
-
-  taskResultMessageOverflowsPopover(task: PaperlessTask): boolean {
-    return (this.taskResultMessage(task)?.length ?? 0) > 300
-  }
-
-  tasksForSection(section: TaskSection): PaperlessTask[] {
-    let tasks = this.pagedTasks.filter((task) =>
-      this.taskBelongsToSection(task, section)
-    )
-
-    return tasks.filter((task) => this.taskMatchesCurrentFilters(task))
-  }
-
-  sectionLabel(section: TaskSection): string {
-    return SECTION_LABELS[section]
-  }
-
-  sectionCount(section: TaskSection): number {
-    return this.pagedTasks.filter((task) =>
-      this.taskBelongsToSection(task, section)
-    ).length
-  }
-
-  sectionShowsResults(section: TaskSection): boolean {
-    return section !== TaskSection.InProgress
-  }
-
-  setSection(section: TaskSection) {
-    this.selectedSection = section
-    this.clearSelection()
-  }
-
-  setTaskType(taskType: PaperlessTaskType | null) {
-    this.selectedTaskType = taskType
-    this.clearSelection()
-  }
-
-  setTriggerSource(triggerSource: PaperlessTaskTriggerSource | null) {
-    this.selectedTriggerSource = triggerSource
-    this.clearSelection()
-  }
-
-  taskTypeOptionCount(taskType: PaperlessTaskType | null): number {
-    return this.tasksForOptionCounts({ taskType }).length
-  }
-
-  triggerSourceOptionCount(
-    triggerSource: PaperlessTaskTriggerSource | null
-  ): number {
-    return this.tasksForOptionCounts({ triggerSource }).length
-  }
-
-  isTaskTypeOptionDisabled(taskType: PaperlessTaskType | null): boolean {
-    return this.taskTypeOptionCount(taskType) === 0
-  }
-
-  isTriggerSourceOptionDisabled(
-    triggerSource: PaperlessTaskTriggerSource | null
-  ): boolean {
-    return this.triggerSourceOptionCount(triggerSource) === 0
-  }
-
  clearSelection() {
+    this.togggleAll = false
    this.selectedTasks.clear()
  }

-  setPage(page: number) {
-    if (this.page === page) {
-      return
-    }
+  duringTabChange() {
+    this.page = 1
+  }

-    this.page = page
-    this.clearSelection()
-    this.reloadPage()
+  beforeTabChange() {
+    this.resetFilter()
+    this.filterTargetID = TaskFilterTargetID.Name
+  }
+
+  get activeTabLocalized(): string {
+    switch (this.activeTab) {
+      case TaskTab.Queued:
+        return $localize`queued`
+      case TaskTab.Started:
+        return $localize`started`
+      case TaskTab.Completed:
+        return $localize`completed`
+      case TaskTab.Failed:
+        return $localize`failed`
+    }
  }

  public resetFilter() {
    this._filterText = ''
  }

-  public resetFilters() {
-    this.selectedTaskType = null
-    this.selectedTriggerSource = null
-    this.resetFilter()
-    this.clearSelection()
-  }
-
  filterInputKeyup(event: KeyboardEvent) {
    if (event.key == 'Enter') {
      this._filterText = (event.target as HTMLInputElement).value
@@ -522,116 +280,4 @@ export class TasksComponent
      this.resetFilter()
    }
  }
-
-  private taskBelongsToSection(
-    task: PaperlessTask,
-    section: TaskSection
-  ): boolean {
-    switch (section) {
-      case TaskSection.NeedsAttention:
-        return [
-          PaperlessTaskStatus.Failure,
-          PaperlessTaskStatus.Revoked,
-        ].includes(task.status)
-      case TaskSection.InProgress:
-        return [
-          PaperlessTaskStatus.Pending,
-          PaperlessTaskStatus.Started,
-        ].includes(task.status)
-      case TaskSection.Completed:
-        return task.status === PaperlessTaskStatus.Success
-    }
-  }
-
-  private taskMatchesCurrentFilters(task: PaperlessTask): boolean {
-    return this.taskMatchesFilters(task, {
-      taskType: this.selectedTaskType,
-      triggerSource: this.selectedTriggerSource,
-    })
-  }
-
-  private taskMatchesFilters(
-    task: PaperlessTask,
-    {
-      taskType,
-      triggerSource,
-    }: {
-      taskType: PaperlessTaskType | null
-      triggerSource: PaperlessTaskTriggerSource | null
-    }
-  ): boolean {
-    if (taskType !== null && task.task_type !== taskType) {
-      return false
-    }
-
-    if (triggerSource !== null && task.trigger_source !== triggerSource) {
-      return false
-    }
-
-    if (!this._filterText.length) {
-      return true
-    }
-
-    const query = this._filterText.toLowerCase()
-
-    if (this.filterTargetID == TaskFilterTargetID.Name) {
-      return [
-        this.taskDisplayName(task),
-        task.task_type_display,
-        task.trigger_source_display,
-      ]
-        .filter(Boolean)
-        .some((value) => value.toLowerCase().includes(query))
-    }
-
-    return this.taskResultMessage(task)?.toLowerCase().includes(query) ?? false
-  }
-
-  private tasksForOptionCounts({
-    taskType = this.selectedTaskType,
-    triggerSource = this.selectedTriggerSource,
-  }: {
-    taskType?: PaperlessTaskType | null
-    triggerSource?: PaperlessTaskTriggerSource | null
-  }): PaperlessTask[] {
-    const sections =
-      this.selectedSection === TaskSection.All
-        ? this.sections
-        : [this.selectedSection]
-
-    return this.pagedTasks.filter(
-      (task) =>
-        sections.some((section) => this.taskBelongsToSection(task, section)) &&
-        this.taskMatchesFilters(task, { taskType, triggerSource })
-    )
-  }
-
-  private reloadPage(resetToFirstPage: boolean = false) {
-    if (resetToFirstPage) {
-      this.page = 1
-    }
-
-    this.loading = true
-    this.tasksService
-      .list(this.page, this.pageSize, { acknowledged: false })
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe({
-        next: (result) => {
-          this.pagedTasks = result.results
-          this.totalTasks = result.count
-          this.loading = false
-          if (
-            this.page > 1 &&
-            this.pagedTasks.length === 0 &&
-            this.totalTasks > 0
-          ) {
-            this.page -= 1
-            this.reloadPage()
-          }
-        },
-        error: () => {
-          this.loading = false
-        },
-      })
-  }
 }
@@ -1,15 +1,17 @@
 <nav class="navbar navbar-dark fixed-top bg-primary flex-md-nowrap p-0 shadow-sm">
  <button class="navbar-toggler d-md-none collapsed border-0" type="button" data-toggle="collapse"
    data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
-    (click)="mobileSearchHidden = false; isMenuCollapsed = !isMenuCollapsed">
+    (click)="isMenuCollapsed = !isMenuCollapsed">
    <span class="navbar-toggler-icon"></span>
  </button>
  <a class="navbar-brand d-flex align-items-center me-0 px-3 py-3 order-sm-0"
    [ngClass]="{ 'slim': slimSidebarEnabled, 'col-auto col-md-3 col-lg-2 col-xxxl-1' : !slimSidebarEnabled, 'py-3' : !customAppTitle?.length || slimSidebarEnabled, 'py-2': customAppTitle?.length }"
    routerLink="/dashboard"
    tourAnchor="tour.intro">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">
-      <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1em" height="1.5em" fill="currentColor">
+      <path
+        d="M194.7,0C164.22,70.94,17.64,79.74,64.55,194.06c.58,1.47-10.85,17-18.47,29.9-1.76-6.45-3.81-13.48-3.52-14.07,38.11-45.14-27.26-70.65-30.78-107.58C-4.64,131.62-10.5,182.92,39,212.53c.3,0,2.64,11.14,3.81,16.71a58.55,58.55,0,0,0-2.93,6.45c-1.17,2.93,7.62,2.64,7.62,3.22.88-.29,21.7-36.93,22.28-37.23C187.67,174.72,208.48,68.6,194.7,0ZM134.61,74.75C79.5,124,70.12,160.64,71.88,178.53,53.41,134.85,107.64,86.77,134.61,74.75ZM28.2,145.11c10.55,9.67,28.14,39.28,13.19,56.57C44.91,193.77,46.08,175.89,28.2,145.11Z"
+        transform="translate(0 0)" />
    </svg>
    <div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
      @if (customAppTitle?.length) {
@@ -22,8 +24,7 @@
      }
    </div>
  </a>
-  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-4 me-sm-auto order-3 order-sm-1"
-    [class.mobile-hidden]="mobileSearchHidden">
+  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-4 me-sm-auto order-3 order-sm-1">
    <div class="col-12 col-md-7">
      <pngx-global-search></pngx-global-search>
    </div>
@@ -292,13 +293,13 @@
              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.PaperlessTask }"
              tourAnchor="tour.file-tasks">
              <a class="nav-link" routerLink="tasks" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
+                ngbPopover="File Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
-                <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>Tasks</ng-container>@if (tasksService.needsAttentionTasks.length > 0) {
-                  <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.needsAttentionTasks.length}}</span></span>
+                <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>File Tasks</ng-container>@if (tasksService.failedFileTasks.length > 0) {
+                  <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.failedFileTasks.length}}</span></span>
                }</span>
-                @if (tasksService.needsAttentionTasks.length > 0 && slimSidebarEnabled) {
-                  <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.needsAttentionTasks.length}}</span>
+                @if (tasksService.failedFileTasks.length > 0 && slimSidebarEnabled) {
+                  <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.failedFileTasks.length}}</span>
                }
              </a>
            </li>
@@ -377,7 +378,7 @@
      </div>
    </nav>

-    <main role="main" class="ms-sm-auto px-md-4" [class.mobile-search-hidden]="mobileSearchHidden"
+    <main role="main" class="ms-sm-auto px-md-4"
      [ngClass]="slimSidebarEnabled ? 'col-slim' : 'col-md-9 col-lg-10 col-xxxl-11'">
      <router-outlet></router-outlet>
    </main>
@@ -44,23 +44,6 @@
  .sidebar {
    top: 3.5rem;
  }
-
-  .search-container {
-    max-height: 4.5rem;
-    overflow: hidden;
-    transition: max-height .2s ease, opacity .2s ease, padding-top .2s ease, padding-bottom .2s ease;
-
-    &.mobile-hidden {
-      max-height: 0;
-      opacity: 0;
-      padding-top: 0 !important;
-      padding-bottom: 0 !important;
-    }
-  }
-
-  main.mobile-search-hidden {
-    padding-top: 56px;
-  }
 }

 main {
@@ -94,18 +77,12 @@ main {
  }

  .sidebar.slim:not(.animating) {
-    transition: none;
-
    li.nav-item span,
    .sidebar-heading span {
      display: none;
    }
  }

-  .sidebar.slim:not(.animating) ~ main.col-slim {
-    transition: none;
-  }
-
  .sidebar.animating {
    li.nav-item span,
    .sidebar-heading span {
@@ -36,7 +36,6 @@ import { RemoteVersionService } from 'src/app/services/rest/remote-version.servi
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SearchService } from 'src/app/services/rest/search.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'
@@ -98,7 +97,6 @@ describe('AppFrameComponent', () => {
  let savedViewSpy
  let modalService: NgbModal
  let maybeRefreshSpy
-  let tasksService: TasksService

  beforeEach(async () => {
    TestBed.configureTestingModule({
@@ -176,7 +174,6 @@ describe('AppFrameComponent', () => {
    openDocumentsService = TestBed.inject(OpenDocumentsService)
    modalService = TestBed.inject(NgbModal)
    router = TestBed.inject(Router)
-    tasksService = TestBed.inject(TasksService)

    jest
      .spyOn(settingsService, 'displayName', 'get')
@@ -296,59 +293,6 @@ describe('AppFrameComponent', () => {
    expect(component.isMenuCollapsed).toBeTruthy()
  })

-  it('should hide mobile search when scrolling down and show it when scrolling up', () => {
-    Object.defineProperty(globalThis, 'innerWidth', {
-      value: 767,
-    })
-
-    component.ngOnInit()
-
-    Object.defineProperty(globalThis, 'scrollY', {
-      configurable: true,
-      value: 40,
-    })
-    component.onWindowScroll()
-    expect(component.mobileSearchHidden).toBe(true)
-
-    Object.defineProperty(globalThis, 'scrollY', {
-      configurable: true,
-      value: 0,
-    })
-    component.onWindowScroll()
-    expect(component.mobileSearchHidden).toBe(false)
-  })
-
-  it('should keep mobile search visible on desktop scroll or resize', () => {
-    Object.defineProperty(globalThis, 'innerWidth', {
-      value: 1024,
-    })
-    component.ngOnInit()
-    component.mobileSearchHidden = true
-
-    component.onWindowScroll()
-
-    expect(component.mobileSearchHidden).toBe(false)
-
-    component.mobileSearchHidden = true
-    component.onWindowResize()
-  })
-
-  it('should keep mobile search visible while the mobile menu is expanded', () => {
-    Object.defineProperty(globalThis, 'innerWidth', {
-      value: 767,
-    })
-    component.ngOnInit()
-    component.isMenuCollapsed = false
-
-    Object.defineProperty(globalThis, 'scrollY', {
-      configurable: true,
-      value: 40,
-    })
-    component.onWindowScroll()
-
-    expect(component.mobileSearchHidden).toBe(false)
-  })
-
  it('should support close document & navigate on close current doc', () => {
    const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
    closeSpy.mockReturnValue(of(true))
@@ -447,16 +391,6 @@ describe('AppFrameComponent', () => {
    expect(maybeRefreshSpy).toHaveBeenCalled()
  })

-  it('should show tasks badge for needs-attention tasks', () => {
-    jest
-      .spyOn(tasksService, 'needsAttentionTasks', 'get')
-      .mockReturnValue([{} as any, {} as any])
-
-    fixture.detectChanges()
-
-    expect(fixture.nativeElement.textContent).toContain('Tasks2')
-  })
-
  it('should indicate attributes management availability when any permission is granted', () => {
    jest
      .spyOn(permissionsService, 'currentUserCan')
@@ -51,8 +51,6 @@ import { ComponentWithPermissions } from '../with-permissions/with-permissions.c
 import { GlobalSearchComponent } from './global-search/global-search.component'
 import { ToastsDropdownComponent } from './toasts-dropdown/toasts-dropdown.component'

-const SCROLL_THRESHOLD = 16
-
@Component({
  selector: 'pngx-app-frame',
  templateUrl: './app-frame.component.html',
@@ -96,10 +94,6 @@ export class AppFrameComponent

  slimSidebarAnimating: boolean = false

-  public mobileSearchHidden: boolean = false
-
-  private lastScrollY: number = 0
-
  constructor() {
    super()
    const permissionsService = this.permissionsService
@@ -117,8 +111,6 @@ export class AppFrameComponent
  }

  ngOnInit(): void {
-    this.lastScrollY = window.scrollY
-
    if (this.settingsService.get(SETTINGS_KEYS.UPDATE_CHECKING_ENABLED)) {
      this.checkForUpdates()
    }
@@ -271,38 +263,6 @@ export class AppFrameComponent
    return this.settingsService.get(SETTINGS_KEYS.AI_ENABLED)
  }

-  @HostListener('window:resize')
-  onWindowResize(): void {
-    if (!this.isMobileViewport()) {
-      this.mobileSearchHidden = false
-    }
-  }
-
-  @HostListener('window:scroll')
-  onWindowScroll(): void {
-    const currentScrollY = window.scrollY
-
-    if (!this.isMobileViewport() || this.isMenuCollapsed === false) {
-      this.mobileSearchHidden = false
-      this.lastScrollY = currentScrollY
-      return
-    }
-
-    const delta = currentScrollY - this.lastScrollY
-
-    if (currentScrollY <= 0 || delta < -SCROLL_THRESHOLD) {
-      this.mobileSearchHidden = false
-    } else if (currentScrollY > SCROLL_THRESHOLD && delta > SCROLL_THRESHOLD) {
-      this.mobileSearchHidden = true
-    }
-
-    this.lastScrollY = currentScrollY
-  }
-
-  private isMobileViewport(): boolean {
-    return window.innerWidth < 768
-  }
-
  closeMenu() {
    this.isMenuCollapsed = true
  }
@@ -24,7 +24,7 @@ import {
  FILTER_HAS_DOCUMENT_TYPE_ANY,
  FILTER_HAS_STORAGE_PATH_ANY,
  FILTER_HAS_TAGS_ALL,
-  FILTER_SIMPLE_TEXT,
+  FILTER_TITLE_CONTENT,
 } from 'src/app/data/filter-rule-type'
 import { GlobalSearchType, SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@@ -545,7 +545,7 @@ describe('GlobalSearchComponent', () => {
    component.query = 'test'
    component.runFullSearch()
    expect(qfSpy).toHaveBeenCalledWith([
-      { rule_type: FILTER_SIMPLE_TEXT, value: 'test' },
+      { rule_type: FILTER_TITLE_CONTENT, value: 'test' },
    ])

    settingsService.set(
@@ -25,7 +25,7 @@ import {
  FILTER_HAS_DOCUMENT_TYPE_ANY,
  FILTER_HAS_STORAGE_PATH_ANY,
  FILTER_HAS_TAGS_ALL,
-  FILTER_SIMPLE_TEXT,
+  FILTER_TITLE_CONTENT,
 } from 'src/app/data/filter-rule-type'
 import { ObjectWithId } from 'src/app/data/object-with-id'
 import { GlobalSearchType, SETTINGS_KEYS } from 'src/app/data/ui-settings'
@@ -410,7 +410,7 @@ export class GlobalSearchComponent implements OnInit {
  public runFullSearch() {
    const ruleType = this.useAdvancedForFullSearch
      ? FILTER_FULLTEXT_QUERY
-      : FILTER_SIMPLE_TEXT
+      : FILTER_TITLE_CONTENT
    this.documentService.searchQuery = this.useAdvancedForFullSearch
      ? this.query
      : ''
@@ -8,21 +8,10 @@
      <div class="chat-messages font-monospace small">
        @for (message of messages; track message) {
          <div class="message d-flex flex-row small" [class.justify-content-end]="message.role === 'user'">
-            <div class="p-2 m-2" [class.bg-dark]="message.role === 'user'">
-              <span>
-                {{ message.content }}
-                @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
-              </span>
-              @if (message.role === 'assistant' && message.references?.length) {
-                <div class="chat-references list-group mt-3">
-                  @for (reference of message.references; track reference.id) {
-                    <a class="list-group-item list-group-item-action text-primary" [routerLink]="['/documents', reference.id]">
-                      <i-bs width="0.9em" height="0.9em" name="file-text" class="me-1"></i-bs><span>{{ reference.title }}</span>
-                    </a>
-                  }
-                </div>
-              }
-            </div>
+            <span class="p-2 m-2" [class.bg-dark]="message.role === 'user'">
+              {{ message.content }}
+              @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
+            </span>
          </div>
        }
        <div #scrollAnchor></div>
@@ -7,10 +7,6 @@
  overflow-y: auto;
 }

-.chat-references {
-  font-family: var(--bs-font-sans-serif);
-}
-
 .dropdown-toggle::after {
  display: none;
 }
@@ -3,13 +3,9 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ElementRef } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NavigationEnd, Router } from '@angular/router'
-import { RouterTestingModule } from '@angular/router/testing'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject } from 'rxjs'
-import {
-  CHAT_METADATA_DELIMITER,
-  ChatService,
-} from 'src/app/services/chat.service'
+import { ChatService } from 'src/app/services/chat.service'
 import { ChatComponent } from './chat.component'

 describe('ChatComponent', () => {
@@ -22,11 +18,7 @@ describe('ChatComponent', () => {

  beforeEach(async () => {
    TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        RouterTestingModule,
-        ChatComponent,
-      ],
+      imports: [NgxBootstrapIconsModule.pick(allIcons), ChatComponent],
      providers: [
        provideHttpClient(withInterceptorsFromDi()),
        provideHttpClientTesting(),
@@ -92,57 +84,6 @@ describe('ChatComponent', () => {
    expect(component.messages[1].isStreaming).toBe(false)
  })

-  it('should parse references from the metadata trailer without showing it', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-
-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
-      { id: 42, title: 'Bread Recipe' },
-    ])
-  })
-
-  it('should render document reference links under assistant messages', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-    fixture.detectChanges()
-
-    const link = fixture.nativeElement.querySelector('.chat-references a')
-    expect(link.textContent).toContain('Bread Recipe')
-    expect(link.getAttribute('href')).toContain('/documents/42')
-  })
-
-  it('should remove delimiter fragments that were already streamed', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(`Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`)
-    jest.advanceTimersByTime(1000)
-    expect(component.messages[1].content).toBe(
-      `Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`
-    )
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-
-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
-      { id: 42, title: 'Bread Recipe' },
-    ])
-  })
-
  it('should handle errors during streaming', () => {
    component.input = 'Hello'
    component.sendMessage()
@@ -1,21 +1,16 @@
 import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NavigationEnd, Router, RouterModule } from '@angular/router'
+import { NavigationEnd, Router } from '@angular/router'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { filter, map } from 'rxjs'
-import {
-  ChatMessage,
-  ChatService,
-  parseChatResponse,
-} from 'src/app/services/chat.service'
+import { ChatMessage, ChatService } from 'src/app/services/chat.service'

@Component({
  selector: 'pngx-chat',
  imports: [
    FormsModule,
    ReactiveFormsModule,
-    RouterModule,
    NgxBootstrapIconsModule,
    NgbDropdownModule,
  ],
@@ -75,24 +70,13 @@ export class ChatComponent implements OnInit {
    this.messages.push(assistantMessage)
    this.loading = true

-    let lastVisibleContent = ''
+    let lastPartialLength = 0

    this.chatService.streamChat(this.documentId, this.input).subscribe({
      next: (chunk) => {
-        const nextResponse = parseChatResponse(chunk)
-
-        if (nextResponse.content.length < lastVisibleContent.length) {
-          this.resetTypewriter(assistantMessage, nextResponse.content)
-          lastVisibleContent = nextResponse.content
-        } else {
-          const visibleDelta = nextResponse.content.substring(
-            lastVisibleContent.length
-          )
-          lastVisibleContent = nextResponse.content
-          this.enqueueTypewriter(visibleDelta, assistantMessage)
-        }
-
-        assistantMessage.references = nextResponse.references
+        const delta = chunk.substring(lastPartialLength)
+        lastPartialLength = chunk.length
+        this.enqueueTypewriter(delta, assistantMessage)
      },
      error: () => {
        assistantMessage.content += '\n\n⚠️ Error receiving response.'
@@ -109,13 +93,6 @@ export class ChatComponent implements OnInit {
    this.input = ''
  }

-  private resetTypewriter(message: ChatMessage, content: string): void {
-    this.typewriterBuffer = []
-    this.typewriterActive = false
-    message.content = content
-    this.scrollToBottom()
-  }
-
  enqueueTypewriter(chunk: string, message: ChatMessage): void {
    if (!chunk) return

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shamoon	e5afbccffc	Lint	2026-03-17 11:48:53 -07:00
shamoon	b8faae72ab	Update tests	2026-03-17 11:46:44 -07:00
shamoon	8cff99bef3	Update __init__.py	2026-03-17 11:43:22 -07:00
shamoon	b2bbc2c0ac	Basic option selection	2026-03-17 11:42:17 -07:00
shamoon	03c71c604f	Retry action, basic frontend, cleanup handler	2026-03-17 11:39:53 -07:00
shamoon	fe89ff760b	Move it out of consumer	2026-03-17 11:35:52 -07:00
shamoon	83eabbdf63	Try this	2026-03-17 11:35:11 -07:00
shamoon	24da26959d	Update consumer.py	2026-03-17 11:34:12 -07:00
shamoon	220267099a	Fix tests	2026-03-17 11:34:11 -07:00
shamoon	0f1a529b51	Messing around	2026-03-17 11:33:01 -07:00