Continue with the other RSS feed URIs when one fails

Update translatable texts
[skip ci]
2026-09-12 13:43:05 -04:00 · 2026-09-11 14:35:33 +02:00 · 2026-09-10 10:41:17 +00:00 · 2026-09-10 12:40:40 +02:00 · 2026-09-10 12:37:01 +02:00 · 2026-09-10 12:37:01 +02:00
449 changed files with 79047 additions and 50776 deletions
@@ -0,0 +1,43 @@
+# `git blame` master ignore list.
+#
+# This file contains a list of git hashes of revisions to be ignored
+# by `git blame`. These revisions are considered "unimportant" in
+# that they are unlikely to be what you are interested in when blaming.
+# They are typically expected to be formatting-only changes.
+#
+# It can be used for `git blame` using `--ignore-revs-file` or by
+# setting `blame.ignoreRevsFile` in the `git config`[1].
+#
+# Ignore these commits when reporting with blame. Calling
+#
+#   git blame --ignore-revs-file .git-blame-ignore-revs
+#
+# will tell `git blame` to ignore changes made by these revisions when
+# assigning blame, as if the change never happened.
+#
+# You can enable this as a default for your local repository by
+# running
+#
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+# This will probably be automatically picked by your IDE
+# (VSCode+GitLens and JetBrains products are confirmed to do this).
+#
+# Important: if you are switching to a branch without this file,
+# `git blame` will fail with an error.
+#
+# GitHub also excludes the commits listed below from its "Blame"
+# views[2][3].
+#
+# [1]: https://git-scm.com/docs/git-blame#Documentation/git-blame.txt-blameignoreRevsFile
+# [2]: https://github.blog/changelog/2022-03-24-ignore-commits-in-the-blame-view-beta/
+# [3]: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+
+# Black changes
+465a88154152fb0607a63fa24c8446bff43ec886
+f06891926661986fff52d6eb4b4cb120c71972d1
+9bcbcaefdfecc85aedfd8e2f8aaa1ca7f959404e
+433dcab02b29f7bd3827e237434034deecc1b549
+9f6a9f991222efccc87b45a701086c95629c67b6
+f89114ca7e1b20bf8e645ecd0b52b707ec857aa9
@@ -0,0 +1,32 @@
+name: Bug report
+description: >
+  Did you discover a bug in SABnzbd? Report it here!
+  If you are not 100% certain this is a bug please go to our forums, Reddit or Discord server first.
+labels:
+  - Support
+type: bug
+body:
+  - type: input
+    attributes:
+      label: SABnzbd version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Using Docker image
+      options:
+        - linuxserver
+        - hotio
+        - binhex
+        - Other
+  - type: textarea
+    attributes:
+      label: Description
+      description: Include error logs directly or link to extended logs on https://pastebin.com/
+    validations:
+      required: true
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support forum
+    url: https://forums.sabnzbd.org/
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Discord
+    url: https://discord.sabnzbd.org
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Reddit - r/sabnzbd
+    url: https://www.reddit.com/r/sabnzbd
+    about: Support questions can be asked on our forums, Reddit or Discord server.
@@ -0,0 +1,11 @@
+name: Feature request
+description: What new feature would you like to have added to SABnzbd?
+labels:
+  - Support
+type: feature
+body:
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true
@@ -0,0 +1,69 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":disableDependencyDashboard"
+  ],
+  "schedule": [
+    "before 8am on Monday"
+  ],
+  "minimumReleaseAge": "14 days",
+  "baseBranches": ["develop"],
+  "pip_requirements": {
+    "fileMatch": [
+      "requirements.txt",
+      "tests/requirements.txt",
+      "builder/requirements.txt",
+      "builder/release-requirements.txt"
+    ]
+  },
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": ["^\\.github/workflows/build_release\\.yml$"],
+      "matchStrings": ["PYTHON_VERSION:\\s*\"(?<currentValue>.*?)\""],
+      "datasourceTemplate": "python-version",
+      "depNameTemplate": "python"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["^sabnzbd/constants\\.py$"],
+      "matchStrings": ["SABCTOOLS_VERSION_REQUIRED\\s*=\\s*\"(?<currentValue>.*?)\""],
+      "datasourceTemplate": "pypi",
+      "depNameTemplate": "sabctools"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["^\\.github/workflows/translations\\.yml$"],
+      "matchStrings": ["TX_VERSION=\"(?<currentValue>.*?)\""],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "transifex/cli"
+    }
+  ],
+  "ignorePaths": [],
+  "ignoreDeps": [
+    "jaraco.text",
+    "jaraco.context",
+    "jaraco.collections",
+    "tempora",
+    "cryptography"
+  ],
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "matchPackageNames": ["windows", "macos"],
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "*"
+      ],
+      "groupName": "all dependencies",
+      "groupSlug": "all",
+      "separateMajorMinor": false,
+      "automerge": true
+    }
+  ],
+  "automergeStrategy": "squash",
+  "platformAutomerge": true
+}
@@ -1,23 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 21
-
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Feature request"
-  - "Work in progress"
-  - "Bug"
-
-# Label to use when marking an issue as stale
-staleLabel: "Stale"
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
@@ -1,22 +0,0 @@
-name: Black Code Formatter
-on: [push, pull_request]
-
-jobs:
-  black:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Black Code Formatter
-      uses: lgeiger/black-action@master
-      with:
-          args: >
-            SABnzbd.py
-            sabnzbd
-            scripts
-            tools
-            builder
-            tests
-            --line-length=120
-            --target-version=py36
-            --check
-            --diff
@@ -2,113 +2,221 @@ name: Build binaries and source distribution

 on: [push, pull_request]

+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  # Setting PYTHONNODEBUGRANGES reduces binary size
+  PYTHONNODEBUGRANGES: 1
+  # For macOS we download the official Python, because the GitHub one only support newer macOS 11+ versions
+  # We also use the specific pin for Windows release, so Renovate can update it all at once
+  PYTHON_VERSION: "3.14.7"
+
 jobs:
  build_windows:
-    name: Build Windows binary
-    runs-on: windows-latest
-    env:
-      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+    name: Build Windows binary (${{ matrix.architecture }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - architecture: x64
+            runs-on: windows-2022
+          - architecture: arm64
+            runs-on: windows-11-arm
+
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: 15
    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9 (64bit)
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v7
+    - name: Set up Python
+      uses: actions/setup-python@v7
      with:
-        python-version: 3.9
-        architecture: x64
-    - name: Install Python dependencies (64bit)
+        python-version: ${{ env.PYTHON_VERSION }}
+        architecture: ${{ matrix.architecture }}
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
+    - name: Install Python dependencies
+      # Without dependencies to make sure everything is covered in the requirements.txt
+      # Special settings:
+      #   cryptography see https://github.com/pyca/cryptography/pull/14216
      run: |
        python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
-    - name: Build source distribution
-      run: python builder/package.py source
-    - name: Upload source distribution
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*-src.tar.gz"
-        name: Source distribution
-    - name: Build Windows standalone binary and installer (64bit)
-      run: python builder/package.py installer
-    - name: Upload Windows standalone binary (64bit)
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*-win64-bin.zip"
-        name: Windows Windows standalone binary (64bit)
-    - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*-win-setup.exe"
-        name: Windows installer
-    - name: Set up Python 3.8 (32bit and legacy)
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-        architecture: x86
-    - name: Install Python dependencies (32bit and legacy)
-      run: |
-        python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
-    - name: Build Windows standalone binary (32bit and legacy)
+        python -m pip install --upgrade pip wheel
+        pip install -r requirements.txt --no-dependencies --only-binary=cryptography
+        pip install -r builder/requirements.txt --no-dependencies
+    - name: Build Windows standalone binary
+      id: windows_binary
      run: python builder/package.py binary
-    - name: Upload Windows standalone binary (32bit and legacy)
-      uses: actions/upload-artifact@v2
+    - name: Upload Windows standalone binary (unsigned)
+      # When releasing, SignPath consumes this artifact directly and requires the
+      # zip-in-zip layout because they don't support the archive-flag
+      uses: actions/upload-artifact@v7
+      id: upload-unsigned-binary
      with:
-        path: "*-win32-bin.zip"
-        name: Windows Windows standalone binary (32bit and legacy)
-    - name: Prepare official release
-      if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python builder/package.py release
+        archive: ${{ contains(github.ref, 'refs/tags/') }}
+        path: "*-win*-bin.zip"
+        name: Windows standalone binary (${{ matrix.architecture }})
+    - name: Sign Windows standalone binary
+      uses: signpath/github-action-submit-signing-request@v2
+      if: contains(github.ref, 'refs/tags/')
+      with:
+        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
+        project-slug: "sabnzbd"
+        artifact-configuration-slug: "sabnzbd-binary"
+        signing-policy-slug: "release-signing"
+        github-artifact-id: ${{ steps.upload-unsigned-binary.outputs.artifact-id }}
+        wait-for-completion: true
+        output-artifact-directory: "signed"
+    - name: Upload Windows standalone binary (signed)
+      # The release file is a .zip, which download-artifact would extract if
+      # uploaded raw, so keep it archived and let the release job unpack it
+      uses: actions/upload-artifact@v7
+      if: contains(github.ref, 'refs/tags/')
+      with:
+        name: Windows standalone binary (${{ matrix.architecture }}, signed)
+        path: "signed/*-win*-bin.zip"
+    - name: Build Windows installer
+      if: matrix.architecture == 'x64'
+      run: python builder/package.py installer
+    - name: Upload Windows installer
+      if: matrix.architecture == 'x64'
+      uses: actions/upload-artifact@v7
+      id: upload-unsigned-installer
+      with:
+        archive: ${{ contains(github.ref, 'refs/tags/') }}
+        path: "*-win-setup.exe"
+        name: Windows installer (${{ matrix.architecture }})
+    - name: Sign Windows installer
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
+      uses: signpath/github-action-submit-signing-request@v2
+      with:
+        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+        organization-id: ${{ secrets.SIGNPATH_ORG_ID }}
+        project-slug: "sabnzbd"
+        artifact-configuration-slug: "sabnzbd-installer"
+        signing-policy-slug: "release-signing"
+        github-artifact-id: ${{ steps.upload-unsigned-installer.outputs.artifact-id }}
+        wait-for-completion: true
+        output-artifact-directory: "signed"
+    - name: Upload Windows installer (signed)
+      if: matrix.architecture == 'x64' && contains(github.ref, 'refs/tags/')
+      uses: actions/upload-artifact@v7
+      with:
+        archive: false
+        path: "signed/*-win-setup.exe"

  build_macos:
    name: Build macOS binary
-    runs-on: macos-latest
+    runs-on: macos-14
+    timeout-minutes: 15
    env:
-      SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
-      NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
-      NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
-      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
-      # We need the official Python, because the GA ones only support newer macOS versions
      # The deployment target is picked up by the Python build tools automatically
      # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: 3.9.5
-      MACOSX_DEPLOYMENT_TARGET: 10.9
+      MACOSX_DEPLOYMENT_TARGET: "10.15"
+      # We need to force compile for universal2 support
+      CFLAGS: -arch x86_64 -arch arm64
+      ARCHFLAGS: -arch x86_64 -arch arm64
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
+    - name: Set up Python
+      # Only use this for the caching of pip packages!
+      uses: actions/setup-python@v7
+      with:
+        python-version: "3.14"
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
    - name: Cache Python download
      id: cache-python-download
-      uses: actions/cache@v2
+      uses: actions/cache@v6
      with:
        path: ~/python.pkg
-        key: macOS-Python-${{ env.PYTHON_VERSION }}
-    - name: Get Python
+        key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
+    - name: Get Python from python.org
      if: steps.cache-python-download.outputs.cache-hit != 'true'
-      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macosx10.9.pkg -o ~/python.pkg
+      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o ~/python.pkg
    - name: Install Python
      run: sudo installer -pkg ~/python.pkg -target /
    - name: Install Python dependencies
+      # We have to manually compile some modules as they don't automatically fetch universal2 binaries
      run: |
        python3 --version
        pip3 install --upgrade pip wheel
-        pip3 install --upgrade -r requirements.txt
-        pip3 install --upgrade -r builder/requirements.txt
+        pip3 install -r requirements.txt --no-binary cffi,CT3,PyYAML,httptools --no-dependencies
+        pip3 install -r builder/requirements.txt --no-dependencies
    - name: Import macOS codesign certificates
-      uses: apple-actions/import-codesign-certs@v1
-      if: env.SIGNING_AUTH
-      with:
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
-    - name: Build macOS binary
+      # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
+      env:
+        CERTIFICATES_P12: ${{ secrets.CERTIFICATES_P12 }}
+        CERTIFICATES_P12_PASSWORD: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        MACOS_KEYCHAIN_TEMP_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_TEMP_PASSWORD }}
+      if: env.CERTIFICATES_P12
      run: |
-        python3 builder/package.py app
-        python3 builder/make_dmg.py
-    - name: Upload macOS binary
-      uses: actions/upload-artifact@v2
+        echo $CERTIFICATES_P12 | base64 --decode > certificate.p12
+        security create-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
+        security default-keychain -s build.keychain
+        security unlock-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
+        security set-keychain-settings -lut 21600 build.keychain
+        security import certificate.p12 -k build.keychain -P "$CERTIFICATES_P12_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productsign -T /usr/bin/xcrun
+        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain
+    - name: Build source distribution
+      # Run this on macOS so the line endings are correct by default
+      run: python builder/package.py source
+    - name: Upload source distribution
+      uses: actions/upload-artifact@v7
      with:
-        path: "*-osx.dmg"
-        name: macOS binary (not notarized)
-    - name: Prepare official release
-      if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python3 builder/package.py release
+        archive: false
+        path: "*-src.tar.gz"
+    - name: Build macOS binary
+      env:
+        SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
+        NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
+        NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
+      run: |
+        python3 builder/package.py app dmg
+    - name: Upload macOS binary
+      uses: actions/upload-artifact@v7
+      with:
+        archive: false
+        path: "*-macos.dmg"
+
+  release:
+    name: Prepare Release
+    runs-on: ubuntu-latest
+    needs: [build_windows, build_macos]
+    if: contains(github.ref, 'refs/tags/')
+    environment: release
+    steps:
+      - uses: actions/checkout@v7
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.14"
+          cache: pip
+          cache-dependency-path: "builder/release-requirements.txt"
+      - name: Download release artifacts
+        # The installer, source and macOS builds are uploaded with archive: false,
+        # so their artifact name is the release filename
+        uses: actions/download-artifact@v8
+        with:
+          pattern: "SABnzbd-*"
+          merge-multiple: true
+      - name: Download signed Windows binaries
+        # These stay archived (.zip release files), so download-artifact unpacks
+        # them back into the release .zip
+        uses: actions/download-artifact@v8
+        with:
+          pattern: "*signed*"
+          merge-multiple: true
+      - name: Prepare official release
+        env:
+          AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+          REDDIT_TOKEN: ${{ secrets.REDDIT_TOKEN }}
+          LINUXSERVER_WEBHOOK_TOKEN: ${{ secrets.LINUXSERVER_WEBHOOK_TOKEN }}
+          DISCORD_WEBHOOK_TESTING: ${{ secrets.DISCORD_WEBHOOK_TESTING }}
+          DISCORD_WEBHOOK_STABLE: ${{ secrets.DISCORD_WEBHOOK_STABLE }}
+        run: |
+          pip3 install -r builder/release-requirements.txt --no-dependencies
+          python3 builder/release.py
@@ -0,0 +1,91 @@
+name: Build and publish Snap packages
+
+on:
+  push:
+    paths:
+      - 'snap/**'
+      - 'requirements.txt'
+      - '.github/workflows/build_snaps.yml'
+  pull_request:
+    paths:
+      - 'snap/**'
+      - 'requirements.txt'
+      - '.github/workflows/build_snaps.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-snap:
+    name: Build Snap Packages (${{ matrix.linux_arch }})
+    timeout-minutes: 30
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            linux_arch: x64
+          - os: ubuntu-24.04-arm
+            linux_arch: arm64
+
+    steps:
+      - uses: actions/checkout@v7
+      - name: Cache par2cmdline-turbo tarball
+        uses: actions/cache@v6
+        id: cache-par2cmdline
+        # Clearing the cache in case of new version requires manual clearing in GitHub!
+        with:
+          path: snap/par2cmdline.tar.gz
+          key: cache-par2cmdline
+      - name: Download par2cmdline-turbo tarball
+        if: steps.cache-par2cmdline.outputs.cache-hit != 'true'
+        run: |
+          PAR2_TARBALL=$(curl -sL https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest | jq -r '.tarball_url')
+          curl -o snap/par2cmdline.tar.gz -L "$PAR2_TARBALL"
+      - uses: snapcore/action-build@v1
+        name: Build snap
+        id: snapcraft
+      - name: Test snap installation
+        run: |
+          sudo snap install --dangerous *.snap
+          sudo snap connect sabnzbd:removable-media
+          # Installing a daemon snap starts the service automatically. 
+          if ! curl -fsSL -o /dev/null \
+              --retry 30 --retry-delay 2 --retry-connrefused --retry-all-errors \
+              http://127.0.0.1:8080/; then
+            echo "::error::SABnzbd web UI did not come up"
+            sudo snap logs sabnzbd -n 200 || true
+            systemctl status snap.sabnzbd.sabnzbd.service --no-pager || true
+            exit 1
+          fi
+          echo "SABnzbd web UI responded"
+          sudo snap remove sabnzbd
+      - name: Upload snap
+        uses: actions/upload-artifact@v7
+        with:
+          name: Snap package (${{ matrix.linux_arch }})
+          path: ${{ steps.snapcraft.outputs.snap }}
+      - name: Determine snap channel
+        if: contains(github.ref, 'refs/tags/')
+        id: snap-channel
+        run: |
+          TAG="${GITHUB_REF#refs/tags/}"
+          if [[ "$TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "channel=stable,beta" >> "$GITHUB_OUTPUT"
+          else
+            echo "channel=beta" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Publish snap
+        uses: snapcore/action-publish@v1
+        if: contains(github.ref, 'refs/tags/')
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
+        with:
+          store_login: ${{ secrets.SNAP_TOKEN }}
+          snap: ${{ steps.snapcraft.outputs.snap }}
+          release: ${{ steps.snap-channel.outputs.channel }}
@@ -0,0 +1,32 @@
+name: "Claude Review (manual)"
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: read
+
+jobs:
+  review:
+    name: "Review PR on @claude mention"
+    # Only PR comments containing @claude, and only from maintainers
+    if: >
+      github.repository_owner == 'sabnzbd' &&
+      github.event.issue.pull_request &&
+      contains(github.event.comment.body, '@claude') &&
+      contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          # Full history so the review can diff the PR against its base branch
+          fetch-depth: 0
+      - uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          # Actual triggering is gated by the job-level `if` above; this disables
+          # the action's internal write-permission check, which contributors fail
+          allowed_non_write_users: "*"
@@ -2,38 +2,72 @@ name: CI Tests

 on: [push, pull_request]

+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
 jobs:
+  black-and-ruff:
+    name: Black and Ruff checks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - run: pip install ruff black
+      - name: Black code formatter
+        run: >
+          black
+          SABnzbd.py
+          sabnzbd
+          scripts
+          builder
+          builder/SABnzbd.spec
+          tests
+          tools
+          --check
+          --diff
+      - name: Ruff checks
+        run: ruff check
+
  test:
    name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
    strategy:
+      fail-fast: false
      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-20.04]
+        # TODO: Remove libxml2-dev libxslt-dev below once 3.15 is stable and lxml releases wheels!
+        python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev" ]
+        name: ["Linux"]
+        os: [ubuntu-latest]
        include:
          - name: macOS
            os: macos-latest
-            python-version: 3.9
+            python-version: "3.14"
          - name: Windows
-            os: windows-latest
-            python-version: 3.9
+            os: windows-2022
+            python-version: "3.14"

    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v7
      with:
        python-version: ${{ matrix.python-version }}
+        cache: pip
+        cache-dependency-path: "**/requirements.txt"
    - name: Install system dependencies
      if: runner.os == 'Linux'
-      run: sudo apt-get install unrar p7zip-full par2 chromium-chromedriver
+      run: sudo apt-get install unrar 7zip par2 libxml2-dev libxslt-dev
    - name: Install Python dependencies
      run: |
        python --version
-        pip install --upgrade pip
-        pip install --upgrade -r requirements.txt
+        python -m pip install --upgrade pip wheel
+        pip install -r requirements.txt --no-dependencies
        pip install --upgrade -r tests/requirements.txt
+    - name: Install Playwright browser
+      run: python -m playwright install chromium --with-deps
    - name: Test SABnzbd
-      run: pytest -s
-
-
+      run: pytest -n auto --dist loadscope
@@ -0,0 +1,37 @@
+name: "Close and lock old issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    name: "Close stale issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v11
+        with:
+          days-before-stale: 21
+          days-before-close: 7
+          stale-issue-label: "Stale"
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          only-issue-labels: "Support"
+
+  lock:
+    name: "Lock old issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v6
+        with:
+          log-output: true
+          issue-inactive-days: 60
+          pr-inactive-days: 60
@@ -5,32 +5,54 @@ on:
    branches:
    - develop

+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
 jobs:
  translations:
+    name: Update translatable texts
    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      TX_TOKEN: ${{ secrets.TX_TOKEN }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
+        with:
+          # Need the parent commit too so we can diff HEAD and detect local translation edits
+          fetch-depth: 2
      - name: Generate translatable texts
        run: |
          python3 tools/extract_pot.py
-      - name: Install Transifex client
-        # Sudo is needed to link the "tx"-command
-        run: |
-          sudo -H python3 -m pip install setuptools wheel
-          sudo -H python3 -m pip install transifex-client
      - name: Push/pull Transifex translations
+        if: env.TX_TOKEN
+        # We use fixed version and manual download (instead of their sh script) to prevent potential supply-chain attack.
+        # Changes are commited directly to the repo, so this is quite sensative and worth the extra hassle!
+        # When the current commit contains local translation edits (changes to po/**/*.po), we add --translation so
+        # those edits are pushed to Transifex. Note: this overwrites the matching translations in Transifex with our
+        # local versions, so we only do it when local .po files actually changed.
        run: |
-          tx push --source --parallel
-          tx pull --all --force --parallel
-        env:
-          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+          TX_VERSION="v1.6.17"
+          curl -fsSL "https://github.com/transifex/cli/releases/download/${TX_VERSION}/tx-linux-amd64.tar.gz" -o tx-linux-amd64.tar.gz
+          tar -xzf tx-linux-amd64.tar.gz
+          PUSH_ARGS="--source"
+          if git show --name-only --format= HEAD | grep -qE '^po/.+\.po$'; then
+            echo "Local translation edits detected; also pushing translations to Transifex."
+            PUSH_ARGS="--source --translation"
+          fi
+          ./tx push ${PUSH_ARGS}
+          ./tx pull --all --force
      - name: Compile translations to validate them
        run: |
          python3 tools/make_mo.py
      - name: Push translatable and translated texts back to repo
-        uses: stefanzweifel/git-auto-commit-action@v4.5.1
-        with:
-          commit_message: Update translatable texts
-          commit_user_name: SABnzbd Automation
-          commit_user_email: bugs@sabnzbd.org
-          commit_author: SABnzbd Automation <bugs@sabnzbd.org>
+        if: env.TX_TOKEN
+        run: |
+          git config user.name "SABnzbd Automation"
+          git config user.email "bugs@sabnzbd.org"
+          git add po/*.pot po/*.po *.nsi
+          git diff --cached --quiet || git commit -m "Update translatable texts" -m "[skip ci]"
+          git push
@@ -0,0 +1,201 @@
+name: Update bundled tools
+
+on:
+  schedule:
+    # Nightly check for new releases of the bundled tools
+    - cron: "30 4 * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  unrar:
+    name: Update unrar
+    if: github.repository == 'sabnzbd/sabnzbd'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      BRANCH: automation/update-unrar
+    steps:
+      - uses: actions/checkout@v7
+      - name: Determine latest unrar version
+        id: version
+        run: |
+          RAW_VERSION=$(curl -fsSL --retry 3 https://www.rarlab.com/download.htm -o- | sed -n 's%.*/rarmacos-x64-\([0-9]\+\)\.tar\.gz.*%\1%p' | head -1)
+          if [ -z "$RAW_VERSION" ]; then
+            echo "Could not determine the latest unrar version from the rarlab download page"
+            exit 1
+          fi
+          # Version is encoded without separator, e.g. 723 = 7.23
+          VERSION="${RAW_VERSION%??}.${RAW_VERSION: -2}"
+          echo "Latest unrar version: $VERSION"
+          echo "raw_version=$RAW_VERSION" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+      - name: Download and extract new binaries
+        env:
+          RAW_VERSION: ${{ steps.version.outputs.raw_version }}
+        run: |
+          mkdir -p "$RUNNER_TEMP/unrar"
+          cd "$RUNNER_TEMP/unrar"
+          for FILE in "rarmacos-x64-$RAW_VERSION.tar.gz" "rarmacos-arm-$RAW_VERSION.tar.gz" "winrar-x64-$RAW_VERSION.exe"; do
+            curl -fsSL --retry 3 -o "$FILE" "https://www.rarlab.com/rar/$FILE"
+          done
+          mkdir macos-x64 macos-arm64 windows
+          tar -xzf "rarmacos-x64-$RAW_VERSION.tar.gz" -C macos-x64
+          tar -xzf "rarmacos-arm-$RAW_VERSION.tar.gz" -C macos-arm64
+          # Unpack UnRAR.exe from the WinRAR installer, which is a self-extracting
+          # RAR archive that the preinstalled 7-Zip can read
+          7z x -y -owindows "winrar-x64-$RAW_VERSION.exe" UnRAR.exe > /dev/null
+      - name: Copy binaries into the repository
+        run: |
+          install -m 755 "$RUNNER_TEMP/unrar/macos-x64/rar/unrar" macos/unrar/unrar
+          install -m 755 "$RUNNER_TEMP/unrar/macos-arm64/rar/unrar" macos/unrar/arm64/unrar
+          install -m 755 "$RUNNER_TEMP/unrar/windows/UnRAR.exe" win/unrar/UnRAR.exe
+      - name: Create pull request
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          if git diff --quiet; then
+            echo "Bundled unrar is already at version $VERSION"
+            exit 0
+          fi
+          git config user.name "SABnzbd Automation"
+          git config user.email "bugs@sabnzbd.org"
+          git add macos/unrar win/unrar
+          git commit -m "unrar $VERSION"
+          # Skip the push if an open PR already contains these exact binaries
+          OPEN_PRS=$(gh pr list --head "$BRANCH" --state open --json number --jq length)
+          if [ "$OPEN_PRS" != "0" ] && git fetch origin "$BRANCH" && git diff --quiet FETCH_HEAD HEAD -- macos/unrar win/unrar; then
+            echo "Existing pull request already updates unrar to $VERSION"
+            exit 0
+          fi
+          git push --force origin "HEAD:refs/heads/$BRANCH"
+          if [ "$OPEN_PRS" = "0" ]; then
+            gh pr create --head "$BRANCH" --title "unrar $VERSION" --body "Automated update of the bundled unrar binaries to version $VERSION.
+
+          [Changelog](https://www.rarlab.com/rarnew.htm)"
+          fi
+
+  sevenzip:
+    name: Update 7-Zip
+    if: github.repository == 'sabnzbd/sabnzbd'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      BRANCH: automation/update-7zip
+    steps:
+      - uses: actions/checkout@v7
+      - name: Determine latest 7-Zip version
+        id: version
+        run: |
+          VERSION=$(gh api repos/ip7z/7zip/releases/latest --jq .tag_name)
+          # Assets are named without separator, e.g. 7z2602-extra.7z for 26.02
+          RAW_VERSION="${VERSION//./}"
+          echo "Latest 7-Zip version: $VERSION"
+          echo "raw_version=$RAW_VERSION" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+      - name: Download and extract new binaries
+        env:
+          RAW_VERSION: ${{ steps.version.outputs.raw_version }}
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          mkdir -p "$RUNNER_TEMP/7zip"
+          cd "$RUNNER_TEMP/7zip"
+          gh release download "$VERSION" --repo ip7z/7zip \
+            --pattern "7z$RAW_VERSION-extra.7z" --pattern "7z$RAW_VERSION-mac.tar.xz"
+          mkdir macos windows
+          tar -xJf "7z$RAW_VERSION-mac.tar.xz" -C macos
+          # The preinstalled 7-Zip unpacks the extra package that contains
+          # the standalone Windows console version
+          7z x -y -owindows "7z$RAW_VERSION-extra.7z" 7za.exe > /dev/null
+      - name: Copy binaries into the repository
+        run: |
+          install -m 644 "$RUNNER_TEMP/7zip/windows/7za.exe" win/7zip/7za.exe
+          install -m 755 "$RUNNER_TEMP/7zip/macos/7zz" macos/7zip/7zz
+      - name: Create pull request
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          if git diff --quiet; then
+            echo "Bundled 7-Zip is already at version $VERSION"
+            exit 0
+          fi
+          git config user.name "SABnzbd Automation"
+          git config user.email "bugs@sabnzbd.org"
+          git add macos/7zip win/7zip
+          git commit -m "7-Zip $VERSION"
+          # Skip the push if an open PR already contains these exact binaries
+          OPEN_PRS=$(gh pr list --head "$BRANCH" --state open --json number --jq length)
+          if [ "$OPEN_PRS" != "0" ] && git fetch origin "$BRANCH" && git diff --quiet FETCH_HEAD HEAD -- macos/7zip win/7zip; then
+            echo "Existing pull request already updates 7-Zip to $VERSION"
+            exit 0
+          fi
+          git push --force origin "HEAD:refs/heads/$BRANCH"
+          if [ "$OPEN_PRS" = "0" ]; then
+            gh pr create --head "$BRANCH" --title "7-Zip $VERSION" --body "Automated update of the bundled 7-Zip binaries to version $VERSION.
+
+          [Release notes](https://github.com/ip7z/7zip/releases/tag/$VERSION)"
+          fi
+
+  par2:
+    name: Update par2cmdline-turbo
+    if: github.repository == 'sabnzbd/sabnzbd'
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      BRANCH: automation/update-par2
+    steps:
+      - uses: actions/checkout@v7
+      - name: Determine latest par2cmdline-turbo version
+        id: version
+        run: |
+          TAG=$(gh api repos/animetosho/par2cmdline-turbo/releases/latest --jq .tag_name)
+          # Assets are named without the leading v, e.g. par2cmdline-turbo-1.4.0-win-x64.zip for tag v1.4.0
+          VERSION="${TAG#v}"
+          echo "Latest par2cmdline-turbo version: $VERSION"
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+      - name: Download and extract new binaries
+        env:
+          TAG: ${{ steps.version.outputs.tag }}
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          mkdir -p "$RUNNER_TEMP/par2"
+          cd "$RUNNER_TEMP/par2"
+          for ARCH in win-x64 win-arm64 macos-universal; do
+            gh release download "$TAG" --repo animetosho/par2cmdline-turbo \
+              --pattern "par2cmdline-turbo-$VERSION-$ARCH.zip"
+            unzip -q -d "$ARCH" "par2cmdline-turbo-$VERSION-$ARCH.zip"
+          done
+      - name: Copy binaries into the repository
+        run: |
+          install -m 644 "$RUNNER_TEMP/par2/win-x64/par2.exe" win/par2/par2.exe
+          install -m 644 "$RUNNER_TEMP/par2/win-arm64/par2.exe" win/par2/arm64/par2.exe
+          install -m 755 "$RUNNER_TEMP/par2/macos-universal/par2" macos/par2/par2
+      - name: Create pull request
+        env:
+          TAG: ${{ steps.version.outputs.tag }}
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          if git diff --quiet; then
+            echo "Bundled par2cmdline-turbo is already at version $VERSION"
+            exit 0
+          fi
+          git config user.name "SABnzbd Automation"
+          git config user.email "bugs@sabnzbd.org"
+          git add macos/par2 win/par2
+          git commit -m "par2cmdline-turbo $VERSION"
+          # Skip the push if an open PR already contains these exact binaries
+          OPEN_PRS=$(gh pr list --head "$BRANCH" --state open --json number --jq length)
+          if [ "$OPEN_PRS" != "0" ] && git fetch origin "$BRANCH" && git diff --quiet FETCH_HEAD HEAD -- macos/par2 win/par2; then
+            echo "Existing pull request already updates par2cmdline-turbo to $VERSION"
+            exit 0
+          fi
+          git push --force origin "HEAD:refs/heads/$BRANCH"
+          if [ "$OPEN_PRS" = "0" ]; then
+            gh pr create --head "$BRANCH" --title "par2cmdline-turbo $VERSION" --body "Automated update of the bundled par2cmdline-turbo binaries to version $VERSION.
+
+          [Release notes](https://github.com/animetosho/par2cmdline-turbo/releases/tag/$TAG)"
+          fi
@@ -29,25 +29,20 @@ SABnzbd-*/

 # WingIDE/PyCharm project files
 *.wp[ru]
-.idea
-
-# VScode
-.vscode/

 # Testing folders
-.cache
-.xprocess
-.pytest*
 tests/cache
+tests/cache_gw*

 # General junk
 *.keep
 *.bak
 *.log

-# Some people use Emacs as an editor
-\#*
-.\#*
+# Ignore all hidden directories at repo root, except used ones
+.*/
+!.github/
+!.tx/

 # Apple
 .DS_Store
@@ -1,24 +1,23 @@
 [main]
 host = https://www.transifex.com

-[sabnzbd-translations.po-main-sabnzbd-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-main-sabnzbd-pot--develop]
 file_filter = po/main/<lang>.po
 minimum_perc = 0
 source_file = po/main/SABnzbd.pot
 source_lang = en
 type = PO

-[sabnzbd-translations.po-email-sabemail-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-email-sabemail-pot--develop]
 file_filter = po/email/<lang>.po
 minimum_perc = 0
 source_file = po/email/SABemail.pot
 source_lang = en
 type = PO

-[sabnzbd-translations.po-nsis-sabnsis-pot--develop]
+[o:sabnzbd:p:sabnzbd-translations:r:po-nsis-sabnsis-pot--develop]
 file_filter = po/nsis/<lang>.po
 minimum_perc = 0
 source_file = po/nsis/SABnsis.pot
 source_lang = en
 type = PO
-
@@ -1,10 +1,11 @@

-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2026 by The SABnzbd-Team (sabnzbd.org)

-The SABnzbd-team is:
+The SABnzbd-Team is:

 Active team:
    Safihre
+    mnightingale
    sanderjo
    jcfp
    inpheaux
@@ -17,21 +18,8 @@ Sleeping members:
 Honorary member (and original author):
    Gregor Kaufmann

-The main contributors and moderators of the translations:
-    Danish: Rene (nordjyden6), Scott
-    Dutch: ShyPike, Safihre
-    French: rAf, Fox Ace, Fred, Morback, Jih
-    German: Severin Heiniger, Tim Hartmann, DonPizza, Alex
-    Norwegian: Protx, mjelva, TomP, John
-    Romanian: nicusor
-    Serbian: Ozzii, Krišan Darko
-    Swedish: Malmis, Kim Joahnsson, Patrik-liind, Chris M
-    Spanish: Syquus, Adolfo Jayme
-    Portuguese (Brazil): lrrosa, diegosps
-    Russian: Pavel Maryanov
-    Polish: Tomasz 'Zen' Napierala
-    Chinese: XsLiDian
-    Finnish: Matti Ylönen
+The contributors and moderators of the translations are credited in the
+header of each translation file in the po/ directory.

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -44,7 +32,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.

 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+along with this program; if not, see <https://www.gnu.org/licenses/>.

 See accompanying files GPL2.txt and GPL3.txt.
@@ -1,110 +0,0 @@
-                                    SABnzbd
-
-------------------------------------------------------------------------------
-0) LICENSE
-------------------------------------------------------------------------------
-
-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-------------------------------------------------------------------------------
-1) INSTALL with the Windows installer
-------------------------------------------------------------------------------
-Just run the downloaded EXE file and the installer will start.
-It's just a simple standard installer.
-After installation, find the SABnzbd program in the Start menu and start it.
-
-Within a few seconds your web browser will start and show the user interface.
-Use the "Help" button in the web-interface to be directed to the Help Wiki.
-
-------------------------------------------------------------------------------
-2) INSTALL pre-built Windows binaries
-------------------------------------------------------------------------------
-Unzip pre-built version to any folder of your liking.
-Start the SABnzbd.exe program.
-Within a few seconds your web browser will start and show the user interface.
-Use the "Help" button in the web-interface to be directed to the Help Wiki.
-
-------------------------------------------------------------------------------
-3) INSTALL pre-built macOS binaries
-------------------------------------------------------------------------------
-Download the DMG file, mount and drag the SABnzbd icon to Applications.
-Just like you do with so many apps.
-
-------------------------------------------------------------------------------
-4) INSTALL with only sources
-------------------------------------------------------------------------------
-
-Specific guides to install from source are available for Windows and macOS:
-    https://sabnzbd.org/wiki/installation/install-macos
-    https://sabnzbd.org/wiki/installation/install-from-source-windows
-
-Only Python 3.6 and above is supported.
-
-On Linux systems you need to install:
-    par2 unrar unzip python3-setuptools python3-pip
-
-On non-X86 platforms, for which PyPI does not provide all pre-compiled packages,
-you also need to install these development libraries (exact names might differ per platform):
-    libffi-dev libssl-dev
-
-Unpack the ZIP-file containing the SABnzbd sources to any folder of your liking.
-
-Inside the SABnzbd source directory, install all required Python packages by running:
-    python3 -m pip install -r requirements.txt
-
-If you want non-English languages, you need to compile the translations.
-Start this from a shell terminal (or command prompt):
-    python3 tools/make_mo.py
-
-To start SABnzbd, run this from a shell terminal (or command prompt):
-    python3 -OO SABnzbd.py
-
-Within a few seconds your web browser will start and show the user interface.
-Use the "Help" button in the web-interface to be directed to the Help Wiki.
-
-------------------------------------------------------------------------------
-5) TROUBLESHOOTING
-------------------------------------------------------------------------------
-
-Your browser may start up with just an error page.
-
-This means that SABnzbd cannot use the default port 8080 to run its web-server on.
-Try to use another port, you'll need to use the a command window:
-    SABnzbd.exe -s localhost:7777
-or
-    python3 SABnzbd.py -s localhost:7777
-
-You may of course try other port numbers too.
-
-For troubleshooting on Windows you can use the program SABnzbd-console.exe.
-This will show a black window where logging information will be shown. This
-may help you solve problems easier.
-
-------------------------------------------------------------------------------
-6) MORE INFORMATION
-------------------------------------------------------------------------------
-
-Visit our wiki:
-    https://sabnzbd.org/wiki/
-
-------------------------------------------------------------------------------
-7) CREDITS
-------------------------------------------------------------------------------
-
-Several parts of SABnzbd were built by other people, illustrating the
-wonderful world of Free Open Source Software.
-See the licenses folder of the main program and of the skin folders.
@@ -1,55 +0,0 @@
-*******************************************
-***          Known issues               ***
-*******************************************
-
- To prevent unexpectedly large NZBs from eating your download quota you can set
-  the option 'size_limit' on the Config->Special page.
-  Any NZB larger than this size will be set to paused and get a low priority.
-
- When par2 or unrar hang up, never just stop SABnzbd.
-  Instead use your operating system's task manager to stop the par2 or unrar program.
-  Forcing SABnzbd to quit may damage your queues.
-
- Some Usenet servers have intermittent login (or other) problems.
-  For these the server blocking method is not very favourable.
-  There is an INI-only option that will limit blocks to 1 minute.
-      no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/3.4/special
-
- Some third-party utilties try to probe SABnzbd API in such a way that you will
-  often see warnings about unauthenticated access.
-  If you are sure these probes are harmless, you can suppress the warnings by
-  setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/3.4/special
-
- On macOS you may encounter downloaded files with foreign characters.
-  The par2 repair may fail when the files were created on a Windows system.
-  The problem is caused by the PAR2 utility and we cannot fix this now.
-  This does not apply to files inside RAR files.
-
- The "Watched Folder" sometimes fails to delete the NZB files it has
-  processed. This happens when other software still accesses these files.
-  Some third-party utilities supporting SABnzbd are known to do this.
-  We cannot solve this problem, because the Operating System (read Windows)
-  prevents the removal.
-
- When SABnzbd cannot send notification emails, check your virus scanner,
-  firewall or security suite. It may be blocking outgoing email.
-
- When you are using external drives or network shares on macOS or Linux
-  make sure that the drives are mounted.
-  The operating system will simply redirect your files to alternative locations.
-  You may have trouble finding the files when mounting the drive later.
-  On macOS, SABnzbd will not create new folders in /Volumes.
-  The result will be a failed job that can be retried once the volume has been mounted.
-
- If you use a mounted drive as "temporary download folder", it must be present when SABnzbd
-  starts up. If not, SABnzbd will use the default location.
-  You can make SABnzbd wait for a mount of the "temporary download folder" by setting
-  Config->Special->wait_for_dfolder to 1.
-  SABnzbd will appear to hang until the drive is mounted.
-
- If you experience speed-drops to KB/s when using a VPN, try setting the number of connections
-  to your servers to a total of 7. There is a CPU-usage reduction feature in SABnzbd that
-  gets confused by the way some VPN's handle the state of a connection. Below 8 connections
-  this feature is not active.
@@ -1,4 +1,4 @@
-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2026 by The SABnzbd-Team (sabnzbd.org)

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: SABnzbd
-Version: 3.4.0Beta1
-Summary: SABnzbd-3.4.0Beta1
-Home-page: https://sabnzbd.org
-Author: The SABnzbd Team
-Author-email: team@sabnzbd.org
-License: GNU General Public License 2 (GPL2 or later)
-Description: Fully automated Usenet Binary Downloader
-Platform: posix
@@ -1,10 +1,8 @@
 SABnzbd - The automated Usenet download tool
 ============================================

-![CI tests](https://github.com/sabnzbd/sabnzbd/workflows/CI%20Tests/badge.svg)
-![Build binaries](https://github.com/sabnzbd/sabnzbd/workflows/Build%20binaries%20and%20source%20distribution/badge.svg)
-[![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
-
+[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+[![Join our Discord](https://img.shields.io/discord/976737547558461480?color=7289DA&label=Discord&logo=Discord&logoColor=white)](https://discord.sabnzbd.org)

 SABnzbd is an Open Source Binary Newsreader written in Python.

@@ -18,15 +16,15 @@ If you want to know more you can head over to our website: https://sabnzbd.org.

 SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:

- `python` (Python 3.6 and higher, often called `python3`)
- Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt -U`
+- `python` (Python 3.10 and above, often called `python3`)
+- Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt`
 - `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (make sure you get the "official" non-free version of unrar)

 Optional:
 - See `requirements.txt`

-Your package manager should supply these. If not, we've got links in our [installation guide](https://github.com/sabnzbd/sabnzbd/blob/master/INSTALL.txt).
+Your package manager should supply these. If not, we've got links in our [installation guide](https://sabnzbd.org/wiki/installation/install-off-modules).

 ## Running SABnzbd from source

@@ -68,3 +66,12 @@ Conditions:
 - Bugfixes created specifically for a release branch are done there (because they are specific, they're not cherry-picked to `develop`).
 - Bugfixes done on `develop` may be cherry-picked to a release branch.
 - We will not release a 1.0.2 if a 1.1.0 has already been released.
+
+## Privacy Policy
+
+This program will not transfer any information to other networked systems unless
+specifically requested by the user or the person installing or operating it.
+
+## Code Signing Policy
+
+For our Windows release, free code signing is provided by [SignPath.io](https://signpath.io), certificate by [SignPath Foundation](https://signpath.org).
@@ -1,33 +1,63 @@
-Release Notes - SABnzbd 3.4.0 Beta 1
+Release Notes - SABnzbd 5.1.0 Release Candidate 2
 =========================================================

-## Changes since 3.3.1
- Extended `Deobfuscate final filenames` to attempt to set the correct 
-  file extension based on the file signature if the file extension is 
-  not present or meaningless.
- Added additional pattern keys that can be used in the `Sort String`
-  for Sorting, by using the `guessit` package internally for parsing.
- Regular expressions can be used to specify `Unwanted extensions`.
- Some interface-only options were added as API-call.
- The Plush skin has been removed.
+This is the second release candidate of version 5.1.

-## Bugfixes since 3.3.1
- Duplicate check based on `.nzb` MD5 was performed before it was calculated.
- Enforce `local_ranges` for broadcasts (Bonjour/SSDP).
+## New features in 5.1.0
+
+* Refreshed the interface.
+* When Retrying a job, only the actually missing articles are tried again.
+  This only works for jobs downloaded in 5.1.0 (or newer).
+* RSS items are now stored in the database instead of on disk.
+* New RSS `Age` rule to filter jobs based on their age.
+* Downloaded RSS items are cleared from the RSS database after 3 days.
+* Added support for filename and path pattern matching to the `Cleanup List`.
+* `Unwanted extensions` will also be removed after unpacking.
+* Allow job setting changes directly from `Extra queue columns`.
+* Added support for unpacking `.tar` files during post-processing.
+* Improved anonymization of the logs when using `Show Logging`.
+* Added `SAB_FILES` environment variable to Post-processing scripts,
+  listing all files that resulted from the job.
+* New Servers will default to 16 connections instead of 8.
+* Use media duration as part of `Ignore Samples` detection.
+* Added option to (auto) sort the queue by Remaining Percentage.
+* Improved support for screen readers.
+* Parsing of header-encrypted RARs will use significantly fewer resources.
+* Add Ayatana AppIndicator tray support on GNOME.
+* Removed redundant `INSTALL.txt` file.
+* Dropped support for Python 3.9.
+* Windows and macOS: Updated Python to 3.14.6, Unrar to 7.23 and 7zip to 26.02.
+
+## Bug fixes in 5.1.0
+
+* Prevent incorrect warnings about non-writeable directories.
+* Files unrelated to job could get removed by the `Cleanup List` logic.
+* Prevent path traversal in orphaned job APIs.
+* `Disk Full` errors from unrar were not handled gracefully during unpacking.
+* Memory leak could occur during article decoding.
+* In containers (like Docker), the Article Cache could exceed the memory limit.
+* Diskspace checks would be too strict when unpacking to different disk.
+* Prevent deadlock when a second signal arrives during shutdown procedure.
+* Verification using SFV-checks could fail, even though files were correct.
+* Windows: Uninstall would not remove Settings or Windows Service.
+* Windows: Warn for OS-limit if more than 1024 connections are configured.
+* macOS: AppleDouble files could result in failures in `Moving` stage.
+* macOS: Restarting the application resulted in Terminal window.

 ## Upgrade notices
- The download statistics file `totals10.sab` is updated in 3.2.x 
-  version. If you downgrade to 3.1.x or lower, detailed download 
-  statistics will be lost.

-## Known problems and solutions
- Read the file "ISSUES.txt"
+* You can directly upgrade from version 3.0.0 and newer.
+* Upgrading from older versions will require performing a `Queue repair`.
+
+## Code Signing Policy
+
+Windows code signing is provided by SignPath.io using a SignPath Foundation certificate.

 ## About
-  SABnzbd is an open-source cross-platform binary newsreader.
-  It simplifies the process of downloading from Usenet dramatically, thanks
-  to its web-based user interface and advanced built-in post-processing options
-  that automatically verify, repair, extract and clean up posts downloaded
-  from Usenet.

-  (c) Copyright 2007-2021 by "The SABnzbd-team" \<team@sabnzbd.org\>
+SABnzbd is an open-source cross-platform binary newsreader.
+It simplifies the process of downloading from Usenet dramatically, thanks to its web-based
+user interface and advanced built-in post-processing options that automatically verify, repair,
+extract and clean up posts downloaded from Usenet.
+
+(c) Copyright 2007-2026 by The SABnzbd-Team (sabnzbd.org)
@@ -1,56 +1,32 @@
 # -*- mode: python -*-
-import re
+import os
 import sys
-import pkginfo

 from PyInstaller.building.api import EXE, COLLECT, PYZ
 from PyInstaller.building.build_main import Analysis
 from PyInstaller.building.osx import BUNDLE
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules

+from builder.common import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION, RELEASE_VERSION_BASE, RELEASE_VERSION_TUPLE
+
 # Add extra files in the PyInstaller-spec
 extra_pyinstaller_files = []

-# Also modify these in "package.py"!
-extra_files = [
-    "README.txt",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
-
-# Get the version
-RELEASE_VERSION = pkginfo.Develop(".").version
-
 # Add hidden imports
-extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
+extra_hiddenimports = ["Cheetah.DummyTransaction", "certifi"]
+extra_hiddenimports.extend(collect_submodules("apprise"))
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
+extra_hiddenimports.extend(collect_submodules("guessit.data"))

 # Add platform specific stuff
 if sys.platform == "darwin":
-    extra_hiddenimports.extend(["pyobjc", "objc", "PyObjCTools"])
+    extra_hiddenimports.extend(["objc", "PyObjCTools"])
    # macOS folders
-    extra_folders += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
+    EXTRA_FOLDERS += ["macos/par2/", "macos/unrar/", "macos/7zip/"]
    # Add NZB-icon file
-    extra_pyinstaller_files.append(("builder/osx/image/nzbfile.icns", "."))
+    extra_pyinstaller_files.append(("builder/macos/image/nzbfile.icns", "."))
    # Version information is set differently on macOS
-    version_info = None
+    version_info_console = version_info = None
 else:
    # Build would fail on non-Windows
    from PyInstaller.utils.win32.versioninfo import (
@@ -64,102 +40,115 @@ else:
    )

    # Windows
-    extra_hiddenimports.append("win32timezone")
-    extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
-
-    # Parse the version info
-    version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
-    version_tuple = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+    extra_hiddenimports.extend(["win32timezone", "winrt.windows.foundation.collections"])
+    EXTRA_FOLDERS += ["win/par2/", "win/unrar/", "win/7zip/"]
+    EXTRA_FILES += ["portable.cmd"]

    # Detailed instructions are in the PyInstaller documentation
    # We don't include the alpha/beta/rc in the counters
-    version_info = VSVersionInfo(
-        ffi=FixedFileInfo(
-            filevers=version_tuple,
-            prodvers=version_tuple,
-            mask=0x3F,
-            flags=0x0,
-            OS=0x40004,
-            fileType=0x1,
-            subtype=0x0,
-            date=(0, 0),
-        ),
-        kids=[
-            StringFileInfo(
-                [
-                    StringTable(
-                        "040904B0",
-                        [
-                            StringStruct("Comments", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("CompanyName", "The SABnzbd-Team"),
-                            StringStruct("FileDescription", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("FileVersion", RELEASE_VERSION),
-                            StringStruct("LegalCopyright", "The SABnzbd-Team"),
-                            StringStruct("ProductName", f"SABnzbd {RELEASE_VERSION}"),
-                            StringStruct("ProductVersion", RELEASE_VERSION),
-                        ],
-                    )
-                ]
+    def make_version_info(filename):
+        return VSVersionInfo(
+            ffi=FixedFileInfo(
+                filevers=RELEASE_VERSION_TUPLE,
+                prodvers=RELEASE_VERSION_TUPLE,
+                mask=0x3F,
+                flags=0x0,
+                OS=0x40004,
+                fileType=0x1,
+                subtype=0x0,
+                date=(0, 0),
            ),
-            VarFileInfo([VarStruct("Translation", [1033, 1200])]),
-        ],
-    )
+            kids=[
+                StringFileInfo(
+                    [
+                        StringTable(
+                            "040904B0",
+                            [
+                                StringStruct("Comments", f"SABnzbd {RELEASE_VERSION}"),
+                                StringStruct("CompanyName", "The SABnzbd-Team"),
+                                StringStruct("FileDescription", f"SABnzbd {RELEASE_VERSION}"),
+                                StringStruct("FileVersion", RELEASE_VERSION),
+                                StringStruct("InternalName", "SABnzbd"),
+                                StringStruct("LegalCopyright", "The SABnzbd-Team"),
+                                StringStruct("OriginalFilename", filename),
+                                StringStruct("ProductName", f"SABnzbd {RELEASE_VERSION}"),
+                                StringStruct("ProductVersion", RELEASE_VERSION),
+                            ],
+                        )
+                    ]
+                ),
+                VarFileInfo([VarStruct("Translation", [1033, 1200])]),
+            ],
+        )
+
+    version_info = make_version_info("SABnzbd.exe")
+    version_info_console = make_version_info("SABnzbd-console.exe")

 # Process the extra-files and folders
-for file_item in extra_files:
+for file_item in EXTRA_FILES:
    extra_pyinstaller_files.append((file_item, "."))
-for folder_item in extra_folders:
+for folder_item in EXTRA_FOLDERS:
    extra_pyinstaller_files.append((folder_item, folder_item))

 # Add babelfish data files
 extra_pyinstaller_files.extend(collect_data_files("babelfish"))
 extra_pyinstaller_files.extend(collect_data_files("guessit"))
+extra_pyinstaller_files.extend(collect_data_files("apprise"))
+extra_pyinstaller_files.extend(collect_data_files("dateutil"))

 pyi_analysis = Analysis(
    ["SABnzbd.py"],
    datas=extra_pyinstaller_files,
    hiddenimports=extra_hiddenimports,
-    excludes=["FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "pydoc", "pydoc_data.topics"],
+    module_collection_mode={"apprise.plugins": "py"},
 )

-pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
+pyz = PYZ(pyi_analysis.pure)

+codesign_identity = os.environ.get("SIGNING_AUTH")
+if not codesign_identity:
+    # PyInstaller needs specifically None, not just an empty value
+    codesign_identity = None
+
+# macOS specific parameters are ignored on other platforms
 exe = EXE(
    pyz,
    pyi_analysis.scripts,
    [],
    exclude_binaries=True,
    name="SABnzbd",
-    upx=True,
    console=False,
    append_pkg=False,
    icon="icons/sabnzbd.ico",
+    contents_directory=".",
    version=version_info,
+    target_arch="universal2",
+    entitlements_file="builder/macos/entitlements.plist",
+    codesign_identity=codesign_identity,
 )

-coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.zipfiles, pyi_analysis.datas, name="SABnzbd")
+coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.datas, name="SABnzbd")

 # We need to run again for the console-app
 if sys.platform == "win32":
-    # Enable console=True for this one
    console_exe = EXE(
        pyz,
        pyi_analysis.scripts,
        [],
        exclude_binaries=True,
        name="SABnzbd-console",
-        upx=True,
+        console=True,
        append_pkg=False,
        icon="icons/sabnzbd.ico",
-        version=version_info,
+        contents_directory=".",
+        version=version_info_console,
    )

    console_coll = COLLECT(
        console_exe,
        pyi_analysis.binaries,
-        pyi_analysis.zipfiles,
        pyi_analysis.datas,
-        upx=True,
        name="SABnzbd-console",
    )

@@ -169,6 +158,7 @@ if sys.platform == "darwin":
        "NSUIElement": 1,
        "NSPrincipalClass": "NSApplication",
        "CFBundleShortVersionString": RELEASE_VERSION,
+        "CFBundleVersion": RELEASE_VERSION_BASE,
        "NSHumanReadableCopyright": "The SABnzbd-Team",
        "CFBundleIdentifier": "org.sabnzbd.sabnzbd",
        "CFBundleDocumentTypes": [
@@ -182,8 +172,14 @@ if sys.platform == "darwin":
                "NSPersistentStoreTypeKey": "Binary",
            }
        ],
-        "LSMinimumSystemVersion": "10.9",
+        "LSMinimumSystemVersion": "10.15",
        "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
    }

-    app = BUNDLE(coll, name="SABnzbd.app", icon="builder/osx/image/sabnzbdplus.icns", info_plist=info_plist)
+    app = BUNDLE(
+        coll,
+        name="SABnzbd.app",
+        icon="builder/macos/image/sabnzbdplus.icns",
+        bundle_identifier="org.sabnzbd.sabnzbd",
+        info_plist=info_plist,
+    )
@@ -0,0 +1,88 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2026 by The SABnzbd-Team (sabnzbd.org)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import os
+import platform
+import re
+
+# Constants
+VERSION_FILE = "sabnzbd/version.py"
+APPDATA_FILE = "linux/org.sabnzbd.sabnzbd.appdata.xml"
+
+# To draft a release or not to draft a release?
+ON_GITHUB_ACTIONS = os.environ.get("CI", False)
+RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
+
+# Import version.py without the sabnzbd overhead
+with open(VERSION_FILE) as version_file:
+    exec(version_file.read())
+RELEASE_VERSION = __version__
+
+# Parse the version info for Windows file properties information
+version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
+RELEASE_VERSION_TUPLE = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+RELEASE_VERSION_BASE = f"{RELEASE_VERSION_TUPLE[0]}.{RELEASE_VERSION_TUPLE[1]}.{RELEASE_VERSION_TUPLE[2]}"
+
+# Pre-releases carry an alpha suffix (e.g. 5.1.0Beta1); stable releases don't (e.g. 5.1.0 or 5.1.10)
+PRERELEASE = bool(version_regexed.group(4))
+
+# Define release name
+RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
+RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
+RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
+RELEASE_WIN_BIN_X64 = RELEASE_NAME + "-win64-bin.zip"
+RELEASE_WIN_BIN_ARM64 = RELEASE_NAME + "-win-arm64-bin.zip"
+RELEASE_WIN_INSTALLER = RELEASE_NAME + "-win-setup.exe"
+RELEASE_MACOS = RELEASE_NAME + "-macos.dmg"
+RELEASE_README = "README.mkd"
+
+# Detect architecture
+RELEASE_WIN_BIN = RELEASE_WIN_BIN_X64
+if platform.machine() == "ARM64":
+    RELEASE_WIN_BIN = RELEASE_WIN_BIN_ARM64
+
+# Used in package.py and SABnzbd.spec
+EXTRA_FILES = [
+    RELEASE_README,
+    "README.html",
+    "LICENSE.txt",
+    "GPL2.txt",
+    "GPL3.txt",
+    "COPYRIGHT.txt",
+]
+EXTRA_FOLDERS = [
+    "scripts/",
+    "licenses/",
+    "locale/",
+    "email/",
+    "interfaces/Glitter/",
+    "interfaces/wizard/",
+    "interfaces/Config/",
+    "icons/",
+]
+
+
+def pe_has_authenticode_signature(pe_file: str) -> bool:
+    """Check if a PE file (.exe) has an embedded Authenticode signature by
+    inspecting the certificate table in the optional header data directory."""
+    # Imported here as tools/extract_pot.py execs this file without
+    # the build dependencies to get the RELEASE_VERSION_BASE
+    import pefile
+
+    pe = pefile.PE(pe_file, fast_load=True)
+    security = pe.OPTIONAL_HEADER.DATA_DIRECTORY[pefile.DIRECTORY_ENTRY["IMAGE_DIRECTORY_ENTRY_SECURITY"]]
+    return security.VirtualAddress != 0 and security.Size != 0
@@ -1,206 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-import os
-import pkginfo
-
-
-# We need to call dmgbuild from command-line, so here we can setup how
-if __name__ == "__main__":
-    # Check for DMGBuild
-    try:
-        import dmgbuild
-    except:
-        print("Requires dmgbuild-module, use pip install dmgbuild")
-        exit()
-
-    # Make sure we are in the src folder
-    if not os.path.exists("builder"):
-        raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
-
-    # Check if signing is possible
-    authority = os.environ.get("SIGNING_AUTH")
-
-    # Extract version info and set DMG path
-    # Create sub-folder to upload later
-    release = pkginfo.Develop(".").version
-    prod = "SABnzbd-" + release
-    fileDmg = prod + "-osx.dmg"
-
-    # Path to app file
-    apppath = "dist/SABnzbd.app"
-
-    # Copy Readme
-    readmepath = os.path.join(apppath, "Contents/Resources/README.txt")
-
-    # Path to background and the icon
-    backgroundpath = "builder/osx/image/sabnzbd_new_bg.png"
-    iconpath = "builder/osx/image/sabnzbdplus.icns"
-
-    # Make DMG
-    print("Building DMG")
-    dmgbuild.build_dmg(
-        filename=fileDmg,
-        volume_name=prod,
-        settings_file="builder/make_dmg.py",
-        defines={"app": apppath, "readme": readmepath, "background": backgroundpath, "iconpath": iconpath},
-    )
-
-    # Resign APP
-    if authority:
-        print("Siging DMG")
-        os.system('codesign --deep -f -i "org.sabnzbd.SABnzbd" -s "%s" "%s"' % (authority, fileDmg))
-        print("Signed!")
-    else:
-        print("Signing skipped, missing SIGNING_AUTH.")
-    exit()
-
-
-### START OF DMGBUILD SETTINGS
-### COPIED AND MODIFIED FROM THE EXAMPLE ONLINE
-application = defines.get("app", "AppName.app")
-readme = defines.get("readme", "ReadMe.rtf")
-appname = os.path.basename(application)
-
-# .. Basics ....................................................................
-
-# Volume format (see hdiutil create -help)
-format = defines.get("format", "UDBZ")
-
-# Volume size (must be large enough for your files)
-size = defines.get("size", "100M")
-
-# Files to include
-files = [application, readme]
-
-# Symlinks to create
-symlinks = {"Applications": "/Applications"}
-
-# Volume icon
-#
-# You can either define icon, in which case that icon file will be copied to the
-# image, *or* you can define badge_icon, in which case the icon file you specify
-# will be used to badge the system's Removable Disk icon
-#
-badge_icon = defines.get("iconpath", "")
-
-# Where to put the icons
-icon_locations = {readme: (70, 160), appname: (295, 220), "Applications": (510, 220)}
-
-# .. Window configuration ......................................................
-
-# Window position in ((x, y), (w, h)) format
-window_rect = ((100, 100), (660, 360))
-
-# Background
-#
-# This is a STRING containing any of the following:
-#
-#    #3344ff          - web-style RGB color
-#    #34f             - web-style RGB color, short form (#34f == #3344ff)
-#    rgb(1,0,0)       - RGB color, each value is between 0 and 1
-#    hsl(120,1,.5)    - HSL (hue saturation lightness) color
-#    hwb(300,0,0)     - HWB (hue whiteness blackness) color
-#    cmyk(0,1,0,0)    - CMYK color
-#    goldenrod        - X11/SVG named color
-#    builtin-arrow    - A simple built-in background with a blue arrow
-#    /foo/bar/baz.png - The path to an image file
-#
-# Other color components may be expressed either in the range 0 to 1, or
-# as percentages (e.g. 60% is equivalent to 0.6).
-background = defines.get("background", "builtin-arrow")
-
-show_status_bar = False
-show_tab_view = False
-show_toolbar = False
-show_pathbar = False
-show_sidebar = False
-sidebar_width = 0
-
-# Select the default view; must be one of
-#
-#    'icon-view'
-#    'list-view'
-#    'column-view'
-#    'coverflow'
-#
-default_view = "icon-view"
-
-# General view configuration
-show_icon_preview = False
-
-# Set these to True to force inclusion of icon/list view settings (otherwise
-# we only include settings for the default view)
-include_icon_view_settings = "auto"
-include_list_view_settings = "auto"
-
-# .. Icon view configuration ...................................................
-
-arrange_by = None
-grid_offset = (0, 0)
-grid_spacing = 50
-scroll_position = (0, 0)
-label_pos = "bottom"  # or 'right'
-text_size = 16
-icon_size = 64
-
-# .. List view configuration ...................................................
-
-# Column names are as follows:
-#
-#   name
-#   date-modified
-#   date-created
-#   date-added
-#   date-last-opened
-#   size
-#   kind
-#   label
-#   version
-#   comments
-#
-list_icon_size = 16
-list_text_size = 12
-list_scroll_position = (0, 0)
-list_sort_by = "name"
-list_use_relative_dates = True
-list_calculate_all_sizes = (False,)
-list_columns = ("name", "date-modified", "size", "kind", "date-added")
-list_column_widths = {
-    "name": 300,
-    "date-modified": 181,
-    "date-created": 181,
-    "date-added": 181,
-    "date-last-opened": 181,
-    "size": 97,
-    "kind": 115,
-    "label": 100,
-    "version": 75,
-    "comments": 300,
-}
-list_column_sort_directions = {
-    "name": "ascending",
-    "date-modified": "descending",
-    "date-created": "descending",
-    "date-added": "descending",
-    "date-last-opened": "descending",
-    "size": "descending",
-    "kind": "ascending",
-    "label": "ascending",
-    "version": "ascending",
-    "comments": "ascending",
-}
@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2008-2026 by The SABnzbd-Team (sabnzbd.org)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,50 +16,45 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 import glob
-import platform
+import importlib.util
 import re
 import sys
 import os
+import tempfile
 import time
 import shutil
 import subprocess
 import tarfile
-import pkginfo
-import github
-from distutils.dir_util import copy_tree
+import urllib.request
+import urllib.error
+import configobj
+import markdown
+import packaging.version
+import xml.etree.ElementTree as ET

-
-VERSION_FILE = "sabnzbd/version.py"
-SPEC_FILE = "SABnzbd.spec"
-
-# Also modify these in "SABnzbd.spec"!
-extra_files = [
-    "README.mkd",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
+from common import (
+    RELEASE_VERSION,
+    RELEASE_VERSION_TUPLE,
+    VERSION_FILE,
+    RELEASE_README,
+    RELEASE_NAME,
+    RELEASE_MACOS,
+    RELEASE_WIN_BIN,
+    RELEASE_WIN_INSTALLER,
+    ON_GITHUB_ACTIONS,
+    RELEASE_THIS,
+    RELEASE_SRC,
+    EXTRA_FILES,
+    EXTRA_FOLDERS,
+    APPDATA_FILE,
+    RELEASE_VERSION_BASE,
+    pe_has_authenticode_signature,
+)


 # Support functions
 def safe_remove(path):
-    """Remove file without erros if the file doesn't exist
+    """Remove file without errors if the file doesn't exist
    Can also handle folders
    """
    if os.path.exists(path):
@@ -69,19 +64,24 @@ def safe_remove(path):
            os.remove(path)


-def delete_files_glob(name):
-    """Delete one file or set of files from wild-card spec"""
-    for f in glob.glob(name):
-        if os.path.exists(f):
-            os.remove(f)
+def delete_files_glob(glob_pattern: str, allow_no_matches: bool = False):
+    """Delete one file or set of files from wild-card spec.
+    We expect to match at least 1 file, to force expected behavior"""
+    if files_to_remove := glob.glob(glob_pattern):
+        for path in files_to_remove:
+            if os.path.exists(path):
+                os.remove(path)
+    else:
+        if not allow_no_matches:
+            raise FileNotFoundError(f"No files found that match '{glob_pattern}'")


-def run_external_command(command):
+def run_external_command(command: list[str], print_output: bool = True, **kwargs):
    """Wrapper to ease the use of calling external programs"""
-    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs)
    output, _ = process.communicate()
    ret = process.wait()
-    if output:
+    if (output and print_output) or ret != 0:
        print(output)
    if ret != 0:
        raise RuntimeError("Command returned non-zero exit code %s!" % ret)
@@ -90,7 +90,7 @@ def run_external_command(command):

 def run_git_command(parms):
    """Run git command, raise error if it failed"""
-    return run_external_command(["git"] + parms)
+    return run_external_command(["git", *parms])


 def patch_version_file(release_name):
@@ -115,6 +115,151 @@ def patch_version_file(release_name):
        ver.write(version_file)


+def verify_appdata():
+    """Verify that appdata file is updated"""
+    if not isinstance(
+        ET.parse(APPDATA_FILE).find(f"./releases/release[@version='{RELEASE_VERSION_BASE}']"),
+        ET.Element,
+    ):
+        release_missing = f"Could not find {RELEASE_VERSION_BASE} in {APPDATA_FILE}"
+        if RELEASE_THIS:
+            raise RuntimeError(release_missing)
+        elif ON_GITHUB_ACTIONS:
+            print(f"::warning file={APPDATA_FILE},title=Missing release::{release_missing}")
+        else:
+            print(release_missing)
+
+
+def build_readme_html(output_path: str):
+    """Convert the release notes Markdown to a styled HTML file."""
+    with open(RELEASE_README, "r", encoding="utf-8") as f:
+        readme_html = markdown.markdown(f.read(), extensions=["nl2br"])
+
+    # Linkify bare URLs not already inside an HTML attribute
+    readme_html = re.sub(
+        r'(?<![="\'(])https?://[^\s<>"\']+',
+        lambda m: f'<a href="{m.group()}" target="_blank">{m.group()}</a>',
+        readme_html,
+    )
+
+    with open(output_path, "w", encoding="utf-8") as f:
+        f.write(
+            f'<!DOCTYPE html><html><head><meta charset="utf-8">'
+            f"<title>SABnzbd {RELEASE_VERSION} Release Notes</title>"
+            f'<link rel="icon" href="icons/logo-arrow.svg">'
+            f"<style>body{{font-family:system-ui,sans-serif;max-width:800px;margin:40px auto;padding:0 20px}}</style>"
+            f"</head><body>{readme_html}</body></html>"
+        )
+
+
+def test_macos_min_version(binary_path: str):
+    # Skip check if nothing was set
+    if macos_min_version := os.environ.get("MACOSX_DEPLOYMENT_TARGET"):
+        # Skip any arm64 specific files
+        if "arm64" in binary_path:
+            print(f"Skipping arm64 binary {binary_path}")
+            return
+
+        # Check minimum macOS version is at least mac OS10.13
+        # We only check the x86_64 since for arm64 it's always macOS 11+
+        print(f"Checking if binary supports macOS {macos_min_version} and above: {binary_path}")
+        otool_output = run_external_command(
+            [
+                "otool",
+                "-arch",
+                "x86_64",
+                "-l",
+                binary_path,
+            ],
+            print_output=False,
+        )
+
+        # Parse the output for LC_BUILD_VERSION minos
+        # The output is very large, so that's why we enumerate over it
+        req_version = packaging.version.parse(macos_min_version)
+        bin_version = None
+        lines = otool_output.split("\n")
+        for line_nr, line in enumerate(lines):
+            if "LC_VERSION_MIN_MACOSX" in line:
+                # Display the version in the next lines
+                bin_version = packaging.version.parse(lines[line_nr + 2].split()[1])
+            elif "minos" in line:
+                bin_version = packaging.version.parse(line.split()[1])
+
+            if bin_version and bin_version > req_version:
+                raise ValueError(f"{binary_path} requires {bin_version}, we want {req_version}")
+            else:
+                # We got the information we need
+                break
+        else:
+            print(lines)
+            raise RuntimeError(f"Could not determine minimum macOS version for {binary_path}")
+    else:
+        print("Skipping macOS version check, MACOSX_DEPLOYMENT_TARGET not set")
+
+
+def test_sab_binary(binary_path: str):
+    """Wrapper to have a simple start-up test for the binary"""
+    with tempfile.TemporaryDirectory() as config_dir:
+        sabnzbd_process = subprocess.Popen(
+            [binary_path, "--browser", "0", "--logging", "2", "--config", config_dir],
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+        )
+
+        # Wait for SAB to respond
+        base_url = "http://127.0.0.1:8080/"
+        for _ in range(30):
+            try:
+                urllib.request.urlopen(base_url, timeout=1).read()
+                break
+            except Exception:
+                time.sleep(1)
+        else:
+            # Print console output and give some time to print
+            print(sabnzbd_process.stdout.read())
+            time.sleep(1)
+            raise urllib.error.URLError("Could not connect to SABnzbd")
+
+        # Open a number of API calls and pages, to see if we are really up
+        pages_to_test = [
+            "",
+            "wizard",
+            "config",
+            "config/server",
+            "config/categories",
+            "config/scheduling",
+            "config/rss",
+            "config/general",
+            "config/folders",
+            "config/switches",
+            "config/sorting",
+            "config/notify",
+            "config/special",
+            "api?mode=version",
+        ]
+        for url in pages_to_test:
+            print("Testing: %s%s" % (base_url, url))
+            if b"500 Internal Server Error" in urllib.request.urlopen(base_url + url, timeout=1).read():
+                raise RuntimeError("Crash in %s" % url)
+
+        # Parse API-key so we can do a graceful shutdown
+        sab_config = configobj.ConfigObj(os.path.join(config_dir, "sabnzbd.ini"))
+        urllib.request.urlopen(base_url + "api?mode=shutdown&apikey=" + sab_config["misc"]["api_key"], timeout=10)
+        sabnzbd_process.wait()
+
+        # Print logs for verification
+        with open(os.path.join(config_dir, "logs", "sabnzbd.log"), "r") as log_file:
+            # Wait after printing so the output is nicely displayed in case of problems
+            print(log_text := log_file.read())
+            time.sleep(5)
+
+            # Make sure no extra errors/warnings were reported
+            if "ERROR" in log_text or "WARNING" in log_text:
+                raise RuntimeError("Warning or error reported during execution")
+
+
 if __name__ == "__main__":
    # Was any option supplied?
    if len(sys.argv) < 2:
@@ -124,34 +269,19 @@ if __name__ == "__main__":
    if not os.path.exists("builder"):
        raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")

-    # Extract version info
-    RELEASE_VERSION = pkginfo.Develop(".").version
-
    # Check if we have the needed certificates
-    try:
-        import certifi
-    except ImportError:
+    if importlib.util.find_spec("certifi") is None:
        raise FileNotFoundError("Need certifi module")

-    # Define release name
-    RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
-    RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
-    RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
-    RELEASE_BINARY_32 = RELEASE_NAME + "-win32-bin.zip"
-    RELEASE_BINARY_64 = RELEASE_NAME + "-win64-bin.zip"
-    RELEASE_INSTALLER = RELEASE_NAME + "-win-setup.exe"
-    RELEASE_MACOS = RELEASE_NAME + "-osx.dmg"
-    RELEASE_README = "README.mkd"
+    # Check if we have correct appdata file
+    verify_appdata()

    # Patch release file
    patch_version_file(RELEASE_VERSION)

-    # To draft a release or not to draft a release?
-    RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
-
-    # Rename release notes file
-    safe_remove("README.txt")
-    shutil.copyfile(RELEASE_README, "README.txt")
+    # Convert release notes to HTML for the installer finish page
+    safe_remove("README.html")
+    build_readme_html("README.html")

    # Compile translations
    if not os.path.exists("locale"):
@@ -161,76 +291,75 @@ if __name__ == "__main__":
        if not os.path.exists("locale"):
            raise FileNotFoundError("Failed to compile language files")

-    # Make sure we remove any existing build-folders
-    safe_remove("build")
-    safe_remove("dist")
-    safe_remove(RELEASE_NAME)
-
-    # Copy the specification
-    shutil.copyfile("builder/%s" % SPEC_FILE, SPEC_FILE)
-
-    if "binary" in sys.argv or "installer" in sys.argv:
+    if "binary" in sys.argv:
        # Must be run on Windows
        if sys.platform != "win32":
            raise RuntimeError("Binary should be created on Windows")

-        # Check what architecture we are on
-        RELEASE_BINARY = RELEASE_BINARY_32
-        if platform.architecture()[0] == "64bit":
-            RELEASE_BINARY = RELEASE_BINARY_64
+        # Make sure we remove any existing build-folders
+        safe_remove("build")
+        safe_remove("dist")

        # Remove any leftovers
-        safe_remove(RELEASE_BINARY)
+        safe_remove(RELEASE_NAME)
+        safe_remove(RELEASE_WIN_BIN)

        # Run PyInstaller and check output
+        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])

-        # Use special distutils function to merge the main and console directories
-        copy_tree("dist/SABnzbd-console", "dist/SABnzbd")
+        shutil.copytree("dist/SABnzbd-console", "dist/SABnzbd", dirs_exist_ok=True)
        safe_remove("dist/SABnzbd-console")

        # Remove unwanted DLL's
-        delete_files_glob("dist/SABnzbd/api-ms-win*.dll")
-        delete_files_glob("dist/SABnzbd/mfc140u.dll")
-        delete_files_glob("dist/SABnzbd/ucrtbase.dll")
+        shutil.rmtree("dist/SABnzbd/Pythonwin")
+        delete_files_glob("dist/SABnzbd/api-ms-win*.dll", allow_no_matches=True)
+        delete_files_glob("dist/SABnzbd/ucrtbase.dll", allow_no_matches=True)

-        # Remove other files we don't need
-        delete_files_glob("dist/SABnzbd/PKG-INFO")
-        delete_files_glob("dist/SABnzbd/win32ui.pyd")
-        delete_files_glob("dist/SABnzbd/winxpgui.pyd")
-
-        if "installer" in sys.argv:
-            # Needs to be run on 64 bit
-            if RELEASE_BINARY != RELEASE_BINARY_64:
-                raise RuntimeError("Installer should be created on 64bit Python")
-
-            # Compile NSIS translations
-            safe_remove("NSIS_Installer.nsi")
-            safe_remove("NSIS_Installer.nsi.tmp")
-            shutil.copyfile("builder/win/NSIS_Installer.nsi", "NSIS_Installer.nsi")
-            run_external_command([sys.executable, "tools/make_mo.py", "nsis"])
-
-            # Remove 32bit external executables
-            delete_files_glob("dist/SABnzbd/win/par2/multipar/par2j.exe")
-            delete_files_glob("dist/SABnzbd/win/unrar/UnRAR.exe")
-
-            # Run NSIS to build installer
-            run_external_command(
-                [
-                    "makensis.exe",
-                    "/V3",
-                    "/DSAB_PRODUCT=%s" % RELEASE_NAME,
-                    "/DSAB_VERSION=%s" % RELEASE_VERSION,
-                    "/DSAB_FILE=%s" % RELEASE_INSTALLER,
-                    "NSIS_Installer.nsi.tmp",
-                ]
-            )
-
-        # Rename the folder
-        os.rename("dist/SABnzbd", RELEASE_NAME)
+        # Test the release
+        test_sab_binary("dist/SABnzbd/SABnzbd.exe")

        # Create the archive
-        run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, RELEASE_NAME])
+        run_external_command(["win/7zip/7za.exe", "a", RELEASE_WIN_BIN, "SABnzbd"], cwd="dist")
+        shutil.move(f"dist/{RELEASE_WIN_BIN}", RELEASE_WIN_BIN)
+
+    if "installer" in sys.argv:
+        # Check if we have the dist folder
+        if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
+            raise FileNotFoundError("SABnzbd executable not found, run binary creation first")
+
+        # Check if we have a signed version
+        if os.path.exists(f"signed/{RELEASE_WIN_BIN}"):
+            print("Using signed version of SABnzbd binaries")
+            safe_remove("dist/SABnzbd")
+            run_external_command(["win/7zip/7za.exe", "x", "-odist", f"signed/{RELEASE_WIN_BIN}"])
+
+            # Make sure it exists
+            if not os.path.exists("dist/SABnzbd/SABnzbd.exe"):
+                raise FileNotFoundError("SABnzbd executable not found, signed zip extraction failed")
+
+            # Make sure the executables are actually signed
+            for exe_to_check in ("dist/SABnzbd/SABnzbd.exe", "dist/SABnzbd/SABnzbd-console.exe"):
+                if not pe_has_authenticode_signature(exe_to_check):
+                    raise RuntimeError("%s is not signed!" % exe_to_check)
+                print("%s has an Authenticode signature" % exe_to_check)
+        elif RELEASE_THIS:
+            raise FileNotFoundError("Signed SABnzbd executable not found, required for release!")
+        else:
+            print("Using unsigned version of SABnzbd binaries")
+
+        # Run NSIS to build installer
+        run_external_command(
+            [
+                "makensis.exe",
+                "/V3",
+                "/NOCD",  # No not change working directory
+                "/DSAB_VERSION=%s" % RELEASE_VERSION,
+                "/DSAB_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
+                "/DSAB_FILE=%s" % RELEASE_WIN_INSTALLER,
+                "builder/win/NSIS_Installer.nsi",
+            ]
+        )

    if "app" in sys.argv:
        # Must be run on macOS
@@ -242,21 +371,21 @@ if __name__ == "__main__":
        notarization_user = os.environ.get("NOTARIZATION_USER")
        notarization_pass = os.environ.get("NOTARIZATION_PASS")

-        # Run PyInstaller and check output
-        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
-
-        # Only continue if we can sign
+        # We need to sign all the included binaries before packaging them
+        # Otherwise the signature of the main application becomes invalid
        if authority:
            files_to_sign = [
-                "dist/SABnzbd.app/Contents/MacOS/osx/par2/par2-sl64",
-                "dist/SABnzbd.app/Contents/MacOS/osx/7zip/7za",
-                "dist/SABnzbd.app/Contents/MacOS/osx/unrar/unrar",
-                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
-                "dist/SABnzbd.app",
+                "macos/par2/par2",
+                "macos/unrar/unrar",
+                "macos/unrar/arm64/unrar",
+                "macos/7zip/7zz",
            ]
-
            for file_to_sign in files_to_sign:
-                print("Signing %s with hardended runtime" % file_to_sign)
+                # Make sure it supports the macOS versions we want first
+                test_macos_min_version(file_to_sign)
+
+                # Then sign in
+                print("Signing %s with hardened runtime" % file_to_sign)
                run_external_command(
                    [
                        "codesign",
@@ -266,18 +395,63 @@ if __name__ == "__main__":
                        "--options",
                        "runtime",
                        "--entitlements",
-                        "builder/osx/entitlements.plist",
-                        "-i",
-                        "org.sabnzbd.sabnzbd",
+                        "builder/macos/entitlements.plist",
                        "-s",
                        authority,
                        file_to_sign,
                    ],
+                    print_output=False,
                )
                print("Signed %s!" % file_to_sign)

-            # Only notarize for real builds that we want to deploy
-            if notarization_user and notarization_pass and RELEASE_THIS:
+        # Run PyInstaller and check output
+        shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
+        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
+
+        # Make sure we created a fully universal2 release when releasing or during CI
+        # PyInstaller also includes a builtin check for this, but we double-check every executable
+        if RELEASE_THIS or ON_GITHUB_ACTIONS:
+            for bin_to_check in glob.glob("dist/SABnzbd.app/**/*.so", recursive=True):
+                print("Checking if binary is universal2: %s" % bin_to_check)
+                file_output = run_external_command(["file", bin_to_check], print_output=False)
+                # Make sure we have both arm64 and x86
+                if not ("x86_64" in file_output and "arm64" in file_output):
+                    raise RuntimeError("Non-universal2 binary found!")
+
+                # Make sure it supports the macOS versions we want
+                test_macos_min_version(bin_to_check)
+
+        # Only continue if we can sign
+        if authority:
+            # We use PyInstaller to sign the main SABnzbd executable and the SABnzbd.app
+            files_already_signed = [
+                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
+                "dist/SABnzbd.app",
+            ]
+            for file_to_check in files_already_signed:
+                print("Checking signature of %s" % file_to_check)
+                sign_result = run_external_command(
+                    [
+                        "codesign",
+                        "-dv",
+                        "-r-",
+                        file_to_check,
+                    ],
+                    print_output=False,
+                ) + run_external_command(
+                    [
+                        "codesign",
+                        "--verify",
+                        "--deep",
+                        file_to_check,
+                    ],
+                    print_output=False,
+                )
+                if authority not in sign_result or "adhoc" in sign_result or "invalid" in sign_result:
+                    raise RuntimeError("Signature of %s seems invalid!" % file_to_check)
+
+            # Always notarize, as newer macOS versions don't allow any code without it
+            if notarization_user and notarization_pass:
                # Prepare zip to upload to notarization service
                print("Creating zip to send to Apple notarization service")
                # We need to use ditto, otherwise the signature gets lost!
@@ -288,62 +462,77 @@ if __name__ == "__main__":

                # Upload to Apple
                print("Sending zip to Apple notarization service")
-                upload_process = run_external_command(
+                upload_result = run_external_command(
                    [
                        "xcrun",
-                        "altool",
-                        "--notarize-app",
-                        "-t",
-                        "osx",
-                        "-f",
+                        "notarytool",
+                        "submit",
                        notarization_zip,
-                        "--primary-bundle-id",
-                        "org.sabnzbd.sabnzbd",
-                        "-u",
+                        "--apple-id",
                        notarization_user,
-                        "-p",
+                        "--team-id",
+                        authority,
+                        "--password",
                        notarization_pass,
+                        "--wait",
                    ],
                )

-                # Extract the notarization ID
-                m = re.match(".*RequestUUID = (.*?)\n", upload_process, re.S)
-                if not m:
-                    raise RuntimeError("No UUID created")
-                uuid = m.group(1)
-
-                print("Checking notarization of UUID: %s (every 30 seconds)" % uuid)
-                notarization_in_progress = True
-                while notarization_in_progress:
-                    time.sleep(30)
-                    check_status = run_external_command(
-                        [
-                            "xcrun",
-                            "altool",
-                            "--notarization-info",
-                            uuid,
-                            "-u",
-                            notarization_user,
-                            "-p",
-                            notarization_pass,
-                        ],
-                    )
-                    notarization_in_progress = "Status: in progress" in check_status
-
                # Check if success
-                if "Status: success" not in check_status:
+                if "status: accepted" not in upload_result.lower():
                    raise RuntimeError("Failed to notarize..")

                # Staple the notarization!
                print("Approved! Stapling the result to the app")
                run_external_command(["xcrun", "stapler", "staple", "dist/SABnzbd.app"])
-            elif notarization_user and notarization_pass:
-                print("Notarization skipped, tag commit to trigger notarization!")
            else:
                print("Notarization skipped, NOTARIZATION_USER or NOTARIZATION_PASS missing.")
        else:
            print("Signing skipped, missing SIGNING_AUTH.")

+        # Test the release, as the very last step to not mess with any release code
+        test_sab_binary("dist/SABnzbd.app/Contents/MacOS/SABnzbd")
+
+    if "dmg" in sys.argv:
+        # Must be run on macOS
+        if sys.platform != "darwin":
+            raise RuntimeError("DMG should be created on macOS")
+
+        # Only available for macOS
+        import dmgbuild
+
+        apppath = "dist/SABnzbd.app"
+        readmepath = os.path.join(apppath, "Contents/Resources/README.html")
+
+        print("Building DMG")
+        dmgbuild.build_dmg(
+            filename=RELEASE_MACOS,
+            volume_name=RELEASE_NAME,
+            settings={
+                "files": [apppath, readmepath],
+                "symlinks": {"Applications": "/Applications"},
+                "icon": "builder/macos/image/sabnzbdplus.icns",
+                "background": "builder/macos/image/sabnzbd_new_bg.png",
+                "icon_locations": {
+                    os.path.basename(readmepath): (70, 160),
+                    os.path.basename(apppath): (295, 220),
+                    "Applications": (510, 220),
+                },
+                "window_rect": ((100, 100), (660, 360)),
+                "sidebar_width": 0,
+                "grid_spacing": 50,
+                "icon_size": 64,
+            },
+            callback=lambda info: print("dmgbuild", info),
+        )
+
+        if authority := os.environ.get("SIGNING_AUTH"):
+            print("Signing DMG")
+            run_external_command(["codesign", "-f", "-i", "org.sabnzbd.sabnzbd", "-s", authority, RELEASE_MACOS])
+            print("Signed!")
+        else:
+            print("Signing skipped, missing SIGNING_AUTH.")
+
    if "source" in sys.argv:
        # Prepare Source distribution package.
        # We assume the sources are freshly cloned from the repo
@@ -356,19 +545,22 @@ if __name__ == "__main__":
        safe_remove(RELEASE_SRC)

        # Add extra files and folders need for source dist
-        extra_folders.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
-        extra_files.extend(["SABnzbd.py", "requirements.txt"])
+        EXTRA_FOLDERS.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
+        EXTRA_FILES.extend(["SABnzbd.py", "requirements.txt"])

        # Copy all folders and files to the new folder
-        for source_folder in extra_folders:
-            copy_tree(source_folder, os.path.join(src_folder, source_folder))
+        for source_folder in EXTRA_FOLDERS:
+            shutil.copytree(source_folder, os.path.join(src_folder, source_folder), dirs_exist_ok=True)

        # Copy all files
-        for source_file in extra_files:
+        for source_file in EXTRA_FILES:
            shutil.copyfile(source_file, os.path.join(src_folder, source_file))

        # Make sure all line-endings are correct
+        # Skip test data directories which contain binary files with misleading extensions
        for input_filename in glob.glob("%s/**/*.*" % src_folder, recursive=True):
+            if os.path.join("tests", "data", "") in input_filename:
+                continue
            base, ext = os.path.splitext(input_filename)
            if ext.lower() not in (".py", ".txt", ".css", ".js", ".tmpl", ".sh", ".cmd"):
                continue
@@ -393,7 +585,7 @@ if __name__ == "__main__":
                    tarinfo.uid = 0
                    tarinfo.gid = 0
                    if _file in ("SABnzbd.py", "Sample-PostProc.sh", "make_mo.py", "msgfmt.py"):
-                        # Force Linux/OSX scripts as executable
+                        # Force Linux/macOS scripts as executable
                        tarinfo.mode = 0o755
                    else:
                        tarinfo.mode = 0o644
@@ -404,163 +596,6 @@ if __name__ == "__main__":
        # Remove source folder
        safe_remove(src_folder)

-    # Release to github
-    if "release" in sys.argv:
-        # Check if tagged as release and check for token
-        gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
-        if RELEASE_THIS and gh_token:
-            gh_obj = github.Github(gh_token)
-            gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
-
-            # Read the release notes
-            with open(RELEASE_README, "r") as readme_file:
-                readme_data = readme_file.read()
-
-            # Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
-            prerelease = len(RELEASE_VERSION) > 5
-
-            # We have to manually check if we already created this release
-            for release in gh_repo.get_releases():
-                if release.tag_name == RELEASE_VERSION:
-                    gh_release = release
-                    print("Found existing release %s" % gh_release.title)
-                    break
-            else:
-                # Did not find it, so create the release, use the GitHub tag we got as input
-                print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
-                gh_release = gh_repo.create_git_release(
-                    tag=RELEASE_VERSION,
-                    name=RELEASE_TITLE,
-                    message=readme_data,
-                    draft=True,
-                    prerelease=prerelease,
-                )
-
-            # Fetch existing assets, as overwriting is not allowed by GitHub
-            gh_assets = gh_release.get_assets()
-
-            # Upload the assets
-            files_to_check = (
-                RELEASE_SRC,
-                RELEASE_BINARY_32,
-                RELEASE_BINARY_64,
-                RELEASE_INSTALLER,
-                RELEASE_MACOS,
-                RELEASE_README,
-            )
-            for file_to_check in files_to_check:
-                if os.path.exists(file_to_check):
-                    # Check if this file was previously uploaded
-                    if gh_assets.totalCount:
-                        for gh_asset in gh_assets:
-                            if gh_asset.name == file_to_check:
-                                print("Removing existing asset %s " % gh_asset.name)
-                                gh_asset.delete_asset()
-                    # Upload the new one
-                    print("Uploading %s to release %s" % (file_to_check, gh_release.title))
-                    gh_release.upload_asset(file_to_check)
-
-            # Check if we now have all files
-            gh_new_assets = gh_release.get_assets()
-            if gh_new_assets.totalCount:
-                all_assets = [gh_asset.name for gh_asset in gh_new_assets]
-
-                # Check if we have all files, using set-comparison
-                if set(files_to_check) == set(all_assets):
-                    print("All assets present, releasing %s" % RELEASE_VERSION)
-                    # Publish release
-                    gh_release.update_release(
-                        tag_name=RELEASE_VERSION,
-                        name=RELEASE_TITLE,
-                        message=readme_data,
-                        draft=False,
-                        prerelease=prerelease,
-                    )
-
-            # Update the website
-            gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
-            # Check if the branch already exists, only create one if it doesn't
-            skip_website_update = False
-            try:
-                gh_repo_web.get_branch(RELEASE_VERSION)
-                print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
-                skip_website_update = True
-            except github.GithubException:
-                # Create a new branch to have the changes
-                sb = gh_repo_web.get_branch("master")
-                print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
-                new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
-
-            # Update the files
-            if not skip_website_update:
-                # We need bytes version to interact with GitHub
-                RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
-
-                # Get all the version files
-                latest_txt = gh_repo_web.get_contents("latest.txt")
-                latest_txt_items = latest_txt.decoded_content.split()
-                new_latest_txt_items = latest_txt_items[:2]
-                config_yml = gh_repo_web.get_contents("_config.yml")
-                if prerelease:
-                    # If it's a pre-release, we append to current version in latest.txt
-                    new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
-                        config_yml.decoded_content,
-                    )
-                else:
-                    # New stable release, replace the version
-                    new_latest_txt_items[0] = RELEASE_VERSION_BYTES
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: ''",
-                        config_yml.decoded_content,
-                    )
-                    new_config_yml = re.sub(
-                        b"latest_stable: '[^']*'",
-                        b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
-                        new_config_yml,
-                    )
-                    # Also update the wiki-settings, these only use x.x notation
-                    new_config_yml = re.sub(
-                        b"wiki_version: '[^']*'",
-                        b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
-                        new_config_yml,
-                    )
-
-                # Update the files
-                print("Updating latest.txt")
-                gh_repo_web.update_file(
-                    "latest.txt",
-                    "Release %s: latest.txt" % RELEASE_VERSION,
-                    b"\n".join(new_latest_txt_items),
-                    latest_txt.sha,
-                    RELEASE_VERSION,
-                )
-                print("Updating _config.yml")
-                gh_repo_web.update_file(
-                    "_config.yml",
-                    "Release %s: _config.yml" % RELEASE_VERSION,
-                    new_config_yml,
-                    config_yml.sha,
-                    RELEASE_VERSION,
-                )
-
-                # Create pull-request
-                print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
-                gh_repo_web.create_pull(
-                    title=RELEASE_VERSION,
-                    base="master",
-                    body="Automated update of release files",
-                    head=RELEASE_VERSION,
-                )
-        else:
-            print("To push release to GitHub, first tag the commit.")
-            print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")
-
    # Reset!
    run_git_command(["reset", "--hard"])
    run_git_command(["clean", "-f"])
@@ -0,0 +1,27 @@
+# All sub-dependencies are listed below and installed with --no-dependencies for security
+PyGithub==2.10.0
+praw==8.0.3
+pefile==2024.8.26
+
+# PyGithub dependencies
+pynacl==1.6.2
+requests==2.34.2
+pyjwt==2.13.0
+typing-extensions==4.16.0
+urllib3==2.7.0
+
+# praw dependencies
+prawcore==4.0.0
+defusedxml==0.7.1
+update-checker==1.0.0
+websocket-client==1.9.0
+
+# requests dependencies
+charset_normalizer==3.5.1
+idna==3.19
+certifi==2026.7.22
+
+# cryptography (via pyjwt[crypto]) dependencies
+cryptography==49.0.0
+cffi==2.1.1
+pycparser==3.0
@@ -0,0 +1,281 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2026 by The SABnzbd-Team (sabnzbd.org)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import json
+import os
+import re
+
+import github
+import praw
+import requests
+
+from common import (
+    RELEASE_VERSION,
+    PRERELEASE,
+    RELEASE_SRC,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+    RELEASE_THIS,
+    RELEASE_TITLE,
+    pe_has_authenticode_signature,
+)
+
+# Verify we have all assets
+files_to_check = (
+    RELEASE_SRC,
+    RELEASE_WIN_BIN_X64,
+    RELEASE_WIN_BIN_ARM64,
+    RELEASE_WIN_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+)
+for file_to_check in files_to_check:
+    if not os.path.exists(file_to_check):
+        raise RuntimeError("Release file %s is missing!" % file_to_check)
+print("All release files are present")
+
+# When releasing, the Windows installer must be signed
+if RELEASE_THIS:
+    if not pe_has_authenticode_signature(RELEASE_WIN_INSTALLER):
+        raise RuntimeError("%s is not signed!" % RELEASE_WIN_INSTALLER)
+    print("%s has an Authenticode signature" % RELEASE_WIN_INSTALLER)
+
+# Check if tagged as release and check for token
+gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
+if RELEASE_THIS and gh_token:
+    gh_obj = github.Github(auth=github.Auth.Token(gh_token))
+    gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
+
+    # Read the release notes (reused for the Reddit post below)
+    with open(RELEASE_README, "r") as readme_file:
+        readme_data = readme_file.read()
+
+    # Find the existing release for this tag, or create a fresh draft
+    try:
+        gh_release = gh_repo.get_release(RELEASE_VERSION)
+        print("Found existing release %s" % gh_release.name)
+    except github.UnknownObjectException:
+        print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
+        gh_release = gh_repo.create_git_release(
+            tag=RELEASE_VERSION,
+            name=RELEASE_TITLE,
+            message=readme_data,
+            draft=True,
+            prerelease=PRERELEASE,
+        )
+
+    # Overwriting an asset isn't allowed by GitHub, so delete any that already exist
+    existing_assets = {asset.name: asset for asset in gh_release.get_assets()}
+    for file_to_upload in files_to_check:
+        if file_to_upload in existing_assets:
+            print("Removing existing asset %s" % file_to_upload)
+            existing_assets[file_to_upload].delete_asset()
+        print("Uploading %s to release %s" % (file_to_upload, gh_release.name))
+        gh_release.upload_asset(file_to_upload)
+
+    # Publish the release once all assets are attached
+    uploaded_assets = {asset.name for asset in gh_release.get_assets()}
+    if set(files_to_check).issubset(uploaded_assets):
+        print("All assets present, releasing %s" % RELEASE_VERSION)
+        gh_release.update_release(
+            tag_name=RELEASE_VERSION,
+            name=RELEASE_TITLE,
+            message=readme_data,
+            draft=False,
+            prerelease=PRERELEASE,
+        )
+
+    # Update the website
+    gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
+    # Check if the branch already exists, only create one if it doesn't
+    skip_website_update = False
+    try:
+        gh_repo_web.get_branch(RELEASE_VERSION)
+        print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
+        skip_website_update = True
+    except github.GithubException:
+        # Create a new branch to have the changes
+        sb = gh_repo_web.get_branch("master")
+        print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
+        new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
+
+    # Update the files
+    if not skip_website_update:
+        # We need bytes version to interact with GitHub
+        RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
+
+        # Get all the version files
+        latest_txt = gh_repo_web.get_contents("latest.txt")
+        latest_txt_items = latest_txt.decoded_content.split()
+        new_latest_txt_items = latest_txt_items[:2]
+        config_yml = gh_repo_web.get_contents("_config.yml")
+        if PRERELEASE:
+            # If it's a pre-release, we append to current version in latest.txt
+            new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
+                config_yml.decoded_content,
+            )
+        else:
+            # New stable release, replace the version
+            new_latest_txt_items[0] = RELEASE_VERSION_BYTES
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: ''",
+                config_yml.decoded_content,
+            )
+            new_config_yml = re.sub(
+                b"latest_stable: '[^']*'",
+                b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
+                new_config_yml,
+            )
+            # Also update the wiki-settings, these only use x.x notation
+            new_config_yml = re.sub(
+                b"wiki_version: '[^']*'",
+                b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
+                new_config_yml,
+            )
+
+        # Update the files
+        print("Updating latest.txt")
+        gh_repo_web.update_file(
+            "latest.txt",
+            "Release %s: latest.txt" % RELEASE_VERSION,
+            b"\n".join(new_latest_txt_items),
+            latest_txt.sha,
+            RELEASE_VERSION,
+        )
+        print("Updating _config.yml")
+        gh_repo_web.update_file(
+            "_config.yml",
+            "Release %s: _config.yml" % RELEASE_VERSION,
+            new_config_yml,
+            config_yml.sha,
+            RELEASE_VERSION,
+        )
+
+        # Create pull-request
+        print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr = gh_repo_web.create_pull(
+            title="Release %s" % RELEASE_VERSION,
+            base="master",
+            body="Automated update of release files",
+            head=RELEASE_VERSION,
+        )
+
+        # Merge pull-request
+        print("Merging pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr.merge(merge_method="squash")
+
+    # Trigger the Docker image build at linuxserver.io
+    # Branch "develop" builds the pre-releases, "master" the stable releases
+    if linuxserver_token := os.environ.get("LINUXSERVER_WEBHOOK_TOKEN", ""):
+        linuxserver_branch = "develop" if PRERELEASE else "master"
+        print("Triggering linuxserver.io Docker build for branch %s" % linuxserver_branch)
+        requests.post(
+            "https://ci.linuxserver.io/generic-webhook-trigger/invoke?sabnzbd",
+            headers={"Authorization": "Bearer %s" % linuxserver_token},
+            json={"branch": linuxserver_branch},
+            timeout=30,
+        ).raise_for_status()
+    else:
+        print("Missing LINUXSERVER_WEBHOOK_TOKEN")
+
+    # Only with GitHub success we proceed to Reddit
+    if reddit_token := os.environ.get("REDDIT_TOKEN", ""):
+        # Token format (without whitespace):
+        # {
+        #     "client_id":"XXX",
+        #     "client_secret":"XXX",
+        #     "user_agent":"SABnzbd release script",
+        #     "username":"Safihre",
+        #     "password":"XXX"
+        # }
+        credentials = json.loads(reddit_token)
+        reddit = praw.Reddit(**credentials)
+
+        subreddit_sabnzbd = reddit.subreddit("sabnzbd")
+        subreddit_usenet = reddit.subreddit("usenet")
+
+        # Reuse the release notes read earlier, split into lines
+        readme_lines = readme_data.splitlines(keepends=True)
+
+        # Put the download link after the title
+        readme_lines[2] = "## https://sabnzbd.org/downloads\n\n"
+
+        # Use the header in the readme as title
+        title = readme_lines[0]
+        release_notes_text = "".join(readme_lines[2:])
+        print("Posting release notes to Reddit")
+
+        # Only stable releases to r/usenet
+        if not PRERELEASE:
+            # Get correct flair-id (required by r/usenet)
+            for flair in subreddit_usenet.flair.link_templates.user_selectable():
+                if flair["flair_text"] == "News":
+                    print("Posting to r/usenet")
+                    submission = subreddit_usenet.submit(
+                        title, selftext=release_notes_text, flair_id=flair["flair_template_id"]
+                    )
+                    break
+            else:
+                raise ValueError("Could not locate flair_text for posting to r/usenet")
+
+        # Post always to r/SABnzbd
+        print("Posting to r/sabnzbd")
+        subreddit_sabnzbd.submit(title, selftext=release_notes_text)
+
+    else:
+        print("Missing REDDIT_TOKEN")
+
+    # Push release notes to Discord via an incoming webhook
+    # Separate channels for testing (pre-release) and stable, both are required
+    discord_webhook_testing = os.environ.get("DISCORD_WEBHOOK_TESTING", "")
+    discord_webhook_stable = os.environ.get("DISCORD_WEBHOOK_STABLE", "")
+    if discord_webhook_testing and discord_webhook_stable:
+        discord_webhook = discord_webhook_testing if PRERELEASE else discord_webhook_stable
+        print("Posting release notes to Discord")
+        # Reuse the release notes read earlier: line 0 is the title header
+        discord_lines = readme_data.splitlines(keepends=True)
+        discord_title = discord_lines[0].lstrip("# ").strip()
+        discord_body = "".join(discord_lines[2:])[:4096]
+        requests.post(
+            discord_webhook,
+            json={
+                "embeds": [
+                    {
+                        "title": discord_title,
+                        "url": gh_release.html_url,
+                        "description": discord_body,
+                        "color": 0xFFA500 if PRERELEASE else 0x00A550,
+                    }
+                ]
+            },
+            timeout=30,
+        ).raise_for_status()
+    else:
+        print("Missing DISCORD_WEBHOOK_TESTING and/or DISCORD_WEBHOOK_STABLE")
+
+else:
+    print("To push release to GitHub, first tag the commit.")
+    print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")
@@ -1,9 +1,23 @@
-# Basic build requirements
-pyinstaller==4.2
-setuptools
-pkginfo
-certifi
-pygithub
+# All sub-dependencies are listed below and installed with --no-dependencies for security
+pyinstaller==6.22.2
+packaging==26.3
+pyinstaller-hooks-contrib==2026.6
+altgraph==0.17.5
+wrapt==2.3.0
+setuptools==84.0.0
+markdown==3.10.3
+pefile==2024.8.26

-# For the OSX build specific
-dmgbuild; sys_platform == 'darwin'
+# For the Windows build
+pywin32-ctypes==0.2.3; sys_platform == 'win32'
+
+# For the macOS build
+dmgbuild==1.6.7; sys_platform == 'darwin'
+mac-alias==2.2.3; sys_platform == 'darwin'
+macholib==1.16.4; sys_platform == 'darwin'
+ds-store==1.3.3; sys_platform == 'darwin'
+PyNaCl==1.6.2; sys_platform == 'darwin'
+
+# 48.0.0 is the last cryptography version shipping a macOS universal2 wheel (49+ is arm64-only)
+# See https://github.com/pyca/cryptography/issues/13520
+cryptography<49.0.0; sys_platform == 'darwin'
@@ -1,6 +1,6 @@
-; -*- coding: utf-8 -*-
+; -*- coding: utf-8 -*-
 ;
-; Copyright 2008-2015 The SABnzbd-Team <team@sabnzbd.org>
+; Copyright 2008-2015 The SABnzbd-Team (sabnzbd.org)
 ;
 ; This program is free software; you can redistribute it and/or
 ; modify it under the terms of the GNU General Public License
@@ -18,6 +18,10 @@

 Unicode true

+; Must precede any data/header output. Solid LZMA dedups identical files (e.g. the
+; two SABnzbd*.pkg archives) and shrinks the whole installer.
+SetCompressor /SOLID lzma
+
 !addplugindir builder\win\nsis\Plugins
 !addincludedir builder\win\nsis\Include

@@ -29,10 +33,11 @@ Unicode true
 !include "nsProcess.nsh"
 !include "x64.nsh"
 !include "servicelib.nsh"
+!include "StdUtils.nsh"

 ;------------------------------------------------------------------
 ;
-; Marco for removing existing and the current installation
+; Macro for removing existing and the current installation
 ; It shared by the installer and the uninstaller.
 ;
 !define RemovePrev "!insertmacro RemovePrev"
@@ -42,21 +47,54 @@ Unicode true
  RMDir /r "${idir}"
 !macroend

+!define RemovePrevShortcuts "!insertmacro RemovePrevShortcuts"
+!macro RemovePrevShortcuts
+  ; Remove shortcuts, starting with current user ones (from old installs)
+  SetShellVarContext current
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+  Delete "$DESKTOP\SABnzbd.lnk"
+
+  SetShellVarContext all
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+  Delete "$DESKTOP\SABnzbd.lnk"
+!macroend
+
 ;------------------------------------------------------------------
 ; Define names of the product
-  Name "${SAB_PRODUCT}"
+  Name "SABnzbd ${SAB_VERSION}"
+  VIProductVersion "${SAB_VERSIONKEY}"
+  VIFileVersion "${SAB_VERSIONKEY}"
+
+  VIAddVersionKey "Comments" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "CompanyName" "The SABnzbd-Team"
+  VIAddVersionKey "FileDescription" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "FileVersion" "${SAB_VERSION}"
+  VIAddVersionKey "LegalCopyright" "The SABnzbd-Team"
+  VIAddVersionKey "ProductName" "SABnzbd ${SAB_VERSION}"
+  VIAddVersionKey "ProductVersion" "${SAB_VERSION}"
+
  OutFile "${SAB_FILE}"
  InstallDir "$PROGRAMFILES\SABnzbd"

-
 ;------------------------------------------------------------------
 ; Some default compiler settings (uncomment and change at will):
-  SetCompress auto ; (can be off or force)
  SetDatablockOptimize on ; (can be off)
  CRCCheck on ; (can be off)
  AutoCloseWindow false ; (can be true for the window go away automatically at end)
  ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable)
-  SetDateSave off ; (can be on to have files restored to their orginal date)
+  SetDateSave off ; (can be on to have files restored to their original date)
  WindowIcon on
  SpaceTexts none

@@ -66,7 +104,6 @@ Unicode true
  RequestExecutionLevel admin
  FileErrorText "If you have no admin rights, try to install into a user directory."

-
 ;------------------------------------------------------------------
 ;Variables
  Var MUI_TEMP
@@ -106,10 +143,10 @@ Unicode true
  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER

  !insertmacro MUI_PAGE_INSTFILES
-  ; !define MUI_FINISHPAGE_RUN
-  ; !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
-  ; !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+  !define MUI_FINISHPAGE_RUN
+  !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
+  !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
+  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.html"
  !define MUI_FINISHPAGE_SHOWREADME_TEXT $(MsgShowRelNote)
  !define MUI_FINISHPAGE_LINK $(MsgSupportUs)
  !define MUI_FINISHPAGE_LINK_LOCATION "https://sabnzbd.org/donate"
@@ -117,16 +154,25 @@ Unicode true
  !insertmacro MUI_PAGE_FINISH

  !insertmacro MUI_UNPAGE_CONFIRM
-  !define MUI_UNPAGE_COMPONENTSPAGE_NODESC
  !insertmacro MUI_UNPAGE_COMPONENTS
  !insertmacro MUI_UNPAGE_INSTFILES

+
 ;------------------------------------------------------------------
 ; Run as user-level at end of install
-; DOES NOT WORK
-; Function PageFinishRun
-;   !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\SABnzbd.exe" "" "" ""
-; FunctionEnd
+Function PageFinishRun
+  ; Check if SABnzbd service is installed
+  !insertmacro SERVICE "installed" "SABnzbd" ""
+  Pop $0 ;response
+  ${If} $0 == true
+    ; Service is installed, start the service
+    !insertmacro SERVICE "start" "SABnzbd" ""
+    Pop $0
+  ${Else}
+    ; Service not installed, run executable as user
+    ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\SABnzbd.exe" "" ""
+  ${EndIf}
+FunctionEnd


 ;------------------------------------------------------------------
@@ -142,18 +188,19 @@ Unicode true
  !insertmacro MUI_LANGUAGE "Polish"
  !insertmacro MUI_LANGUAGE "Swedish"
  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "Italian"
  !insertmacro MUI_LANGUAGE "Norwegian"
  !insertmacro MUI_LANGUAGE "Romanian"
  !insertmacro MUI_LANGUAGE "Spanish"
  !insertmacro MUI_LANGUAGE "PortugueseBR"
  !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "Turkish"
  !insertmacro MUI_LANGUAGE "Hebrew"
  !insertmacro MUI_LANGUAGE "Russian"
  !insertmacro MUI_LANGUAGE "Czech"
  !insertmacro MUI_LANGUAGE "SimpChinese"


-
 ;------------------------------------------------------------------
 ;Reserve Files
  ;If you are using solid compression, files that are required before
@@ -169,37 +216,77 @@ Unicode true
 Section "SABnzbd" SecDummy

  SetOutPath "$INSTDIR"
+  SetShellVarContext all
+
+  DetailPrint $(MsgShutting)
+
+  ;------------------------------------------------------------------
+  ; Shutdown any running service
+
+  !insertmacro SERVICE "stop" "SABnzbd" ""
+  Pop $0
+
+  ;------------------------------------------------------------------
+  ; Terminate SABnzbd.exe
+  ; Ask nicely first, but kill forcefully if it does not exit in time
+  StrCpy $R1 0
+  loop:
+    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
+    StrCmp $R0 0 0 endcheck
+    IntCmp $R1 20 forcekill 0 forcekill
+    ${nsProcess::CloseProcess} "SABnzbd.exe" $R0
+    IntOp $R1 $R1 + 1
+    Sleep 500
+    Goto loop
+  forcekill:
+    ${nsProcess::KillProcess} "SABnzbd.exe" $R0
+    Sleep 500
+  endcheck:
+  ${nsProcess::Unload}

  ;------------------------------------------------------------------
  ; Make sure old versions are gone (reg-key already read in onInt)
  StrCmp $PREV_INST_DIR "" noPrevInstallRemove
+    ; Only remove the directory if it actually contains a SABnzbd installation,
+    ; the registry value could point anywhere
+    IfFileExists "$PREV_INST_DIR\SABnzbd.exe" 0 noPrevInstallRemove
    ${RemovePrev} "$PREV_INST_DIR"
+    Goto continueSetupAfterRemove
+
+  ;------------------------------------------------------------------
+  ; Add firewall rules for new installs
  noPrevInstallRemove:
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+
+  continueSetupAfterRemove:

  ; add files / whatever that need to be installed here.
  File /r "dist\SABnzbd\*"

  ;------------------------------------------------------------------
-  ; Add firewall rules
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
-
-  ;------------------------------------------------------------------
-  ; Add to registery
+  ; Add to registry
  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "" "$INSTDIR"
  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "Installer Language" "$(MsgLangCode)"
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayName" "SABnzbd ${SAB_VERSION}"
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "UninstallString" '"$INSTDIR\uninstall.exe"'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayVersion" '${SAB_VERSION}'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd Team'
+  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd-Team'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "HelpLink" 'https://forums.sabnzbd.org/'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLInfoAbout" 'https://sabnzbd.org/wiki/'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLUpdateInfo" 'https://sabnzbd.org/'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Comments" 'The automated Usenet download tool'
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayIcon" '$INSTDIR\icons\sabnzbd.ico'
-  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  25674
+
+  ; Calculate the actual installed size for Add/Remove Programs
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize" "$0"
  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoRepair" -1
  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoModify" -1
+
+  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "DisplayName" "SABnzbd"
+  WriteRegStr HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd" "IconUri" '$INSTDIR\icons\sabnzbd16_32.ico'
+
  ; write out uninstaller
  WriteUninstaller "$INSTDIR\Uninstall.exe"

@@ -232,23 +319,28 @@ Function .onInit
  ${If} ${RunningX64}
      StrCpy $INSTDIR "$PROGRAMFILES64\SABnzbd"
  ${Else}
-      MessageBox MB_OK $(MsgOnly64bit)
-      ExecShell "open" "https://sabnzbd.org/downloads"
+      MessageBox MB_OK|MB_ICONSTOP $(MsgOnly64bit)
      Abort
  ${EndIf}

  ; Python 3.9 no longer supports Windows 7
  ${If} ${AtMostWin8}
-      MessageBox MB_OK $(MsgNoWin7)
-      ExecShell "open" "https://sabnzbd.org/downloads"
+      MessageBox MB_OK|MB_ICONSTOP $(MsgNoWin7)
      Abort
  ${EndIf}

+  ; Inform ARM64 users that a native ARM64 build is available
+  ${If} ${IsNativeARM64}
+      MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(MsgARM64Notice) IDOK continueARM64
+      Abort
+      continueARM64:
+  ${EndIf}
+
  ;------------------------------------------------------------------
  ; Change settings based on if SAB was already installed
  ReadRegStr $PREV_INST_DIR HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" ""
  StrCmp $PREV_INST_DIR "" noPrevInstall
-    ; We want to use the user's costom dir if he used one
+    ; We want to use the user's custom dir if he used one
    StrCmp $PREV_INST_DIR "$PROGRAMFILES\SABnzbd" noSpecialDir
      StrCmp $PREV_INST_DIR "$PROGRAMFILES64\SABnzbd" noSpecialDir
        ; Set what the user had before
@@ -257,15 +349,24 @@ Function .onInit

    ;------------------------------------------------------------------
    ; Check what the user has currently set for install options
+    SetShellVarContext current
+    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartupCurrent
+      SectionSetFlags ${startup} 1
+    endCheckStartupCurrent:
+    SetShellVarContext all
    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
      SectionSetFlags ${startup} 1
    endCheckStartup:

+    SetShellVarContext current
    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
-      SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
+      ; If not present for current user, first check all user folder
+      SetShellVarContext all
+      IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
+        SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
    endCheckDesktop:
+    SetShellVarContext all

-    Push $1
    ReadRegStr $1 HKCR ".nzb" ""  ; read current file association
    StrCmp "$1" "NZB File" noPrevInstall 0
      SectionSetFlags ${assoc} 0 ; Uncheck it when it wasn't checked before
@@ -275,85 +376,59 @@ Function .onInit
  ; Display language chooser
  !insertmacro MUI_LANGDLL_DISPLAY

-  ;------------------------------------------------------------------
-  ; make sure user terminates sabnzbd.exe or else abort
-  ;
-  loop:
-    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
-    StrCmp $R0 0 0 endcheck
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
-    exitinstall:
-      ${nsProcess::Unload}
-      Abort
-  endcheck:
-
-  ;------------------------------------------------------------------
-  ; make sure both services aren't running
-  ;
-  !insertmacro SERVICE "running" "SABnzbd" ""
-  Pop $0 ;response
-  !insertmacro SERVICE "running" "SABHelper" ""
-  Pop $1
-  ${If} $0 == true
-  ${OrIf} $1 == true
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
-    ; exitinstall already defined above
-  ${EndIf}
-
-  ;------------------------------------------------------------------
-  ; Tell users about the service change
-  ;
-  !insertmacro SERVICE "installed" "SABHelper" ""
-  Pop $0 ;response
-  ${If} $0 == true
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgServChange) IDOK removeservices IDCANCEL exitinstall
-    ; exitinstall already defined above
-    removeservices:
-        !insertmacro SERVICE "delete" "SABHelper" ""
-        !insertmacro SERVICE "delete" "SABnzbd" ""
-  ${EndIf}
-
-FunctionEnd
-
-;------------------------------------------------------------------
-; Show the shortcuts at end of install so user can start SABnzbd
-; This is instead of us trying to run SAB from the installer
-;
-Function .onInstSuccess
-  ExecShell "open" "$SMPROGRAMS\$STARTMENU_FOLDER"
 FunctionEnd

 ;--------------------------------
 ; begin uninstall settings/section
 UninstallText $(MsgUninstall)

+; Uninstaller variants of the servicelib functions, needed by the SERVICE macro.
+; APITAG is undefined again at the end of servicelib.nsh, so redefine it here.
+!define APITAG "W"
+
+Function un.Service
+  !insertmacro FUNC_SERVICE "un."
+FunctionEnd
+
+Function un.GetParam
+  !insertmacro FUNC_GETPARAM
+FunctionEnd
+
+!undef APITAG
+
 Section "un.$(MsgDelProgram)" Uninstall
-;make sure sabnzbd.exe isnt running..if so shut it down
+;make sure sabnzbd.exe isn't running..if so shut it down
+  DetailPrint $(MsgShutting)
+
+  ; Stop and remove the SABnzbd service, if it is installed
+  !insertmacro SERVICE "installed" "SABnzbd" ""
+  Pop $0
+  ${If} $0 == true
+    !insertmacro SERVICE "stop" "SABnzbd" ""
+    Pop $0
+    !insertmacro SERVICE "delete" "SABnzbd" ""
+    Pop $0
+  ${EndIf}
+
  ${nsProcess::KillProcess} "SABnzbd.exe" $R0
  ${nsProcess::Unload}
-  DetailPrint "Process Killed"
-

  ; add delete commands to delete whatever files/registry keys/etc you installed here.
  Delete "$INSTDIR\uninstall.exe"
  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd"
  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd"
+  DeleteRegKey HKEY_CURRENT_USER "Software\Classes\AppUserModelId\SABnzbd"
+  DeleteRegKey HKEY_CURRENT_USER "Software\SABnzbd"

-  ${RemovePrev} "$INSTDIR"
+  ; Only remove the directory if it actually contains a SABnzbd installation
+  IfFileExists "$INSTDIR\SABnzbd.exe" 0 skipRemoveDir
+    ${RemovePrev} "$INSTDIR"
+  skipRemoveDir:
+  ${RemovePrevShortcuts}

-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-
-  Delete "$DESKTOP\SABnzbd.lnk"
-
-  DeleteRegKey HKEY_CURRENT_USER  "Software\SABnzbd"
+  ; Remove firewall entries
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"

  ${unregisterExtension} ".nzb" "NZB File"
  ${RefreshShellIcons}
@@ -361,8 +436,10 @@ Section "un.$(MsgDelProgram)" Uninstall
 SectionEnd ; end of uninstall section

 Section /o "un.$(MsgDelSettings)" DelSettings
-  DetailPrint "Uninstall settings $LOCALAPPDATA"
-  Delete "$LOCALAPPDATA\sabnzbd\sabnzbd.ini"
+  ; The main uninstall section leaves the context on "all", which would make
+  ; $LOCALAPPDATA point to C:\ProgramData instead of the user's profile
+  SetShellVarContext current
+  DetailPrint "Uninstall settings $LOCALAPPDATA\sabnzbd"
  RMDir /r "$LOCALAPPDATA\sabnzbd"
 SectionEnd

@@ -371,34 +448,284 @@ SectionEnd
 ;--------------------------------
 ;Language strings
  LangString MsgShowRelNote ${LANG_ENGLISH} "Show Release Notes"
+  LangString MsgShowRelNote ${LANG_CZECH} "Zobrazit poznámky k vydání"
+  LangString MsgShowRelNote ${LANG_DANISH} "Vis udgivelsesbemærkninger"
+  LangString MsgShowRelNote ${LANG_GERMAN} "Versionshinweise anzeigen"
+  LangString MsgShowRelNote ${LANG_SPANISH} "Mostrar notas de la versión"
+  LangString MsgShowRelNote ${LANG_FINNISH} "Näytä julkaisutiedot"
+  LangString MsgShowRelNote ${LANG_FRENCH} "Afficher les notes de version"
+  LangString MsgShowRelNote ${LANG_HEBREW} "הראה הערות שחרור"
+  LangString MsgShowRelNote ${LANG_ITALIAN} "Mostra note di rilascio"
+  LangString MsgShowRelNote ${LANG_NORWEGIAN} "Vis versjonsmerknader"
+  LangString MsgShowRelNote ${LANG_DUTCH} "Toon opmerkingen bij deze uitgave"
+  LangString MsgShowRelNote ${LANG_POLISH} "Pokaż informacje o wydaniu"
+  LangString MsgShowRelNote ${LANG_PORTUGUESEBR} "Mostrar Notas de Lançamento"
+  LangString MsgShowRelNote ${LANG_ROMANIAN} "Arată Notele de Publicare"
+  LangString MsgShowRelNote ${LANG_RUSSIAN} "Показать заметки о выпуске"
+  LangString MsgShowRelNote ${LANG_SERBIAN} "Прикажи белешке о издању"
+  LangString MsgShowRelNote ${LANG_SWEDISH} "Visa releasenoteringar"
+  LangString MsgShowRelNote ${LANG_TURKISH} "Yayın Notlarını Göster"
+  LangString MsgShowRelNote ${LANG_SIMPCHINESE} "显示版本说明"
+
+  LangString MsgRunSAB      ${LANG_ENGLISH} "Run SABnzbd"
+  LangString MsgRunSAB      ${LANG_CZECH} "Spustit SABnzbd"
+  LangString MsgRunSAB      ${LANG_DANISH} "Kør SABnzbd"
+  LangString MsgRunSAB      ${LANG_GERMAN} "SABnzbd starten"
+  LangString MsgRunSAB      ${LANG_SPANISH} "Ejecutar SABnzbd"
+  LangString MsgRunSAB      ${LANG_FINNISH} "Käynnistä SABnzbd"
+  LangString MsgRunSAB      ${LANG_FRENCH} "Lancer SABnzbd"
+  LangString MsgRunSAB      ${LANG_HEBREW} "הפעל את SABnzbd"
+  LangString MsgRunSAB      ${LANG_ITALIAN} "Avvia SABnzbd"
+  LangString MsgRunSAB      ${LANG_NORWEGIAN} "Kjør SABnzbd"
+  LangString MsgRunSAB      ${LANG_DUTCH} "SABnzbd starten"
+  LangString MsgRunSAB      ${LANG_POLISH} "Uruchom SABnzbd"
+  LangString MsgRunSAB      ${LANG_PORTUGUESEBR} "Executar o SABnzbd"
+  LangString MsgRunSAB      ${LANG_ROMANIAN} "Rulați SABnzbd"
+  LangString MsgRunSAB      ${LANG_RUSSIAN} "Запустить SABnzbd"
+  LangString MsgRunSAB      ${LANG_SERBIAN} "Покрени SABnzbd"
+  LangString MsgRunSAB      ${LANG_SWEDISH} "Kör SABnzbd"
+  LangString MsgRunSAB      ${LANG_TURKISH} "SABnzbd'yi çalıştır"
+  LangString MsgRunSAB      ${LANG_SIMPCHINESE} "运行 SABnzbd"

  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"
+  LangString MsgSupportUs   ${LANG_CZECH} "Podpořte projekt!"
+  LangString MsgSupportUs   ${LANG_DANISH} "Støt projektet, donér!"
+  LangString MsgSupportUs   ${LANG_GERMAN} "Bitte unterstützen Sie das Projekt durch eine Spende!"
+  LangString MsgSupportUs   ${LANG_SPANISH} "¡Apoye el proyecto, haga una  donación!"
+  LangString MsgSupportUs   ${LANG_FINNISH} "Tue projektia, lahjoita!"
+  LangString MsgSupportUs   ${LANG_FRENCH} "Soutenez le projet, faites un don !"
+  LangString MsgSupportUs   ${LANG_HEBREW} "תמוך במיזם, תרום!"
+  LangString MsgSupportUs   ${LANG_ITALIAN} "Sostieni il progetto, dona!"
+  LangString MsgSupportUs   ${LANG_NORWEGIAN} "Støtt prosjektet, donèr!"
+  LangString MsgSupportUs   ${LANG_DUTCH} "Steun het project, doneer!"
+  LangString MsgSupportUs   ${LANG_POLISH} "Wspomóż projekt!"
+  LangString MsgSupportUs   ${LANG_PORTUGUESEBR} "Apoie o projeto. Faça uma doação!"
+  LangString MsgSupportUs   ${LANG_ROMANIAN} "Susţine proiectul, Donează!"
+  LangString MsgSupportUs   ${LANG_RUSSIAN} "Поддержите проект. Сделайте пожертвование!"
+  LangString MsgSupportUs   ${LANG_SERBIAN} "Подржите пројекат, дајте добровољан прилог!"
+  LangString MsgSupportUs   ${LANG_SWEDISH} "Donera och stöd detta projekt!"
+  LangString MsgSupportUs   ${LANG_TURKISH} "Projeye destek olun, Bağış Yapın!"
+  LangString MsgSupportUs   ${LANG_SIMPCHINESE} "支持该项目，捐助!"

-  LangString MsgCloseSab    ${LANG_ENGLISH} "Please close $\"SABnzbd.exe$\" first"
+  LangString MsgOnly64bit   ${LANG_ENGLISH} "SABnzbd only supports 64-bit Windows."
+  LangString MsgOnly64bit   ${LANG_CZECH} "SABnzbd podporuje pouze 64bitové Windows."
+  LangString MsgOnly64bit   ${LANG_DANISH} "SABnzbd understøtter kun 64-bit Windows."
+  LangString MsgOnly64bit   ${LANG_GERMAN} "SABnzbd unterstützt nur 64-Bit-Windows."
+  LangString MsgOnly64bit   ${LANG_SPANISH} "SABnzbd solo es compatible con Windows de 64 bits."
+  LangString MsgOnly64bit   ${LANG_FINNISH} "SABnzbd tukee vain 64-bittistä Windowsia."
+  LangString MsgOnly64bit   ${LANG_FRENCH} "SABnzbd n'est compatible qu'avec Windows 64 bits."
+  LangString MsgOnly64bit   ${LANG_HEBREW} "SABnzbd תומך רק במערכות Windows מסוג 64 סיביות."
+  LangString MsgOnly64bit   ${LANG_ITALIAN} "SABnzbd supporta solo Windows a 64 bit."
+  LangString MsgOnly64bit   ${LANG_NORWEGIAN} "SABnzbd støtter kun 64-bit Windows."
+  LangString MsgOnly64bit   ${LANG_DUTCH} "SABnzbd ondersteund alleen 64bit Windows."
+  LangString MsgOnly64bit   ${LANG_POLISH} "SABnzbd obsługuje tylko system Windows 64-bit."
+  LangString MsgOnly64bit   ${LANG_PORTUGUESEBR} "O SABnzbd oferece suporte apenas ao Windows de 64 bits."
+  LangString MsgOnly64bit   ${LANG_ROMANIAN} "SABnzbd acceptă doar Windows pe 64 de biți."
+  LangString MsgOnly64bit   ${LANG_RUSSIAN} "SABnzbd поддерживает только 64-битные версии Windows."
+  LangString MsgOnly64bit   ${LANG_SERBIAN} "SABnzbd подржава само 64‑битни Windows."
+  LangString MsgOnly64bit   ${LANG_SWEDISH} "SABnzbd stöder endast 64-bitars Windows."
+  LangString MsgOnly64bit   ${LANG_TURKISH} "SABnzbd sadece 64 bit Windows'u destekler."
+  LangString MsgOnly64bit   ${LANG_SIMPCHINESE} "SABnzbd 仅支持 64 位 Windows。"

-  LangString MsgServChange  ${LANG_ENGLISH} "The SABnzbd Windows Service changed in SABnzbd 3.0.0. $\nYou will need to reinstall the SABnzbd service. $\n$\nClick `OK` to remove the existing services or `Cancel` to cancel this upgrade."
+  LangString MsgNoWin7      ${LANG_ENGLISH} "SABnzbd only supports Windows 8.1 and above."
+  LangString MsgNoWin7      ${LANG_CZECH} "SABnzbd podporuje pouze Windows 8.1 a novější."
+  LangString MsgNoWin7      ${LANG_DANISH} "SABnzbd understøtter kun Windows 8.1 og nyere."
+  LangString MsgNoWin7      ${LANG_GERMAN} "SABnzbd unterstützt nur Windows 8.1 und höher."
+  LangString MsgNoWin7      ${LANG_SPANISH} "SABnzbd solo es compatible con Windows 8.1 y superiores."
+  LangString MsgNoWin7      ${LANG_FINNISH} "SABnzbd tukee vain Windows 8.1:tä ja uudempia."
+  LangString MsgNoWin7      ${LANG_FRENCH} "SABnzbd n'est compatible qu'avec Windows 8.1 et plus."
+  LangString MsgNoWin7      ${LANG_HEBREW} "SABnzbd תומך רק במערכות Windows 8.1 ומעלה."
+  LangString MsgNoWin7      ${LANG_ITALIAN} "SABnzbd supporta solo Windows 8.1 e versioni successive."
+  LangString MsgNoWin7      ${LANG_NORWEGIAN} "SABnzbd støtter kun Windows 8.1 og nyere."
+  LangString MsgNoWin7      ${LANG_DUTCH} "SABnzbd ondersteund alleen Windows 8.1 en hoger."
+  LangString MsgNoWin7      ${LANG_POLISH} "SABnzbd obsługuje tylko Windows 8.1 i nowsze."
+  LangString MsgNoWin7      ${LANG_PORTUGUESEBR} "O SABnzbd oferece suporte apenas ao Windows 8.1 e superior."
+  LangString MsgNoWin7      ${LANG_ROMANIAN} "SABnzbd acceptă doar Windows 8.1 și versiunile ulterioare."
+  LangString MsgNoWin7      ${LANG_RUSSIAN} "SABnzbd поддерживает только Windows 8.1 и более новые."
+  LangString MsgNoWin7      ${LANG_SERBIAN} "SABnzbd подржава само Windows 8.1 и новије."
+  LangString MsgNoWin7      ${LANG_SWEDISH} "SABnzbd stöder endast Windows 8.1 och senare."
+  LangString MsgNoWin7      ${LANG_TURKISH} "SABnzbd sadece Windows 8.1 ve üzerini destekler."
+  LangString MsgNoWin7      ${LANG_SIMPCHINESE} "SABnzbd 仅支持 Windows 8.1 及更高版本。"

-  LangString MsgOnly64bit   ${LANG_ENGLISH} "The installer only supports 64-bit Windows, use the standalone version to run on 32-bit Windows."
+  LangString MsgARM64Notice ${LANG_ENGLISH} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_CZECH} "Na naší stránce „Ke stažení“ je k dispozici verze SABnzbd pro architekturu ARM. Tento instalační program obsahuje pouze standardní verzi.$\nStiskněte tlačítko OK pro pokračování nebo Zrušit pro ukončení."
+  LangString MsgARM64Notice ${LANG_DANISH} "En ARM-version af SABnzbd er tilgængelig på vores downloadside. Dette installationsprogram indeholder kun den almindelige version.$\nTryk på OK for at fortsætte eller Annuller for at afslutte."
+  LangString MsgARM64Notice ${LANG_GERMAN} "Eine ARM-Version von SABnzbd ist auf unserer Downloads-Seite verfügbar. Dieses Installationsprogramm enthält nur die reguläre Version.$\nKlicken Sie auf OK, um fortzufahren, oder auf Abbrechen, um zu beenden."
+  LangString MsgARM64Notice ${LANG_SPANISH} "Hay una versión ARM de SABnzbd disponible en nuestra página de descargas. Este instalador solo contiene la versión normal.$\nPulsa Aceptar para continuar o Cancelar para salir."
+  LangString MsgARM64Notice ${LANG_FINNISH} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_FRENCH} "Une version ARM de SABnzbd est disponible sur notre page de téléchargement. Ce programme d'installation ne contient que la version standard.$\nCliquez sur OK pour continuer ou sur Annuler pour quitter."
+  LangString MsgARM64Notice ${LANG_HEBREW} "גרסת ARM של SABnzbd זמינה בעמוד ההורדות שלנו. תוכנת התקנה זו מכילה רק את הגרסה הרגילה.$\nלחץ על אישור כדי להמשיך או על ביטול כדי לצאת."
+  LangString MsgARM64Notice ${LANG_ITALIAN} "Una versione ARM di SABnzbd è disponibile nella nostra pagina dei download. Questo programma di installazione contiene solo la versione normale.$\nPremi OK per continuare o Annulla per uscire."
+  LangString MsgARM64Notice ${LANG_NORWEGIAN} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_DUTCH} "Er is een ARM versie van SABnzbd beschikbaar op onze Downloads pagina. Deze installatie bevat alleen de normale (niet-ARM) versie.$\nKlik OK om door te gaan of Annuleren om af te breken."
+  LangString MsgARM64Notice ${LANG_POLISH} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_PORTUGUESEBR} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_ROMANIAN} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_RUSSIAN} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_SERBIAN} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_SWEDISH} "An ARM version of SABnzbd is available on our Downloads page. This installer only contains the regular version.$\nPress OK to continue or Cancel to exit."
+  LangString MsgARM64Notice ${LANG_TURKISH} "SABnzbd'nin ARM sürümü İndirmeler sayfamızda mevcuttur. Bu kurulum programı sadece normal sürümü içermektedir.$\nDevam etmek için Tamam'a veya çıkmak için İptal'e tıklayın."
+  LangString MsgARM64Notice ${LANG_SIMPCHINESE} "我们的下载页面提供 SABnzbd 的 ARM 版本。此安装程序仅包含常规版本。$\n按“确定”继续，或按“取消”退出。"

-  LangString MsgNoWin7      ${LANG_ENGLISH} "The installer only supports Windows 8.1 and above, use the standalone legacy version to run on older Windows version."
+  LangString MsgShutting    ${LANG_ENGLISH} "Shutting down SABnzbd"
+  LangString MsgShutting    ${LANG_CZECH} "Vypínání SABnzbd"
+  LangString MsgShutting    ${LANG_DANISH} "Lukker SABnzbd"
+  LangString MsgShutting    ${LANG_GERMAN} "Beende SABnzbd"
+  LangString MsgShutting    ${LANG_SPANISH} "Apagando SABnzbd"
+  LangString MsgShutting    ${LANG_FINNISH} "Sammutetaan SABnzbd"
+  LangString MsgShutting    ${LANG_FRENCH} "Arrêt de SABnzbd"
+  LangString MsgShutting    ${LANG_HEBREW} "מכבה את SABnzbd"
+  LangString MsgShutting    ${LANG_ITALIAN} "Arresto di SABnzbd in corso"
+  LangString MsgShutting    ${LANG_NORWEGIAN} "Slår av SABnzbd"
+  LangString MsgShutting    ${LANG_DUTCH} "SABnzbd wordt afgesloten"
+  LangString MsgShutting    ${LANG_POLISH} "Zamykanie SABnzbd"
+  LangString MsgShutting    ${LANG_PORTUGUESEBR} "Encerrando o SABnzbd"
+  LangString MsgShutting    ${LANG_ROMANIAN} "Se oprește SABnzbd"
+  LangString MsgShutting    ${LANG_RUSSIAN} "Завершение работы SABnzbd"
+  LangString MsgShutting    ${LANG_SERBIAN} "Искључивање SABnzbd"
+  LangString MsgShutting    ${LANG_SWEDISH} "Stänger av SABnzbd."
+  LangString MsgShutting    ${LANG_TURKISH} "SABnzbd kapatılıyor"
+  LangString MsgShutting    ${LANG_SIMPCHINESE} "正在关闭 SABnzbd"

  LangString MsgUninstall   ${LANG_ENGLISH} "This will uninstall SABnzbd from your system"
+  LangString MsgUninstall   ${LANG_CZECH} "Tímto odinstalujete SABnzbd z vašeho systému"
+  LangString MsgUninstall   ${LANG_DANISH} "Dette vil afinstallere SABnzbd fra dit system"
+  LangString MsgUninstall   ${LANG_GERMAN} "Dies entfernt SABnzbd von Ihrem System"
+  LangString MsgUninstall   ${LANG_SPANISH} "Esto desinstalará SABnzbd de su sistema"
+  LangString MsgUninstall   ${LANG_FINNISH} "Tämä poistaa SABnzbd:n tietokoneestasi"
+  LangString MsgUninstall   ${LANG_FRENCH} "Ceci désinstallera SABnzbd de votre système"
+  LangString MsgUninstall   ${LANG_HEBREW} "זה יסיר את SABnzbd מהמערכת שלך"
+  LangString MsgUninstall   ${LANG_ITALIAN} "Questo disinstallerà SABnzbd dal tuo sistema"
+  LangString MsgUninstall   ${LANG_NORWEGIAN} "Dette vil avinstallere SABnzbd fra ditt system"
+  LangString MsgUninstall   ${LANG_DUTCH} "Dit verwijdert SABnzbd van je systeem"
+  LangString MsgUninstall   ${LANG_POLISH} "To odinstaluje SABnzbd z systemu"
+  LangString MsgUninstall   ${LANG_PORTUGUESEBR} "Isso irá desinstalar SABnzbd de seu sistema"
+  LangString MsgUninstall   ${LANG_ROMANIAN} "Acest lucru va dezinstala SABnzbd din sistem"
+  LangString MsgUninstall   ${LANG_RUSSIAN} "Приложение SABnzbd будет удалено из вашей системы"
+  LangString MsgUninstall   ${LANG_SERBIAN} "Ово ће уклонити САБнзбд са вашег система"
+  LangString MsgUninstall   ${LANG_SWEDISH} "Detta kommer att avinstallera SABnzbd från systemet"
+  LangString MsgUninstall   ${LANG_TURKISH} "Bu, SABnzbd'yi sisteminizden kaldıracaktır"
+  LangString MsgUninstall   ${LANG_SIMPCHINESE} "这将从您的系统中卸载 SABnzbd"

  LangString MsgRunAtStart  ${LANG_ENGLISH} "Run at startup"
+  LangString MsgRunAtStart  ${LANG_CZECH} "Spouštět při startu systému"
+  LangString MsgRunAtStart  ${LANG_DANISH} "Kør ved opstart"
+  LangString MsgRunAtStart  ${LANG_GERMAN} "Beim Systemstart ausführen"
+  LangString MsgRunAtStart  ${LANG_SPANISH} "Ejecutar al inicio"
+  LangString MsgRunAtStart  ${LANG_FINNISH} "Suorita käynnistyksen yhteydessä"
+  LangString MsgRunAtStart  ${LANG_FRENCH} "Lancer au démarrage"
+  LangString MsgRunAtStart  ${LANG_HEBREW} "הרץ בהזנק"
+  LangString MsgRunAtStart  ${LANG_ITALIAN} "Esegui all'avvio"
+  LangString MsgRunAtStart  ${LANG_NORWEGIAN} "Kjør ved oppstart"
+  LangString MsgRunAtStart  ${LANG_DUTCH} "Starten met Windows"
+  LangString MsgRunAtStart  ${LANG_POLISH} "Uruchom wraz z systemem"
+  LangString MsgRunAtStart  ${LANG_PORTUGUESEBR} "Executar na inicialização"
+  LangString MsgRunAtStart  ${LANG_ROMANIAN} "Executare la pornire"
+  LangString MsgRunAtStart  ${LANG_RUSSIAN} "Запускать вместе с системой"
+  LangString MsgRunAtStart  ${LANG_SERBIAN} "Покрени са системом"
+  LangString MsgRunAtStart  ${LANG_SWEDISH} "Kör vid uppstart"
+  LangString MsgRunAtStart  ${LANG_TURKISH} "Başlangıçta Çalıştır"
+  LangString MsgRunAtStart  ${LANG_SIMPCHINESE} "启动时运行"

  LangString MsgIcon        ${LANG_ENGLISH} "Desktop Icon"
+  LangString MsgIcon        ${LANG_CZECH} "Ikona na ploše"
+  LangString MsgIcon        ${LANG_DANISH} "Skrivebordsikon"
+  LangString MsgIcon        ${LANG_GERMAN} "Desktop-Symbol"
+  LangString MsgIcon        ${LANG_SPANISH} "Icono del escritorio"
+  LangString MsgIcon        ${LANG_FINNISH} "Työpöydän kuvake"
+  LangString MsgIcon        ${LANG_FRENCH} "Icône sur le Bureau"
+  LangString MsgIcon        ${LANG_HEBREW} "צור קיצור דרך בשולחן העבודה"
+  LangString MsgIcon        ${LANG_ITALIAN} "Icona sul desktop"
+  LangString MsgIcon        ${LANG_NORWEGIAN} "Skrivebordsikon"
+  LangString MsgIcon        ${LANG_DUTCH} "Bureaubladpictogram"
+  LangString MsgIcon        ${LANG_POLISH} "Ikona pulpitu"
+  LangString MsgIcon        ${LANG_PORTUGUESEBR} "Ícone na Área de Trabalho"
+  LangString MsgIcon        ${LANG_ROMANIAN} "Icoană Desktop"
+  LangString MsgIcon        ${LANG_RUSSIAN} "Значок на рабочем столе"
+  LangString MsgIcon        ${LANG_SERBIAN} "Иконица радне површи"
+  LangString MsgIcon        ${LANG_SWEDISH} "Skrivbordsikon"
+  LangString MsgIcon        ${LANG_TURKISH} "Masaüstü İkonu"
+  LangString MsgIcon        ${LANG_SIMPCHINESE} "桌面图标"

  LangString MsgAssoc       ${LANG_ENGLISH} "NZB File association"
+  LangString MsgAssoc       ${LANG_CZECH} "Přiřazení souborů NZB"
+  LangString MsgAssoc       ${LANG_DANISH} "NZB-filtilknytning"
+  LangString MsgAssoc       ${LANG_GERMAN} "Mit NZB-Dateien verknüpfen"
+  LangString MsgAssoc       ${LANG_SPANISH} "Asociación de archivos NZB"
+  LangString MsgAssoc       ${LANG_FINNISH} "NZB tiedostosidos"
+  LangString MsgAssoc       ${LANG_FRENCH} "Association des fichiers NZB"
+  LangString MsgAssoc       ${LANG_HEBREW} "NZB שייך קבצי"
+  LangString MsgAssoc       ${LANG_ITALIAN} "Associazione file NZB"
+  LangString MsgAssoc       ${LANG_NORWEGIAN} "NZB-filassosiering"
+  LangString MsgAssoc       ${LANG_DUTCH} "NZB-bestanden openen met SABnzbd"
+  LangString MsgAssoc       ${LANG_POLISH} "powiązanie pliku NZB"
+  LangString MsgAssoc       ${LANG_PORTUGUESEBR} "Associação com Arquivos NZB"
+  LangString MsgAssoc       ${LANG_ROMANIAN} "Asociere cu Fişierele NZB"
+  LangString MsgAssoc       ${LANG_RUSSIAN} "Ассоциировать с файлами NZB"
+  LangString MsgAssoc       ${LANG_SERBIAN} "Придруживање НЗБ датотеке"
+  LangString MsgAssoc       ${LANG_SWEDISH} "NZB Filassosication"
+  LangString MsgAssoc       ${LANG_TURKISH} "NZB Dosya ilişkilendirmesi"
+  LangString MsgAssoc       ${LANG_SIMPCHINESE} "NZB 文件关联"

  LangString MsgDelProgram  ${LANG_ENGLISH} "Delete Program"
+  LangString MsgDelProgram  ${LANG_CZECH} "Odstranit program"
+  LangString MsgDelProgram  ${LANG_DANISH} "Slet program"
+  LangString MsgDelProgram  ${LANG_GERMAN} "Programm löschen"
+  LangString MsgDelProgram  ${LANG_SPANISH} "Eliminar programa"
+  LangString MsgDelProgram  ${LANG_FINNISH} "Poista sovellus"
+  LangString MsgDelProgram  ${LANG_FRENCH} "Supprimer le programme"
+  LangString MsgDelProgram  ${LANG_HEBREW} "מחק תוכנית"
+  LangString MsgDelProgram  ${LANG_ITALIAN} "Elimina programma"
+  LangString MsgDelProgram  ${LANG_NORWEGIAN} "Fjern program"
+  LangString MsgDelProgram  ${LANG_DUTCH} "Programma verwijderen"
+  LangString MsgDelProgram  ${LANG_POLISH} "Usuń program"
+  LangString MsgDelProgram  ${LANG_PORTUGUESEBR} "Excluir o Programa"
+  LangString MsgDelProgram  ${LANG_ROMANIAN} "Şterge Program"
+  LangString MsgDelProgram  ${LANG_RUSSIAN} "Удалить программу"
+  LangString MsgDelProgram  ${LANG_SERBIAN} "Обриши програм"
+  LangString MsgDelProgram  ${LANG_SWEDISH} "Radera programmet"
+  LangString MsgDelProgram  ${LANG_TURKISH} "Programı Sil"
+  LangString MsgDelProgram  ${LANG_SIMPCHINESE} "删除程序"

  LangString MsgDelSettings ${LANG_ENGLISH} "Delete Settings"
-
-  LangString MsgRemoveOld   ${LANG_ENGLISH} "You cannot overwrite an existing installation. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade."
-
-  LangString MsgRemoveOld2  ${LANG_ENGLISH} "Your settings and data will be preserved."
+  LangString MsgDelSettings ${LANG_CZECH} "Smazat nastavení"
+  LangString MsgDelSettings ${LANG_DANISH} "Slet indstillinger"
+  LangString MsgDelSettings ${LANG_GERMAN} "Einstellungen löschen"
+  LangString MsgDelSettings ${LANG_SPANISH} "Eliminar Ajustes"
+  LangString MsgDelSettings ${LANG_FINNISH} "Poista asetukset"
+  LangString MsgDelSettings ${LANG_FRENCH} "Supprimer les paramètres"
+  LangString MsgDelSettings ${LANG_HEBREW} "מחק הגדרות"
+  LangString MsgDelSettings ${LANG_ITALIAN} "Elimina impostazioni"
+  LangString MsgDelSettings ${LANG_NORWEGIAN} "Slett innstillinger"
+  LangString MsgDelSettings ${LANG_DUTCH} "Verwijder alle instellingen"
+  LangString MsgDelSettings ${LANG_POLISH} "Skasuj obecne ustawienia"
+  LangString MsgDelSettings ${LANG_PORTUGUESEBR} "Apagar Configurações"
+  LangString MsgDelSettings ${LANG_ROMANIAN} "Ştergeţi Setări"
+  LangString MsgDelSettings ${LANG_RUSSIAN} "Удалить параметры"
+  LangString MsgDelSettings ${LANG_SERBIAN} "Обриши подешавања"
+  LangString MsgDelSettings ${LANG_SWEDISH} "Radera inställningar"
+  LangString MsgDelSettings ${LANG_TURKISH} "Ayarları Sil"
+  LangString MsgDelSettings ${LANG_SIMPCHINESE} "删除设置"

  LangString MsgLangCode    ${LANG_ENGLISH} "en"
+  LangString MsgLangCode    ${LANG_CZECH} "cs"
+  LangString MsgLangCode    ${LANG_DANISH} "da"
+  LangString MsgLangCode    ${LANG_GERMAN} "de"
+  LangString MsgLangCode    ${LANG_SPANISH} "es"
+  LangString MsgLangCode    ${LANG_FINNISH} "fi"
+  LangString MsgLangCode    ${LANG_FRENCH} "fr"
+  LangString MsgLangCode    ${LANG_HEBREW} "he"
+  LangString MsgLangCode    ${LANG_ITALIAN} "it"
+  LangString MsgLangCode    ${LANG_NORWEGIAN} "nb"
+  LangString MsgLangCode    ${LANG_DUTCH} "nl"
+  LangString MsgLangCode    ${LANG_POLISH} "pl"
+  LangString MsgLangCode    ${LANG_PORTUGUESEBR} "pt_BR"
+  LangString MsgLangCode    ${LANG_ROMANIAN} "ro"
+  LangString MsgLangCode    ${LANG_RUSSIAN} "ru"
+  LangString MsgLangCode    ${LANG_SERBIAN} "sr"
+  LangString MsgLangCode    ${LANG_SWEDISH} "sv"
+  LangString MsgLangCode    ${LANG_TURKISH} "tr"
+  LangString MsgLangCode    ${LANG_SIMPCHINESE} "zh_CN"

 Function un.onInit
  !insertmacro MUI_UNGETLANGUAGE
@@ -0,0 +1,501 @@
+#################################################################################
+# StdUtils plug-in for NSIS
+# Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# http://www.gnu.org/licenses/lgpl-2.1.txt
+#################################################################################
+
+# DEVELOPER NOTES:
+# - Please see "https://github.com/lordmulder/stdutils/" for news and updates!
+# - Please see "Docs\StdUtils\StdUtils.html" for detailed function descriptions!
+# - Please see "Examples\StdUtils\StdUtilsTest.nsi" for usage examples!
+
+#################################################################################
+# FUNCTION DECLARTIONS
+#################################################################################
+
+!ifndef ___STDUTILS__NSH___
+!define ___STDUTILS__NSH___
+
+!define StdUtils.Time             '!insertmacro _StdU_Time'          #time(), as in C standard library
+!define StdUtils.GetMinutes       '!insertmacro _StdU_GetMinutes'    #GetSystemTimeAsFileTime(), returns the number of minutes
+!define StdUtils.GetHours         '!insertmacro _StdU_GetHours'      #GetSystemTimeAsFileTime(), returns the number of hours
+!define StdUtils.GetDays          '!insertmacro _StdU_GetDays'       #GetSystemTimeAsFileTime(), returns the number of days
+!define StdUtils.Rand             '!insertmacro _StdU_Rand'          #rand(), as in C standard library
+!define StdUtils.RandMax          '!insertmacro _StdU_RandMax'       #rand(), as in C standard library, with maximum value
+!define StdUtils.RandMinMax       '!insertmacro _StdU_RandMinMax'    #rand(), as in C standard library, with minimum/maximum value
+!define StdUtils.RandList         '!insertmacro _StdU_RandList'      #rand(), as in C standard library, with list support
+!define StdUtils.RandBytes        '!insertmacro _StdU_RandBytes'     #Generates random bytes, returned as Base64-encoded string
+!define StdUtils.FormatStr        '!insertmacro _StdU_FormatStr'     #sprintf(), as in C standard library, one '%d' placeholder
+!define StdUtils.FormatStr2       '!insertmacro _StdU_FormatStr2'    #sprintf(), as in C standard library, two '%d' placeholders
+!define StdUtils.FormatStr3       '!insertmacro _StdU_FormatStr3'    #sprintf(), as in C standard library, three '%d' placeholders
+!define StdUtils.ScanStr          '!insertmacro _StdU_ScanStr'       #sscanf(), as in C standard library, one '%d' placeholder
+!define StdUtils.ScanStr2         '!insertmacro _StdU_ScanStr2'      #sscanf(), as in C standard library, two '%d' placeholders
+!define StdUtils.ScanStr3         '!insertmacro _StdU_ScanStr3'      #sscanf(), as in C standard library, three '%d' placeholders
+!define StdUtils.TrimStr          '!insertmacro _StdU_TrimStr'       #Remove whitspaces from string, left and right
+!define StdUtils.TrimStrLeft      '!insertmacro _StdU_TrimStrLeft'   #Remove whitspaces from string, left side only
+!define StdUtils.TrimStrRight     '!insertmacro _StdU_TrimStrRight'  #Remove whitspaces from string, right side only
+!define StdUtils.RevStr           '!insertmacro _StdU_RevStr'        #Reverse a string, e.g. "reverse me" <-> "em esrever"
+!define StdUtils.ValidFileName    '!insertmacro _StdU_ValidFileName' #Test whether string is a valid file name - no paths allowed
+!define StdUtils.ValidPathSpec    '!insertmacro _StdU_ValidPathSpec' #Test whether string is a valid full(!) path specification
+!define StdUtils.ValidDomainName  '!insertmacro _StdU_ValidDomain'   #Test whether string is a valid host name or domain name
+!define StdUtils.StrToUtf8        '!insertmacro _StdU_StrToUtf8'     #Convert string from Unicode (UTF-16) or ANSI to UTF-8 bytes
+!define StdUtils.StrFromUtf8      '!insertmacro _StdU_StrFromUtf8'   #Convert string from UTF-8 bytes to Unicode (UTF-16) or ANSI
+!define StdUtils.SHFileMove       '!insertmacro _StdU_SHFileMove'    #SHFileOperation(), using the FO_MOVE operation
+!define StdUtils.SHFileCopy       '!insertmacro _StdU_SHFileCopy'    #SHFileOperation(), using the FO_COPY operation
+!define StdUtils.AppendToFile     '!insertmacro _StdU_AppendToFile'  #Append contents of an existing file to another file
+!define StdUtils.ExecShellAsUser  '!insertmacro _StdU_ExecShlUser'   #ShellExecute() as NON-elevated user from elevated installer
+!define StdUtils.InvokeShellVerb  '!insertmacro _StdU_InvkeShlVrb'   #Invokes a "shell verb", e.g. for pinning items to the taskbar
+!define StdUtils.ExecShellWaitEx  '!insertmacro _StdU_ExecShlWaitEx' #ShellExecuteEx(), returns the handle of the new process
+!define StdUtils.WaitForProcEx    '!insertmacro _StdU_WaitForProcEx' #WaitForSingleObject(), e.g. to wait for a running process
+!define StdUtils.GetParameter     '!insertmacro _StdU_GetParameter'  #Get the value of a specific command-line option
+!define StdUtils.TestParameter    '!insertmacro _StdU_TestParameter' #Test whether a specific command-line option has been set
+!define StdUtils.ParameterCnt     '!insertmacro _StdU_ParameterCnt'  #Get number of command-line tokens, similar to argc in main()
+!define StdUtils.ParameterStr     '!insertmacro _StdU_ParameterStr'  #Get the n-th command-line token, similar to argv[i] in main()
+!define StdUtils.GetAllParameters '!insertmacro _StdU_GetAllParams'  #Get complete command-line, but without executable name
+!define StdUtils.GetRealOSVersion '!insertmacro _StdU_GetRealOSVer'  #Get the *real* Windows version number, even on Windows 8.1+
+!define StdUtils.GetRealOSBuildNo '!insertmacro _StdU_GetRealOSBld'  #Get the *real* Windows build number, even on Windows 8.1+
+!define StdUtils.GetRealOSName    '!insertmacro _StdU_GetRealOSStr'  #Get the *real* Windows version, as a "friendly" name
+!define StdUtils.GetOSEdition     '!insertmacro _StdU_GetOSEdition'  #Get the Windows edition, i.e. "workstation" or "server"
+!define StdUtils.GetOSReleaseId   '!insertmacro _StdU_GetOSRelIdNo'  #Get the Windows release identifier (on Windows 10)
+!define StdUtils.GetOSReleaseName '!insertmacro _StdU_GetOSRelIdStr' #Get the Windows release (on Windows 10), as a "friendly" name
+!define StdUtils.VerifyOSVersion  '!insertmacro _StdU_VrfyRealOSVer' #Compare *real* operating system to an expected version number
+!define StdUtils.VerifyOSBuildNo  '!insertmacro _StdU_VrfyRealOSBld' #Compare *real* operating system to an expected build number
+!define StdUtils.HashText         '!insertmacro _StdU_HashText'      #Compute hash from text string (CRC32, MD5, SHA1/2/3, BLAKE2)
+!define StdUtils.HashFile         '!insertmacro _StdU_HashFile'      #Compute hash from file (CRC32, MD5, SHA1/2/3, BLAKE2)
+!define StdUtils.NormalizePath    '!insertmacro _StdU_NormalizePath' #Simplifies the path to produce a direct, well-formed path
+!define StdUtils.GetParentPath    '!insertmacro _StdU_GetParentPath' #Get parent path by removing the last component from the path
+!define StdUtils.SplitPath        '!insertmacro _StdU_SplitPath'     #Split the components of the given path
+!define StdUtils.GetDrivePart     '!insertmacro _StdU_GetDrivePart'  #Get drive component of path
+!define StdUtils.GetDirectoryPart '!insertmacro _StdU_GetDirPart'    #Get directory component of path
+!define StdUtils.GetFileNamePart  '!insertmacro _StdU_GetFNamePart'  #Get file name component of path
+!define StdUtils.GetExtensionPart '!insertmacro _StdU_GetExtnPart'   #Get file extension component of path
+!define StdUtils.TimerCreate      '!insertmacro _StdU_TimerCreate'   #Create a new event-timer that will be triggered periodically
+!define StdUtils.TimerDestroy     '!insertmacro _StdU_TimerDestroy'  #Destroy a running timer created with TimerCreate()
+!define StdUtils.ProtectStr       '!insertmacro _StdU_PrtctStr'      #Protect a given String using Windows' DPAPI
+!define StdUtils.UnprotectStr     '!insertmacro _StdU_UnprtctStr'    #Unprotect a string that was protected via ProtectStr()
+!define StdUtils.GetLibVersion    '!insertmacro _StdU_GetLibVersion' #Get the current StdUtils library version (for debugging)
+!define StdUtils.SetVerbose       '!insertmacro _StdU_SetVerbose'    #Enable or disable "verbose" mode (for debugging)
+
+
+#################################################################################
+# MACRO DEFINITIONS
+#################################################################################
+
+!macro _StdU_Time out
+	StdUtils::Time /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetMinutes out
+	StdUtils::GetMinutes /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetHours out
+	StdUtils::GetHours /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetDays out
+	StdUtils::GetDays /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_Rand out
+	StdUtils::Rand /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandMax out max
+	push ${max}
+	StdUtils::RandMax /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandMinMax out min max
+	push ${min}
+	push ${max}
+	StdUtils::RandMinMax /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_RandList count max
+	push ${max}
+	push ${count}
+	StdUtils::RandList /NOUNLOAD
+!macroend
+
+!macro _StdU_RandBytes out count
+	push ${count}
+	StdUtils::RandBytes /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr out format val
+	push `${format}`
+	push ${val}
+	StdUtils::FormatStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr2 out format val1 val2
+	push `${format}`
+	push ${val1}
+	push ${val2}
+	StdUtils::FormatStr2 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_FormatStr3 out format val1 val2 val3
+	push `${format}`
+	push ${val1}
+	push ${val2}
+	push ${val3}
+	StdUtils::FormatStr3 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ScanStr out format input default
+	push `${format}`
+	push `${input}`
+	push ${default}
+	StdUtils::ScanStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ScanStr2 out1 out2 format input default1 default2
+	push `${format}`
+	push `${input}`
+	push ${default1}
+	push ${default2}
+	StdUtils::ScanStr2 /NOUNLOAD
+	pop ${out1}
+	pop ${out2}
+!macroend
+
+!macro _StdU_ScanStr3 out1 out2 out3 format input default1 default2 default3
+	push `${format}`
+	push `${input}`
+	push ${default1}
+	push ${default2}
+	push ${default3}
+	StdUtils::ScanStr3 /NOUNLOAD
+	pop ${out1}
+	pop ${out2}
+	pop ${out3}
+!macroend
+
+!macro _StdU_TrimStr var
+	push ${var}
+	StdUtils::TrimStr /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_TrimStrLeft var
+	push ${var}
+	StdUtils::TrimStrLeft /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_TrimStrRight var
+	push ${var}
+	StdUtils::TrimStrRight /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_RevStr var
+	push ${var}
+	StdUtils::RevStr /NOUNLOAD
+	pop ${var}
+!macroend
+
+!macro _StdU_ValidFileName out test
+	push `${test}`
+	StdUtils::ValidFileName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ValidPathSpec out test
+	push `${test}`
+	StdUtils::ValidPathSpec /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ValidDomain out test
+	push `${test}`
+	StdUtils::ValidDomainName /NOUNLOAD
+	pop ${out}
+!macroend
+
+
+!macro _StdU_StrToUtf8 out str
+	push `${str}`
+	StdUtils::StrToUtf8 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_StrFromUtf8 out trnc str
+	push ${trnc}
+	push `${str}`
+	StdUtils::StrFromUtf8 /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SHFileMove out from to hwnd
+	push `${from}`
+	push `${to}`
+	push ${hwnd}
+	StdUtils::SHFileMove /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SHFileCopy out from to hwnd
+	push `${from}`
+	push `${to}`
+	push ${hwnd}
+	StdUtils::SHFileCopy /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_AppendToFile out from dest offset maxlen
+	push `${from}`
+	push `${dest}`
+	push ${offset}
+	push ${maxlen}
+	StdUtils::AppendToFile /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ExecShlUser out file verb args
+	push `${file}`
+	push `${verb}`
+	push `${args}`
+	StdUtils::ExecShellAsUser /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_InvkeShlVrb out path file verb_id
+	push "${path}"
+	push "${file}"
+	push ${verb_id}
+	StdUtils::InvokeShellVerb /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ExecShlWaitEx out_res out_val file verb args
+	push `${file}`
+	push `${verb}`
+	push `${args}`
+	StdUtils::ExecShellWaitEx /NOUNLOAD
+	pop ${out_res}
+	pop ${out_val}
+!macroend
+
+!macro _StdU_WaitForProcEx out handle
+	push `${handle}`
+	StdUtils::WaitForProcEx /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetParameter out name default
+	push `${name}`
+	push `${default}`
+	StdUtils::GetParameter /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TestParameter out name
+	push `${name}`
+	StdUtils::TestParameter /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ParameterCnt out
+	StdUtils::ParameterCnt /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_ParameterStr out index
+	push ${index}
+	StdUtils::ParameterStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetAllParams out truncate
+	push `${truncate}`
+	StdUtils::GetAllParameters /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetRealOSVer out_major out_minor out_spack
+	StdUtils::GetRealOsVersion /NOUNLOAD
+	pop ${out_major}
+	pop ${out_minor}
+	pop ${out_spack}
+!macroend
+
+!macro _StdU_GetRealOSBld out
+	StdUtils::GetRealOsBuildNo /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetRealOSStr out
+	StdUtils::GetRealOsName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_VrfyRealOSVer out major minor spack
+	push `${major}`
+	push `${minor}`
+	push `${spack}`
+	StdUtils::VerifyRealOsVersion /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_VrfyRealOSBld out build
+	push `${build}`
+	StdUtils::VerifyRealOsBuildNo /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSEdition out
+	StdUtils::GetOsEdition /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSRelIdNo out
+	StdUtils::GetOsReleaseId /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetOSRelIdStr out
+	StdUtils::GetOsReleaseName /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_HashText out type text
+	push `${type}`
+	push `${text}`
+	StdUtils::HashText /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_HashFile out type file
+	push `${type}`
+	push `${file}`
+	StdUtils::HashFile /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_NormalizePath out path
+	push `${path}`
+	StdUtils::NormalizePath /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetParentPath out path
+	push `${path}`
+	StdUtils::GetParentPath /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_SplitPath out_drive out_dir out_fname out_ext path
+	push `${path}`
+	StdUtils::SplitPath /NOUNLOAD
+	pop ${out_drive}
+	pop ${out_dir}
+	pop ${out_fname}
+	pop ${out_ext}
+!macroend
+
+!macro _StdU_GetDrivePart out path
+	push `${path}`
+	StdUtils::GetDrivePart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetDirPart out path
+	push `${path}`
+	StdUtils::GetDirectoryPart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetFNamePart out path
+	push `${path}`
+	StdUtils::GetFileNamePart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetExtnPart out path
+	push `${path}`
+	StdUtils::GetExtensionPart /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TimerCreate out callback interval
+	GetFunctionAddress ${out} ${callback}
+	push ${out}
+	push ${interval}
+	StdUtils::TimerCreate /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_TimerDestroy out timer_id
+	push ${timer_id}
+	StdUtils::TimerDestroy /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_PrtctStr out dpsc salt text
+	push `${dpsc}`
+	push `${salt}`
+	push `${text}`
+	StdUtils::ProtectStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_UnprtctStr out trnc salt data
+	push `${trnc}`
+	push `${salt}`
+	push `${data}`
+	StdUtils::UnprotectStr /NOUNLOAD
+	pop ${out}
+!macroend
+
+!macro _StdU_GetLibVersion out_ver out_tst
+	StdUtils::GetLibVersion /NOUNLOAD
+	pop ${out_ver}
+	pop ${out_tst}
+!macroend
+
+!macro _StdU_SetVerbose enable
+	Push ${enable}
+	StdUtils::SetVerboseMode /NOUNLOAD
+!macroend
+
+
+#################################################################################
+# MAGIC NUMBERS
+#################################################################################
+
+!define StdUtils.Const.ShellVerb.PinToTaskbar     0
+!define StdUtils.Const.ShellVerb.UnpinFromTaskbar 1
+!define StdUtils.Const.ShellVerb.PinToStart       2
+!define StdUtils.Const.ShellVerb.UnpinFromStart   3
+
+!endif # !___STDUTILS__NSH___
@@ -0,0 +1,39 @@
+## Download flow (Downloader + NewsWrapper)
+
+1. **Job ingestion**  
+   - NZBs arrive via UI/API/URL; `urlgrabber.py` fetches remote NZBs, `nzbparser.py` turns them into `NzbObject`s, and `nzbqueue.NzbQueue` stores ordered jobs with priorities and categories.
+
+2. **Queue to articles**  
+   - When servers need work, `NzbQueue.get_articles` (called from `Server.get_article` in `downloader.py`) hands out batches of `Article`s per server, respecting retention, priority, and forced/paused items.
+
+3. **Downloader setup**  
+   - `Downloader` thread loads server configs (`config.get_servers`), instantiates `Server` objects (per host/port/SSL/threads), and spawns `NewsWrapper` instances per configured connection.  
+   - A `selectors.DefaultSelector` watches all sockets; `BPSMeter` tracks throughput and speed limits; timers manage server penalties/restarts.
+
+4. **Connection establishment (NewsWrapper.init_connect → NNTP.connect)**  
+   - `Server.request_addrinfo` resolves fastest address; `NewsWrapper` builds an `NNTP` socket, wraps SSL if needed, sets non-blocking, and registers with the selector.  
+   - First server greeting (200/201) is queued; `finish_connect` drives the login handshake (`AUTHINFO USER/PASS`) and handles temporary (480) or permanent (400/502) errors.
+
+5. **Request scheduling & pipelining**  
+   - `write()` chooses the next article command (`STAT/HEAD` for precheck, `BODY` or `ARTICLE` otherwise).  
+   - Concurrency is limited by `server.pipelining_requests`; commands are queued and sent with `sock.sendall`, so there is no local send buffer. 
+   - Sockets stay registered for `EVENT_WRITE`: without write readiness events, a temporarily full kernel send buffer could stall queued commands when there is nothing to read, so WRITE interest is needed to resume sending promptly.
+
+6. **Receiving data**  
+   - Selector events route to `process_nw_read`; `NewsWrapper.read` pulls bytes (SSL optimized via sabctools), parses NNTP responses, and calls `on_response`.  
+   - Successful BODY/ARTICLE (220/222) updates per-server stats; missing/500 variants toggle capability flags (BODY/STAT support).
+
+7. **Decoding and caching**  
+   - `Downloader.decode` hands responses to `decoder.decode`, which yEnc/UU decodes, CRC-checks, and stores payloads in `ArticleCache` (memory or disk spill).  
+   - Articles with DMCA/bad data trigger retry on other servers until `max_art_tries` is exceeded.
+
+8. **Assembly to files**  
+   - `Assembler` worker consumes decoded pieces, writes to the target file, updates CRC, and cleans admin markers. It guards disk space (`diskspace_check`) and schedules direct unpack or PAR2 handling when files finish.
+
+9. **Queue bookkeeping**  
+   - `NzbQueue.register_article` records success/failure; completed files advance NZF/NZO state. If all files done, the job moves to post-processing (`PostProcessor.process`), which runs `newsunpack`, scripts, sorting, etc.
+
+10. **Control & resilience**  
+    - Pausing/resuming (`Downloader.pause/resume`), bandwidth limiting, and sleep tuning happen in the main loop.  
+    - Errors/timeouts lead to `reset_nw` (close socket, return article, maybe penalize server). Optional servers can be temporarily disabled; required ones schedule resumes.  
+    - Forced disconnect/shutdown drains sockets, refreshes DNS, and exits cleanly.
@@ -0,0 +1,32 @@
+## Repo layout
+
+- Entry points & metadata  
+  - `SABnzbd.py`: starts the app.  
+  - `README.md` / `README.mkd`: release notes and overview.  
+  - `requirements.txt`: runtime deps.
+
+- Core application package `sabnzbd/`  
+  - Download engine: `downloader.py` (main loop), `newswrapper.py` (NNTP connections), `urlgrabber.py`, `nzbqueue.py` (queue), `nzbparser.py` (parse NZB), `assembler.py` (writes decoded parts), `decoder.py` (yEnc/UU decode), `articlecache.py` (in-memory/on-disk cache).  
+  - Post-processing: `newsunpack.py`, `postproc.py`, `directunpacker.py`, `sorting.py`, `deobfuscate_filenames.py`.  
+  - Config/constants/utilities: `cfg.py`, `config.py`, `constants.py`, `misc.py`, `filesystem.py`, `encoding.py`, `lang.py`, `scheduler.py`, `notifier.py`, `emailer.py`, `rss.py`.  
+  - UI plumbing: `interface.py`, `skintext.py`, `version.py`, platform helpers (`macosmenu.py`, `sabtray*.py`).  
+  - Subpackages: `sabnzbd/nzb/` (NZB model objects), `sabnzbd/utils/` (helpers).
+
+- Web interfaces & assets  
+  - `interfaces/Glitter`, `interfaces/Config`, `interfaces/wizard`: HTML/JS/CSS skins.  
+  - `icons/`: tray/web icons.  
+  - `locale/`, `po/`, `tools/`: translation sources and helper scripts (`make_mo.py`, etc.).
+
+- Testing & samples  
+  - `tests/`: pytest suite plus `data/` fixtures and `test_utils/`.  
+  - `scripts/`: sample post-processing hooks (`Sample-PostProc.*`).  
+
+- Packaging/build  
+  - `builder/`: platform build scripts (DMG/EXE specs, `package.py`, `release.py`).  
+  - Platform folders `win/`, `macos/`, `linux/`, `snap/`: installer or platform-specific assets.  
+  - `admin/`, `builder/common.py`, `licenses/`: release and licensing support files.
+
+- Documentation
+  - Documentation website source is stored in the `sabnzbd.github.io` repo.
+  - This repo is most likely located 1 level up from the root folder of this repo.
+  - Documentation is split per SABnzbd version, in the `wiki` folder.
@@ -1,7 +1,7 @@
 ##
 ## Bad URL Fetch Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##
@@ -1,7 +1,7 @@
 ##
 ## Default Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##
@@ -1,7 +1,7 @@
 ##
 ## RSS Email template for SABnzbd
 ## This a Cheetah template
-## Documentation: http://sabnzbd.wikidot.com/email-templates
+## Documentation: https://sabnzbd.org/wiki/extra/email-templates
 ##
 ## Newlines and whitespace are significant!
 ##
@@ -2,23 +2,23 @@
        <div class="clearfix"></div>

        <!-- Filebrowser modal -->
-        <div class="modal fade" id="filebrowser_modal">
+        <div class="modal fade" id="filebrowser_modal" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="filebrowser-modal-title">
            <div class="modal-dialog">
                <div class="modal-content">
                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                        <h4 class="modal-title"></h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title" id="filebrowser-modal-title"></h4>
                    </div>
                    <div class="modal-body">
                    </div>
                    <div class="modal-footer">
-                        <!--#if not $nt#-->
+
                        <div class="checkbox">
                            <label>
-                                <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</span>
+                                <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
                            </label>
                        </div>
-                        <!--#end if#-->
+
                        <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
                        <button type="button" class="btn btn-default" id="filebrowser_modal_accept"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
                    </div>
@@ -33,4 +33,4 @@
        </div>
    </div>
 </body>
-</html>
+</html>
@@ -1,10 +1,5 @@
-#if $pane == "Config"#
-    #set global $root = '../'#
-#else#
-    #set global $root = '../../'#
-#end if#
 <!DOCTYPE HTML>
-<html lang="$active_lang" #if $rtl#dir="rtl"#end if#>
+<html lang="$active_lang" #if $rtl#dir="rtl"#end if# data-color-scheme="$color_scheme">
 <head>
    <title>
        SABnzbd $T('menu-config')
@@ -14,7 +9,7 @@
        #if $pane == "Switches" then $T('cmenu-switches') else ""#
        #if $pane == "Servers" then $T('cmenu-servers') else ""#
        #if $pane == "Scheduling" then $T('cmenu-scheduling') else ""#
-        #if $pane == "Email" then $T('cmenu-notif') else ""#
+        #if $pane == "Notify" then $T('cmenu-notif') else ""#
        #if $pane == "Categories" then $T('cmenu-cat') else ""#
        #if $pane == "Sorting" then $T('cmenu-sorting') else ""#
        #if $pane == "Special" then $T('cmenu-special') else ""#
@@ -25,17 +20,17 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
    <meta name="apple-mobile-web-app-title" content="SABnzbd" />

-    <link rel="apple-touch-icon" sizes="76x76" href="${root}staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="${root}staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="${root}staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="${root}staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="${root}staticcfg/ico/android-192x192.png" />
+    <link rel="apple-touch-icon" sizes="76x76" href="$url('staticcfg/ico/apple-touch-icon-76x76-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="120x120" href="$url('staticcfg/ico/apple-touch-icon-120x120-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="152x152" href="$url('staticcfg/ico/apple-touch-icon-152x152-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="180x180" href="$url('staticcfg/ico/apple-touch-icon-180x180-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="192x192" href="$url('staticcfg/ico/android-192x192.png', v=$cache_buster)" />

-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/chartist.min.css" />
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?v=$version" />
+    <link rel="stylesheet" type="text/css" href="$url('staticcfg/bootstrap/css/bootstrap.min.css', v=$cache_buster)" />
+    <link rel="stylesheet" type="text/css" href="$url('staticcfg/css/chartist.min.css', v=$cache_buster)" />
+    <link rel="stylesheet" type="text/css" href="$url('staticcfg/css/style.css', v=$cache_buster)" />

-    <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
+    <link rel="shortcut icon" href="$url('staticcfg/ico/favicon.ico', v=$cache_buster)" />

    <script type="text/javascript">
        // Keeping track of the form state
@@ -43,10 +38,10 @@
        var formWasSubmitted = false;

        // Information we need
-        var sabSession = '$apikey';
-        var rootURL = '${root}'
+        var csrfToken = '$csrf_token';
+        var rootURL = '$url()'
        var urlBase = '${url_base}'
-        var folderBrowseUrl = '${root}api?mode=browse&output=json&apikey=$apikey';
+        var folderBrowseUrl = "$url('api', mode='browse', output='json')";
        var folderSeperator = '#if $os.sep == '\\' then '\\\\' else '/'#'

        // Translations
@@ -62,32 +57,12 @@
        configTranslate.confirmLeave = "$T('confirmWithoutSavingPrompt')";
        configTranslate.searchPages = ['$T('cmenu-general')', '$T('cmenu-folders')', '$T('cmenu-switches')', '$T('cmenu-sorting')', '$T('cmenu-notif')', '$T('cmenu-special')']
    </script>
-    <script type="text/javascript" src="${root}staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
-    <script type="text/javascript" src="${root}staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
-    <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
+    <script type="text/javascript" src="$url('staticcfg/js/jquery-3.7.1.min.js', v=$cache_buster)"></script>
+    <script type="text/javascript" src="$url('staticcfg/bootstrap/js/bootstrap.min.js', v=$cache_buster)"></script>
+    <script type="text/javascript" src="$url('staticcfg/js/script.js', v=$cache_buster)"></script>
    <script type="text/javascript">
        // Set default functions for the autocomplete everywhere
-        \$.extend(\$.fn.typeahead.defaults, {
-            source: function (query, process) {
-                // If there's no seperator, it must be a relative path
-                if(query.split(folderSeperator).length < 2 && this.\$element.data('initialdir')) {
-                    query  = this.\$element.data('initialdir') + folderSeperator + query;
-                }
-                // Get info from the API
-                return \$.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
-                    return process(data);
-                });
-            },
-            updater: function(item) {
-                // Is it a relative path?
-                if(item.indexOf(this.\$element.data('initialdir')) === 0) {
-                    // Remove start
-                    return item.replace(this.\$element.data('initialdir')+folderSeperator, '');
-                }
-                // Full path
-                return item
-            }
-        })
+

        // to top right away
        if(window.location.hash) {
@@ -109,62 +84,62 @@
                <span class="icon-bar"></span>
            </button>

-            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')">
+            <a class="navbar-logo navbar-logo-small" href="$url()" title="$T('Home')" data-placement="bottom">
                #include $webdir + "/staticcfg/images/logo-small.svg"#
            </a>
        </div>
        <div id="navbar" class="navbar-collapse collapse">
            <ul class="nav navbar-nav">
                <li>
-                    <a href="${root}config/general/" #if $pane == "General" then 'class="active"' else ""#>
+                    <a href="$url('config/general')" #if $pane == "General" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-cog"></span>
                        <strong>$T('cmenu-general')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/folders/" #if $pane == "Folders" then 'class="active"' else ""#>
+                    <a href="$url('config/folders')" #if $pane == "Folders" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-folder-open"></span>
                        <strong>$T('cmenu-folders')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/server/" #if $pane == "Servers" then 'class="active"' else ""#>
+                    <a href="$url('config/server')" #if $pane == "Servers" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-sort"></span>
                        <strong>$T('cmenu-servers')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/categories/" #if $pane == "Categories" then 'class="active"' else ""#>
+                    <a href="$url('config/categories')" #if $pane == "Categories" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-tag"></span>
                        <strong>$T('cmenu-cat')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/switches/" #if $pane == "Switches" then 'class="active"' else ""#>
+                    <a href="$url('config/switches')" #if $pane == "Switches" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-check"></span>
                        <strong>$T('cmenu-switches')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/sorting/" #if $pane == "Sorting" then 'class="active"' else ""#>
+                    <a href="$url('config/sorting')" #if $pane == "Sorting" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-sort-by-alphabet"></span>
                        <strong>$T('cmenu-sorting')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/notify/" #if $pane == "Email" then 'class="active"' else ""#>
+                    <a href="$url('config/notify')" #if $pane == "Notify" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-comment"></span>
                        <strong>$T('cmenu-notif')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/scheduling/" #if $pane == "Scheduling" then 'class="active"' else ""#>
+                    <a href="$url('config/scheduling')" #if $pane == "Scheduling" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-time"></span>
                        <strong>$T('cmenu-scheduling')</strong>
                    </a>
                </li>
                <li>
-                    <a href="${root}config/rss/" #if $pane == "RSS" then 'class="active"' else ""#>
+                    <a href="$url('config/rss')" #if $pane == "RSS" then 'class="active"' else ""#>
                        <svg class="rss-icon-svg" viewBox="0 0 8 8">
                            <rect class="rss-button" width="8" height="8" />
                            <circle class="rss-symbol" cx="2" cy="6" r="1" />
@@ -175,26 +150,26 @@
                    </a>
                </li>
                <li>
-                    <a href="${root}config/special/" #if $pane == "Special" then 'class="active"' else ""#>
+                    <a href="$url('config/special')" #if $pane == "Special" then 'class="active"' else ""#>
                        <span class="glyphicon glyphicon-education"></span>
                        <strong>$T('cmenu-special')</strong>
                    </a>
                </li>
                <li>
-                    <a href="$helpuri$help_uri" target="_blank">
+                    <a href="$help_uri" target="_blank">
                        <span class="glyphicon glyphicon-question-sign"></span>
                        <strong>$T('menu-help')</strong>
                    </a>
                </li>
                <li class="dropdown" id="search-menu">
-                    <a data-toggle="dropdown" href="#">
+                    <a data-toggle="dropdown" href="#" aria-label="$T('cmenu-search')" aria-controls="search-dropdown" aria-haspopup="true" aria-expanded="false">
                        <span class="glyphicon glyphicon-search"></span>
                        <strong><span class="glyphicon glyphicon-search"></span></strong>
                    </a>
                    <ul class="dropdown-menu" id="search-dropdown">
                        <li>
                            <form onsubmit="return false">
-                                <input type="text" name="config-search" id="search-box" placeholder="$T('cmenu-search')" onkeyup="doConfigSearch(this)">
+                                <input type="text" name="config-search" id="search-box" placeholder="$T('cmenu-search')" aria-label="$T('cmenu-search')" aria-controls="search-dropdown" onkeyup="doConfigSearch(this)">
                            </form>
                        </li>
                    </ul>
@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.4/configure"#-->
+<!--#set global $help_uri = $confighelpuri + "configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -25,59 +25,31 @@
                </tr>
                <tr>
                    <th scope="row">$T('pythonVersion'): </th>
-                    <td>$sys.version[:120] [$CODEPAGE]</td>
+                    <td>$sys.version [$CODEPAGE]</td>
                </tr>
                <tr>
                    <th scope="row">OpenSSL:</th>
-                    <td>
-                        $ssl_version
-                    </td>
+                    <td>$ssl_version</td>
                </tr>
-                <!--#if not $certificate_validation#-->
+                <!--#if not $windows and not $macos#-->
                <tr>
-                    <th scope="row"></th>
+                    <th scope="row">Par2cmdline-turbo:</th>
                    <td>
-                        <span class="label label-danger">$T('warning')</span> $T('explain-nosslcontext')
-                    </td>
-                </tr>
-                <!--#end if#-->
-                <!--#if not $nt and not $darwin#-->
-                <tr>
-                    <th scope="row">$T('opt-multicore-par2')</th>
-                    <td>
-                        <!--#if $have_mt_par2#-->
+                        <!--#if $have_par2_turbo#-->
                        <span class="glyphicon glyphicon-ok"></span>
                        <!--#else#-->
-                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
-                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2turbo')<br>
+                        <a href="https://sabnzbd.org/wiki/installation/par2cmdline-turbo" target="_blank">https://sabnzbd.org/wiki/installation/par2cmdline-turbo</a>
                        <!--#end if#-->
                    </td>
                </tr>
                <!--#end if#-->
-                <!--#if not $have_sabyenc#-->
-                <tr>
-                    <th scope="row">SABYenc:</th>
-                    <td>
-                        <span class="label label-danger">$T('notAvailable')</span>
-                        <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
-                <!--#if not $have_unzip and not $have_7zip #-->
-                <tr>
-                    <th scope="row">$T('opt-enable_unzip'):</th>
-                    <td>
-                        <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
                <!--#if not $have_7zip #-->
                <tr>
                    <th scope="row">$T('opt-enable_7zip'):</th>
                    <td>
                        <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                        <a href="https://sabnzbd.org/wiki/installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
                    </td>
                </tr>
                <!--#end if#-->
@@ -106,8 +78,8 @@
                    <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd</a></td>
                </tr>
                <tr>
-                    <th scope="row">$T('menu-irc') </th>
-                    <td><a href="irc://irc.synirc.net/#sabnzbd"><i>#sabnzbd</i> on <i>irc.synirc.net</i></a> $T('or') (<a href="http://sabnzbd.org/live-chat/" target="_blank">webchat</a>)</td>
+                    <th scope="row">$T('menu-live-chat') </th>
+                    <td><a href="https://sabnzbd.org/live-chat/" target="_blank">https://sabnzbd.org/live-chat/</a> (IRC &amp; Discord)</td>
                </tr>
                <tr>
                    <th scope="row">$T('menu-issues') </th>
@@ -123,8 +95,8 @@
 </div>

 <div class="colmask">
-    <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2021 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+    <div class="section padding">
+        <h5 class="copyright">Copyright &copy; 2007-2026 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)</h5>
        <p class="copyright"><small>$T('yourRights')</small></p>
    </div>

@@ -1,15 +1,16 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.4/categories"#-->
+<!--#set global $help_uri = $confighelpuri + "categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
    <div class="section">
-        <div class="padTable"> <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+        <div class="padTable">
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
            <p>$T('explain-catTags2')<br/>$T('explain-catTags')</p>
            <hr>
            <h5 class="darkred"><strong>$T('explain-relFolder'):</strong> <span class="path">$defdir</span></h5>
            <!--#for $cur, $slot in enumerate($slotinfo)#-->
                <!--#set $cansort = $slot.name != '*' and $slot.name != ''#-->
-                <form action="save" method="get" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
+                <form action="$url('config/categories/save')" method="post" class="fullform <!--#if $cansort then 'sorting-row' else ''#-->">
                    <table class="catTable">
                        <!--#if $cur == 0#-->
                        <tr>
@@ -27,7 +28,6 @@
                                <span class="glyphicon glyphicon-option-vertical"></span>
                            </td>
                            <td>
-                                <input type="hidden" name="apikey" value="$apikey" />
                                <input type="hidden" name="order" value="$slot.order" />
                                <input type="hidden" value="$slot.name" name="name" />
                                <!--#if $slot.name != '*'#-->
@@ -102,33 +102,33 @@
        </div>
    </div>
 </div>
-<script type="text/javascript" src="${root}staticcfg/js/jquery-ui.min.js"></script>
+<script type="text/javascript" src="$url('staticcfg/js/jquery-ui.min.js', v=$cache_buster)"></script>
 <script type="text/javascript">
-    \$(document).ready(function() {
-        \$('.delCat').click(function() {
-            var theForm = \$(this).closest("form");
-            theForm.attr("action", "delete").submit();
+    jQuery(document).ready(function() {
+        jQuery('.delCat').click(function() {
+            var theForm = jQuery(this).closest("form");
+            theForm.attr("action", "$url('config/categories/delete')").submit();
        });

        // Add autocomplete and file-browser
-        \$('.fileBrowserSmall').typeahead().fileBrowser();
+        jQuery('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();

        // Make categories sortable
-        \$('.padTable').sortable({
+        jQuery('.padTable').sortable({
            items: '.sorting-row',
            containment: '.colmask',
            axis: 'y',
            update: function(event, ui) {
-                \$('.Categories form.sorting-row').each(function(index, elm) {
+                jQuery('.Categories form.sorting-row').each(function(index, elm) {
                    // Update order of all elements
-                    if(index != elm.order.value) {
+                    if(index !== elm.order.value) {
                        elm.order.value = index
                        // Submit changed order
                        var data = {}
-                        \$(elm).extractFormDataTo(data);
-                        \$.ajax({
-                            type: "GET",
-                            url: window.location.pathname + 'save',
+                        jQuery(elm).extractFormDataTo(data);
+                        jQuery.ajax({
+                            type: "POST",
+                            url: "$url('config/categories/save')",
                            data: data,
                            async: false // To prevent race-conditions when updating categories
                        })
@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.4/folders"#-->
+<!--#set global $help_uri = $confighelpuri + "folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -8,13 +8,11 @@
            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
        </label>
    </div>
-    <form action="saveDirectories" method="post" name="fullform" class="fullform" autocomplete="off">
-    <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+    <form action="$url('config/folders/save')" method="post" class="fullform" autocomplete="off">
    <input type="hidden" name="output" value="json" />
-    <input type="hidden" id="ajax" name="ajax" value="1" />
    <div class="section">
        <div class="col2">
-            <h3>$T('userFolders') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('userFolders') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <p>$T('explain-folderConfig')</p>
        </div><!-- /col2 -->
        <div class="col1">
@@ -35,7 +33,8 @@
                <div class="field-pair">
                    <label class="config" for="complete_dir">$T('opt-complete_dir')</label>
                    <input type="text" name="complete_dir" id="complete_dir" value="$complete_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-complete_dir')</span>
+                    <a class="btn btn-default" href="$url('config/sorting')"><span class="glyphicon glyphicon-sort-by-alphabet"></span> $T('cmenu-sorting')</a>
+                    <span class="desc">$T('explain-complete_dir') <br/> $T('explain-complete_dir-sorting')</span>
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="complete_free">$T('opt-complete_free')</label>
@@ -47,7 +46,7 @@
                    <input type="checkbox" name="fulldisk_autoresume" id="fulldisk_autoresume" value="1" <!--#if int($fulldisk_autoresume) > 0 then 'checked="checked"' else ""#--> />
                    <span class="desc">$T('explain-fulldisk_autoresume')</span>
                </div>
-                <!--#if not $nt#-->
+                <!--#if not $windows#-->
                <div class="field-pair advanced-settings">
                    <label class="config" for="permissions">$T('opt-permissions')</label>
                    <input type="text" name="permissions" id="permissions" value="$permissions" class="smaller_input" />
@@ -57,7 +56,7 @@
                <div class="field-pair">
                    <label class="config" for="dirscan_dir">$T('opt-dirscan_dir')</label>
                    <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-dirscan_dir')</span>
+                    <span class="desc">$T('explain-dirscan_dir').replace(".nzb", $file_exts)</span>
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
@@ -76,7 +75,7 @@
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="password_file">$T('opt-password_file')</label>
-                    <input type="text" name="password_file" id="password_file" value="$password_file" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
                    <span class="desc">$T('explain-password_file')</span>
                </div>
                <div class="field-pair">
@@ -90,7 +89,7 @@
    </div><!-- /section -->
    <div class="section advanced-settings">
        <div class="col2">
-            <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('systemFolders') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <p>$T('explain-folderConfig')</p>
        </div><!-- /col2 -->
        <div class="col1">
@@ -104,9 +103,15 @@
                    <span class="desc">$T('explain-admin_dir1')</span>
                    <span class="desc">$T('explain-admin_dir2')</span>
                </div>
+                <div class="field-pair">
+                    <label class="config" for="backup_dir">$T('opt-backup_dir')</label>
+                    <input type="text" name="backup_dir" id="backup_dir" value="$backup_dir" data-initialdir="$my_home" />
+                    <span class="desc">$T('explain-backup_dir')</span>
+                </div>
                <div class="field-pair">
                    <label class="config" for="log_dir">$T('opt-log_dir')</label>
                    <input type="text" name="log_dir" id="log_dir" value="$log_dir" data-initialdir="$my_lcldata" />
+                    <a class="btn btn-default" id="purge_log_files" href="$url()"><span class="glyphicon glyphicon-trash"></span> $T('purge_log_files')</a>
                    <span class="desc">$T('explain-log_dir')</span>
                </div>
                <div class="field-pair">
@@ -126,7 +131,19 @@
 <script type="text/javascript">
    jQuery(document).ready(function() {
        // Add autocomplete and file-browser
-        \$('.col1 input[name$="_dir"]').typeahead().fileBrowser();
+        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
+
+        jQuery('#purge_log_files').click(function () {
+            if ( confirm("$T('confirm')") ) {
+                $.ajax({
+                    type: "POST",
+                    url: "$url('api')",
+                    data: {mode: 'config', name: 'purge_log_files', output: 'json'}
+                })
+            } else {
+                return false;
+            }
+        })
    })
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->
@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.4/general"#-->
+<!--#set global $help_uri = $confighelpuri + "general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -8,220 +8,246 @@
            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
        </label>
    </div>
-    <form action="saveGeneral" method="post" name="fullform" class="fullform" autocomplete="off">
-    <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-    <input type="hidden" id="ajax" name="ajax" value="1" />
-    <input type="hidden" name="output" value="json" />
-    <div class="section">
-        <div class="col2">
-            <h3>$T('webServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <p><b>$T('restartRequired')</b></p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="host">$T('opt-host')</label>
-                    <input type="text" name="host" id="host" value="$host" />
-                    <span class="desc">$T('explain-host')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="port">$T('opt-port')</label>
-                    <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
-                    <span class="desc">$T('explain-port')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="enable_https">$T('opt-enable_https')</label>
-                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
-                    <span class="desc">$T('explain-enable_https')</span>
-                    <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="web_dir">$T('opt-web_dir')</label>
-                    <select name="web_dir" id="web_dir">
-                    <!--#for $webline in $web_list#-->
-                        <!--#if $webline.lower() == $web_dir.lower()#-->
-                            <option value="$webline" selected="selected">$webline</option>
-                        <!--#else#-->
-                            <option value="$webline">$webline</option>
-                        <!--#end if#-->
-                    <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="language">$T('opt-language')</label>
-                    <select name="language" id="language" class="select">
-                    <!--#for $webline in $lang_list#-->
-                        <!--#if $webline[0].lower() == $language.lower()#-->
-                            <option value="$webline[0]" selected="selected">$webline[1]</option>
-                        <!--#else#-->
-                            <option value="$webline[0]">$webline[1]</option>
-                        <!--#end if#-->
-                    <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-language')</span>
-                    <div class="alert alert-info alert-translate">
-                       $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
+    <form action="$url('config/general/save')" method="post" class="fullform" autocomplete="off">
+        <input type="hidden" name="output" value="json" />
+        <div class="section">
+            <div class="col2">
+                <h3>$T('webServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <p><b>$T('restartRequired')</b></p>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="host">$T('opt-host')</label>
+                        <input type="text" name="host" id="host" value="$host" />
+                        <span class="desc">$T('explain-host')</span>
                    </div>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_port">$T('opt-https_port')</label>
-                    <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
-                    <span class="desc">$T('explain-https_port')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                    <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
-                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                        <span class="glyphicon glyphicon-repeat"></span>
-                    </button>
-                    <span class="desc">$T('explain-https_cert')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_key">$T('opt-https_key')</label>
-                    <input type="text" name="https_key" id="https_key" value="$https_key" />
-                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                        <span class="glyphicon glyphicon-repeat"></span>
-                    </button>
-                    <span class="desc">$T('explain-https_key')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                    <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
-                    <span class="desc">$T('explain-https_chain')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
-                </div>
-            </fieldset>
-        </div>
-    </div>
-    <div class="section">
-        <div class="col2">
-            <h3>$T('security') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <p><b>$T('restartRequired')</b></p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
-                <div class="field-pair">
-                    <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
-                    <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
-                    <span class="desc">$T('explain-web_username')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
-                    <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
-                    <span class="desc">$T('explain-web_password')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
-                        <select name="inet_exposure" id="inet_exposure" class="select">
-                            <optgroup label="API">
-                                <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
-                                <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
-                                <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
-                                <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
-                            </optgroup>
-                            <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
-                                <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
-                                <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
-                            </optgroup>
+                    <div class="field-pair">
+                        <label class="config" for="port">$T('opt-port')</label>
+                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" min="0" max="65535" />
+                        <span class="desc">$T('explain-port')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="enable_https">$T('opt-enable_https')</label>
+                        <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
+                        <span class="desc">$T('explain-enable_https')</span>
+                        <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="web_dir">$T('opt-web_dir')</label>
+                        <select name="web_dir" id="web_dir">
+                        <!--#for $webline in $web_list#-->
+                            <!--#if $webline.lower() == $web_dir.lower()#-->
+                                <option value="$webline" selected="selected">$webline</option>
+                            <!--#else#-->
+                                <option value="$webline">$webline</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
                        </select>
-                    <span class="desc">$T('explain-inet_exposure')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="apikey_display">$T('opt-apikey')</label>
-                    <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
-                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                    <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                    <span class="desc">$T('explain-apikey')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                    <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
-                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                    <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                    <span class="desc">$T('explain-nzbkey')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>$T('cmenu-switches') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
-                    <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-auto_browser')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
-                    <select name="check_new_rel" id="check_new_rel">
-                        <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
-                        <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
-                        <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
-                    </select>
-                    <span class="desc">$T('explain-check_new_rel')</span>
-                </div>
-                <div class="field-pair advanced-settings <!--#if int($certificate_validation) == 0 then "disabled" else ""#-->">
-                    <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
-                    <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#--> />
-                    <span class="desc">$T('explain-enable_https_verification')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>$T('tuning') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair value-and-select">
-                    <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
-                    <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
-                    <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
-                        <option value="">B/s</option>
-                        <option value="K">KB/s</option>
-                        <option value="M" selected>MB/s</option>
-                    </select>
-                    <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
-                    <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
-                    <span class="desc">$T('explain-bandwidth_perc')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
-                    <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
-                    <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="language">$T('opt-language')</label>
+                        <select name="language" id="language" class="select">
+                        <!--#for $webline in $lang_list#-->
+                            <!--#if $webline[0].lower() == $language.lower()#-->
+                                <option value="$webline[0]" selected="selected">$webline[1]</option>
+                            <!--#else#-->
+                                <option value="$webline[0]">$webline[1]</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
+                        </select>
+                        <span class="desc">$T('explain-language')</span>
+                        <div class="alert alert-info alert-translate">
+                           $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
+                        </div>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_port">$T('opt-https_port')</label>
+                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" min="0" max="65535" />
+                        <span class="desc">$T('explain-https_port')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_cert">$T('opt-https_cert')</label>
+                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                            <span class="glyphicon glyphicon-repeat"></span>
+                        </button>
+                        <span class="desc">$T('explain-https_cert')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_key">$T('opt-https_key')</label>
+                        <input type="text" name="https_key" id="https_key" value="$https_key" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                            <span class="glyphicon glyphicon-repeat"></span>
+                        </button>
+                        <span class="desc">$T('explain-https_key')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_chain">$T('opt-https_chain')</label>
+                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <span class="desc">$T('explain-https_chain')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                        <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
+        <div class="section">
+            <div class="col2">
+                <h3>$T('security') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <p><b>$T('restartRequired')</b></p>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
+                    <div class="field-pair">
+                        <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
+                        <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
+                        <span class="desc">$T('explain-web_username')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
+                        <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
+                        <span class="desc">$T('explain-web_password')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
+                            <select name="inet_exposure" id="inet_exposure" class="select">
+                                <optgroup label="API">
+                                    <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
+                                    <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
+                                    <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
+                                    <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
+                                </optgroup>
+                                <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
+                                    <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
+                                    <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
+                                </optgroup>
+                            </select>
+                        <span class="desc">$T('explain-inet_exposure')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="apikey_display">$T('opt-apikey')</label>
+                        <input type="text" id="apikey_display" value="$apikey" readonly />
+                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                        <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                        <span class="desc">$T('explain-apikey')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
+                        <input type="text" id="nzbkey" value="$nzb_key" readonly />
+                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                        <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                        <span class="desc">$T('explain-nzbkey')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+        <div class="section">
+            <div class="col2">
+                <h3>$T('cmenu-switches') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
+                        <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-auto_browser')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
+                        <select name="check_new_rel" id="check_new_rel">
+                            <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
+                            <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
+                            <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
+                        </select>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
+                        <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-enable_https_verification')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="socks5_proxy_url">$T('opt-socks5_proxy_url')</label>
+                        <input type="text" name="socks5_proxy_url" id="socks5_proxy_url" value="$socks5_proxy_url" autocomplete="off" placeholder="socks5://user:pass@hostname:port" />
+                        <span class="desc">$T('explain-socks5_proxy_url') <br/>$T('readwiki')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+        <div class="section">
+            <div class="col2">
+                <h3>$T('tuning') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair value-and-select">
+                        <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
+                        <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
+                        <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
+                            <option value="">B/s</option>
+                            <option value="K">KB/s</option>
+                            <option value="M" selected>MB/s</option>
+                        </select>
+                        <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
+                        <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
+                        <span class="desc">$T('explain-bandwidth_perc')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
+                        <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
+                        <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+    </form>

+    <form action="$url('config/general/upload_config')" method="post" class="fullform" autocomplete="off" enctype="multipart/form-data">
+        <input type="hidden" name="output" value="json" />
+        <div class="section">
+            <div class="col2">
+                <h3>$T('backup') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="create_backup">$T('create-backup')</label>
+                        <span class="desc"><button class="btn btn-default createBackup" type="button" id="create_backup"><span class="glyphicon glyphicon glyphicon-import"></span> $T('create-backup')</button></span>
+                        <span class="desc">$T('explain-create_backup')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="config_backup_file">$T('restore-backup')</label>
+                        <input type="file" accept=".zip" name="config_backup_file" id="config_backup_file" />
+                        <span class="desc">$T('restartRequired')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</button>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
    </form>
 </div><!-- /colmask -->

-<div class="modal fade" id="modal_qr">
+<div class="modal fade" id="modal_qr" tabindex="-1" role="dialog" aria-modal="true" aria-label="$T('explain-qr-code')">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-body">
@@ -232,41 +258,39 @@
 </div>

 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
    // Show the message about translating when it's non-English
    function hideOrShowTranslate() {
-        if(\$('#language').val() == 'en') {
-            \$('.alert-translate').hide()
+        if(jQuery('#language').val() === 'en') {
+            jQuery('.alert-translate').hide()
        } else {
-            \$('.alert-translate').show()
+            jQuery('.alert-translate').show()
        }
    }
-    \$('#language').on('change', function() {
+    jQuery('#language').on('change', function() {
        // Show message
        hideOrShowTranslate()
        // Re-load page on submit
-        \$('.fullform').submit(function() {
+        jQuery('.fullform').submit(function() {
            // Skip the fancy stuff, just submit
            this.submit()
        })
-        // No JSON reponse
-        \$('#ajax').val('')
    })
    hideOrShowTranslate()

    // Highlight in case user is not safe
    // So when exposed to internet and no password, no external limit or no username/password
-    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = jQuery('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
    function checkSafety() {
-        if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
+        if(jQuery('#host').val() !== 'localhost' && jQuery('#host').val() !== '127.0.0.1') {
            // No limitation on local-network
-            if(\$('#inet_exposure').val() > 3) {
+            if(jQuery('#inet_exposure').val() > 3) {
                // And no username and password?
-                if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
+                if(!jQuery('#${pid}_wu').val() || !jQuery('#${pid}_wp').val()) {
                    // Add warning icon if not there already
-                    if(!\$('.host-warning').length) {
+                    if(!jQuery('.host-warning').length) {
                        safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
-                        \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
+                        jQuery('.host-warning').tooltip({'title': '$T('checkSafety')'})
                        safeCheck.addClass('host-warning-highlight')
                    }
                    return
@@ -274,57 +298,58 @@
            }
        }
        // Remove warnings
-        \$('.host-warning').remove()
+        jQuery('.host-warning').remove()
        safeCheck.removeClass('host-warning-highlight')
    }
    checkSafety()
    safeCheck.on('change', checkSafety)

    // Click functions
-    \$('#apikey, #nzbkey').click(function () { \$(this).select() });
+    jQuery('#apikey_display, #nzbkey').click(function () { jQuery(this).select() });

-    \$('#generate_new_apikey').click(function () {
+    jQuery('#generate_new_apikey').click(function () {
      if (confirm("$T('confirm')")) {
        $.ajax({
          type: "POST",
-          url: "../../api",
-          data: {mode:'config', name:'set_apikey', apikey: \$('#apikey').val()},
+          url: "$url('api')",
+          data: { mode: 'config', name: 'set_apikey' },
          success: function(msg){
-            \$('#apikey').val(msg);
-            document.location = document.location;
+            jQuery('#apikey_display').val(msg.apikey);
          }
        });
      }
    });
-    \$('#generate_new_nzbkey').click(function () {
+    jQuery('#generate_new_nzbkey').click(function () {
      if (confirm("$T('confirm')")) {
        $.ajax({
          type: "POST",
-          url: "../../api",
-          data: { mode:'config', name:'set_nzbkey', apikey: \$('#apikey').val() },
-          success: function(msg){
-            \$('#nzbkey').val(msg);
-            document.location = document.location;
+          url: "$url('api')",
+          data: { mode: 'config', name: 'set_nzbkey' },
+          success: function(msg) {
+            jQuery('#nzbkey').val(msg.nzbkey);
          }
        });
      }
    });

-    \$('.show_qrcode').click(function (e) {
+    // Add autocomplete and file-browser
+    jQuery('.fileBrowserField').typeahead().fileBrowser();
+
+    jQuery('.show_qrcode').click(function (e) {
        // Show in modal
-        \$('#modal_qr .modal-dialog').width(330)
-        \$('#modal_qr .modal-body').html('').qrcode({
+        jQuery('#modal_qr .modal-dialog').width(330)
+        jQuery('#modal_qr .modal-body').html('').qrcode({
            "size": 280,
            "color": "#3a3",
-            "text": \$(this).attr('rel')
+            "text": jQuery(this).attr('rel')
        });
-        \$('#modal_qr').modal('show');
+        jQuery('#modal_qr').modal('show');

        // No save on this button click
        e.preventDefault();
    });

-    \$('.generate_cert').click(function(e) {
+    jQuery('.generate_cert').click(function(e) {
        if(!confirm('$T('explain-new-cert')')) {
            return;
        }
@@ -332,8 +357,8 @@
        // Submit request and then restart
        $.ajax({
            type: "POST",
-            url: "../../api",
-            data: { mode: 'config', name: 'regenerate_certs', apikey: \$('#apikey').val() },
+            url: "$url('api')",
+            data: { mode: 'config', name: 'regenerate_certs' },
            success: function(msg) {
                do_restart()
            }
@@ -343,30 +368,44 @@
    })

    // Only allow re-generate if default certs
-    if(\$('#https_cert').val() != 'server.cert') {
-        \$('.generate_cert').attr('disabled', 'disabled')
+    if(jQuery('#https_cert').val() !== '$def_https_cert_file') {
+        jQuery('.generate_cert').attr('disabled', 'disabled')
    }

    // Parse the text
-    var bandwidthLimit = \$('#bandwidth_max').val()
+    var bandwidthLimit = jQuery('#bandwidth_max').val()
    if(bandwidthLimit) {
        var bandwithLimitNumber = parseFloat(bandwidthLimit)
        var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
        if(bandwithLimitNumber) {
-            \$('#bandwidth_max_value').val(bandwithLimitNumber)
-            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
+            jQuery('#bandwidth_max_value').val(bandwithLimitNumber)
+            jQuery('#bandwidth_max_dropdown').val(bandwithLimitText)
        }
    }

    // Update the value
-    \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        if(\$('#bandwidth_max_value').val()) {
-            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
+    jQuery('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
+        if(jQuery('#bandwidth_max_value').val()) {
+            jQuery('#bandwidth_max').val(jQuery('#bandwidth_max_value').val() + jQuery('#bandwidth_max_dropdown').val())
        } else {
-            \$('#bandwidth_max').val('')
+            jQuery('#bandwidth_max').val('')
        }
    })

+    jQuery('#create_backup').click(function () {
+        $.ajax({
+          type: "POST",
+          url: "$url('api')",
+          data: { mode: 'config', name: 'create_backup', output: 'json' },
+          success: function(data) {
+              if(data.value.result) {
+                  alert("$T('backup'):\n" + data.value.message)
+              } else {
+                  alert("$T('button-failed')")
+              }
+          }
+        });
+    });
 });
 </script>

@@ -1,45 +1,48 @@
-<!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.4/notifications"#-->
+<!--#set global $pane="Notify"#-->
+<!--#set global $help_uri = $confighelpuri + "notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

+<!--#import apprise#-->
+
 <!--#def show_notify_checkboxes($section_label)#-->
    <!--#for $type in $notify_types#-->
        <div class="field-pair">
-            <label class="config wide" for="${section_label}_prio_$type">
+            <input type="checkbox" class="notify-checkboxes" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if $getVar($section_label + '_prio_' + $type) then 'checked="checked"' else ""#--> />
+            <label class="config" for="${section_label}_prio_$type">
                $T($notify_types[$type]).replace('/', ' / ')
            </label>
-            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if int($getVar($section_label + '_prio_' + $type)) > 0 then 'checked="checked"' else ""#--> />
+
        </div>
    <!--#end for#-->
 <!--#end def#-->

 <!--#def show_cat_box($section_label)#-->
-    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
+    <div class="col2-cats" <!--#if $getVar($section_label + '_enable') then '' else 'style="display:none"'#-->>
        <hr>
        <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
+        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
            <!--#for $ct in $categories#-->
                <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
            <!--#end for#-->
        </select>
+        <p>$T('defaultNotifiesAll')</p>
    </div>
 <!--#end def#-->

 <div class="colmask">
-    <form action="saveNotify" method="post" name="fullform" class="fullform" autocomplete="off">
-    <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+    <form action="$url('config/notify/save')" method="post" class="fullform" autocomplete="off">
    <input type="hidden" name="output" value="json" />
-    <input type="hidden" id="ajax" name="ajax" value="1" />
    <div class="section" id="email">
        <div class="col2">
-            <h3>$T('cmenu-email') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('cmenu-email') <a href="$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <div class="col2-cats" <!--#if int($email_endjob) > 0 then '' else 'style="display:none"'#-->>
                <b>$T('affectedCat')</b><br/>
-                <select name="email_cats" multiple="multiple" class="multiple_cats">
+                <select name="email_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
                    <!--#for $ct in $categories#-->
                        <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                    <!--#end for#-->
                </select>
+                <p>$T('defaultNotifiesAll')</p>
            </div>
        </div>
        <div class="col1">
@@ -47,19 +50,19 @@
                <div class="field-pair">
                    <label class="config" for="email_endjob">$T('opt-email_endjob')</label>
                    <select name="email_endjob" id="email_endjob">
-                        <option value="0" <!--#if int($email_endjob) == "0" then 'selected="selected"' else ""#--> >$T('email-never')</option>
-                        <option value="1" <!--#if int($email_endjob) == "1" then 'selected="selected"' else ""#--> >$T('email-always')</option>
-                        <option value="2" <!--#if int($email_endjob) == "2" then 'selected="selected"' else ""#--> >$T('email-errorOnly')</option>
+                        <option value="0" <!--#if int($email_endjob) == 0 then 'selected="selected"' else ""#--> >$T('email-never')</option>
+                        <option value="1" <!--#if int($email_endjob) == 1 then 'selected="selected"' else ""#--> >$T('email-always')</option>
+                        <option value="2" <!--#if int($email_endjob) == 2 then 'selected="selected"' else ""#--> >$T('email-errorOnly')</option>
                    </select>
                </div>
                <div class="field-pair">
                    <label class="config" for="email_full">$T('opt-email_full')</label>
-                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if int($email_full) > 0 then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if $email_full then 'checked="checked"' else ""#--> />
                    <span class="desc">$T('explain-email_full')</span>
                </div>
                <div class="field-pair">
                    <label class="config" for="email_rss">$T('opt-email_rss')</label>
-                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if int($email_rss) > 0 then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if $email_rss then 'checked="checked"' else ""#--> />
                    <span class="desc">$T('explain-email_rss')</span>
                </div>
                <div class="field-pair">
@@ -89,10 +92,10 @@
                </div>
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_email" rel="$T('askTestEmail')"><span class="glyphicon glyphicon-envelope"></span> $T('link-testEmail')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_email" rel="$T('askTestEmail')" aria-busy="false"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> $T('link-testEmail')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
            </fieldset>
        </div>
@@ -103,46 +106,46 @@
            <h3>$T('section-NC')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if int($ncenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if $ncenter_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                </tr>
            </table>
        </div>
-        <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $ncenter_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('ncenter')
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_notif"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-               </div>
-               <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_notif" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
           </fieldset>
       </div>
    </div>
    <!--#end if#-->
-    <!--#if $nt#-->
+    <!--#if $windows#-->
    <div class="section">
        <div class="col2">
            <h3>$T('section-AC')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if int($acenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if $acenter_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="acenter_enable"> $T('opt-acenter_enable')</label></td>
                </tr>
            </table>
            $show_cat_box('acenter')
        </div>
-        <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $acenter_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('acenter')
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_windows"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-               </div>
-               <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_windows" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
           </fieldset>
       </div>
@@ -151,42 +154,88 @@
    <!--#if $have_ntfosd#-->
    <div class="section">
        <div class="col2">
-            <h3>$T('section-OSD') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if $ntfosd_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="ntfosd_enable"> $T('opt-ntfosd_enable')</label></td>
                </tr>
            </table>
            $show_cat_box('ntfosd')
        </div>
-        <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $ntfosd_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('ntfosd')
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_osd"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-               </div>
-               <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_osd" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
           </fieldset>
       </div>
    </div>
    <!--#end if#-->
-    <div class="section" id="nscript">
+    <div class="section" id="apprise">
        <div class="col2">
-            <h3>$T('section-NScript')</h3>
+            <h3>Apprise <a href="$help_uri#apprise" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if $apprise_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><label for="apprise_enable"> $T('opt-apprise_enable')</label></td>
+                </tr>
+            </table>
+            <p>$T('explain-apprise_enable')</p>
+            <p><a href="https://appriseit.com/" target="_blank">Apprise documentation</a></p>
+            <p>$T('version'): ${apprise.__version__}</p>
+
+            $show_cat_box('apprise')
+        </div>
+        <div class="col1" <!--#if $apprise_enable then '' else 'style="display:none"'#-->>
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="apprise_urls">$T('opt-apprise_urls')</label>
+                    <input type="text" name="apprise_urls" id="apprise_urls" value="$apprise_urls" />
+                    <span class="desc">$T('explain-apprise_urls')</span>
+                </div>
+                <div class="field-pair">
+                    <span class="desc">$T('explain-apprise_extra_urls')</span>
+                </div>
+                <!--#set $section_label = 'apprise'#-->
+                <!--#for $type in $notify_types#-->
+                    <div class="field-pair">
+                        <label class="config" for="${section_label}_target_${type}">
+                            $T($notify_types[$type]).replace('/', ' / ')
+                        </label>
+                        <input type="checkbox" class="notify-checkboxes" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if $getVar($section_label + '_target_' + $type + '_enable') then 'checked="checked"' else ""#--> />
+                        <input type="text" name="${section_label}_target_${type}" id="${section_label}_target_${type}" value="$getVar($section_label + '_target_' + $type)"  placeholder="$T('opt-apprise_urls')" />
+                    </div>
+                <!--#end for#-->
+
+                <div class="field-pair no-field-pair-bg">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    <button class="btn btn-default" type="button" id="test_apprise" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
+                </div>
+           </fieldset>
+       </div>
+    </div>
+    <div class="section" id="nscript">
+        <div class="col2">
+            <h3>$T('section-NScript') <a href="$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <table>
+                <tr>
+                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if $nscript_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
                </tr>
            </table>
-            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
+            <em>$T('explain-nscript_enable')</em><br><a href="$help_uri#nscript" target="_blank">$T('readwiki')</a>
            $show_cat_box('nscript')
        </div>
-        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $nscript_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
@@ -200,15 +249,15 @@
                <div class="field-pair">
                    <label class="config" for="nscript_parameters">$T('opt-nscript_parameters')</label>
                    <input type="text" name="nscript_parameters" id="nscript_parameters" value="$nscript_parameters" />
-                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
+                    <span class="desc">$T('Optional') - $T('readwiki')</span>
                </div>
                $show_notify_checkboxes('nscript')
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_nscript" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
            </fieldset>
        </div>
@@ -218,14 +267,14 @@
            <h3>$T('section-Prowl')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if int($prowl_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if $prowl_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="prowl_enable"> $T('opt-prowl_enable')</label></td>
                </tr>
            </table>
            <em>$T('explain-prowl_enable')</em>
            $show_cat_box('prowl')
        </div>
-        <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $prowl_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="prowl_apikey">$T('opt-prowl_apikey')</label>
@@ -239,21 +288,21 @@
                            $T($notify_types[$type]).replace('/', ' / ')
                        </label>
                        <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
-                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == "-3" then 'selected="selected"' else ""#--> >$T('prowl-off')</option>
-                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == "-2" then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
-                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == "-1" then 'selected="selected"' else ""#--> >$T('prowl-moderate')</option>
-                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == "0"  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
-                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == "1"  then 'selected="selected"' else ""#--> >$T('prowl-high')</option>
-                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == "2"  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
+                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('prowl-off')</option>
+                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == -2 then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
+                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == -1 then 'selected="selected"' else ""#--> >$T('prowl-moderate')</option>
+                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == 0  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
+                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == 1  then 'selected="selected"' else ""#--> >$T('prowl-high')</option>
+                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == 2  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
                        </select>
                    </div>
                <!--#end for#-->
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_prowl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_prowl" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
            </fieldset>
        </div>
@@ -264,14 +313,14 @@
            <h3>$T('section-Pushover')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if int($pushover_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if $pushover_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="pushover_enable"> $T('opt-pushover_enable')</label></td>
                </tr>
            </table>
            <em>$T('explain-pushover_enable')</em>
            $show_cat_box('pushover')
        </div>
-        <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $pushover_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="pushover_token">$T('opt-pushover_token')</label>
@@ -305,21 +354,21 @@
                            $T($notify_types[$type]).replace('/', ' / ')
                        </label>
                        <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
-                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == "-3" then 'selected="selected"' else ""#--> >$T('pushover-off')</option>
-                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == "-2" then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
-                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == "-1" then 'selected="selected"' else ""#--> >$T('pushover-low')</option>
-                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == "0"  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
-                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == "1"  then 'selected="selected"' else ""#--> >$T('pushover-high')</option>
-                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == "2"  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
+                            <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('pushover-off')</option>
+                            <option value="-2" <!--#if $getVar($section_label + '_prio_' + $type) == -2 then 'selected="selected"' else ""#--> >$T('prowl-very-low')</option>
+                            <option value="-1" <!--#if $getVar($section_label + '_prio_' + $type) == -1 then 'selected="selected"' else ""#--> >$T('pushover-low')</option>
+                            <option value="0"  <!--#if $getVar($section_label + '_prio_' + $type) == 0  then 'selected="selected"' else ""#--> >$T('prowl-normal')</option>
+                            <option value="1"  <!--#if $getVar($section_label + '_prio_' + $type) == 1  then 'selected="selected"' else ""#--> >$T('pushover-high')</option>
+                            <option value="2"  <!--#if $getVar($section_label + '_prio_' + $type) == 2  then 'selected="selected"' else ""#--> >$T('prowl-emergency')</option>
                        </select>
                    </div>
                <!--#end for#-->
                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_pushover"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default" type="button" id="test_pushover" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
            </fieldset>
        </div>
@@ -329,14 +378,14 @@
            <h3>$T('section-Pushbullet')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if int($pushbullet_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if $pushbullet_enable then 'checked="checked"' else ""#--> /></td>
                    <td><label for="pushbullet_enable"> $T('opt-pushbullet_enable')</label></td>
                </tr>
            </table>
            <em>$T('explain-pushbullet_enable')</em>
            $show_cat_box('pushbullet')
        </div>
-        <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if $pushbullet_enable then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="pushbullet_apikey">$T('opt-pushbullet_apikey')</label>
@@ -352,11 +401,11 @@
                <!--#end if#-->
                $show_notify_checkboxes('pushbullet')
                <div class="field-pair no-field-pair-bg">
-                   <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                   <button class="btn btn-default" type="button" id="test_pushbullet"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    <button class="btn btn-default" type="button" id="test_pushbullet" aria-busy="false"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> $T('testNotify')</button>
+                    <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                        <div class="alert"></div>
+                    </div>
                </div>
           </fieldset>
       </div>
@@ -365,24 +414,23 @@
 </div><!-- /colmask -->

 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
    // Expand on enable
-    \$('.col2 input[name$="enable"]').change(function() {
+    jQuery('.col2 input[name$="enable"]').change(function() {
        if(this.checked) {
-            \$(this).parents('.section').find('.col1').show()
-            \$(this).parents('.col2').find('.col2-cats').show()
+            jQuery(this).parents('.section').find('.col1').show()
+            jQuery(this).parents('.col2').find('.col2-cats').show()
        } else {
-            \$(this).parents('.section').find('.col1').hide()
-            \$(this).parents('.col2').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col1').hide()
+            jQuery(this).parents('.col2').find('.col2-cats').hide()
        }
-        \$('form').submit()
-        addRowColor()
+        jQuery('form').submit()
    })
-    \$('#email_endjob').change(function() {
-        if(\$(this).val() > 0) {
-            \$(this).parents('.section').find('.col2-cats').show()
+    jQuery('#email_endjob').change(function() {
+        if(jQuery(this).val() > 0) {
+            jQuery(this).parents('.section').find('.col2-cats').show()
        } else {
-            \$(this).parents('.section').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col2-cats').hide()
        }
    })

@@ -391,40 +439,42 @@
    **/
    function testNotification(buttonObj) {
        // Confirm?
-        if(\$(buttonObj).attr('rel')) {
-            if(!confirm(\$(buttonObj).attr('rel'))) return false;
+        if(jQuery(buttonObj).attr('rel')) {
+            if(!confirm(jQuery(buttonObj).attr('rel'))) return false;
        }
        // Disable button and get the data
-        \$(buttonObj).attr("disabled", "disabled")
-        \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
-        var data = { mode: buttonObj.id, apikey: '$apikey', output: 'json' };
-        \$(buttonObj).parents('.section').extractFormDataTo(data);
+        jQuery(buttonObj).attr("disabled", "disabled")
+        jQuery(buttonObj).attr("aria-busy", "true")
+        jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+        var data = { mode: buttonObj.id, output: 'json' };
+        jQuery(buttonObj).parents('.section').extractFormDataTo(data);

        // Clear up the box
-        resultBox = \$(buttonObj).parents('.section').find('.result-box .alert');
+        resultBox = jQuery(buttonObj).parents('.section').find('.result-box .alert');

        // Get the request
-        \$.ajax({
-            type: "GET",
-            url: "../../api",
+        jQuery.ajax({
+            type: "POST",
+            url: "$url('api')",
            data: data
        }).then(function(data) {
            // Remove disabled and make the box
-            \$(buttonObj).removeAttr("disabled")
-            \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+            jQuery(buttonObj).removeAttr("disabled")
+            jQuery(buttonObj).attr("aria-busy", "false")
+            jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
            resultBox.removeClass('alert-success alert-danger').show()
            if(data.status) {
                resultBox.addClass('alert-success')
                resultBox.text('$T('notifications-notesent')')
-                resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
+                resultBox.prepend('<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> ')
            } else {
                resultBox.addClass('alert-danger')
                resultBox.text(data.error)
-                resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
+                resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> ')
            }
        })
    }
-    \$('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
        testNotification(this)
    })
 });
@@ -1,15 +1,14 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.4/rss"#-->
+<!--#set global $help_uri = $confighelpuri + "rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
    <!--#if not $active_feed#-->
    <div class="section">
        <div class="padTable">
-            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
            <p>$T('explain-RSS')</p>
-            <form action="add_rss_feed" method="post" autocomplete="off">
-                <input type="hidden" name="apikey" value="$apikey" />
+            <form data-form="add-rss-feed" action="$url('config/rss/add_rss_feed')" method="post" autocomplete="off">
                <table class="catTable addRssTable">
                    <tr>
                        <th>&nbsp;</th>
@@ -38,8 +37,7 @@
    <!--#if $rss#-->
    <div class="section">
        <div class="padTable">
-            <form action="save_rss_feed" method="post" autocomplete="off">
-                <input type="hidden" name="apikey" value="$apikey" />
+            <form action="$url('config/rss/save_rss_feed')" method="post" autocomplete="off">
                <table id="subscriptions">
                    <tbody>
                        <!--#set $feeds = sorted($rss.keys(), key=lambda x: x.lower())#-->
@@ -53,7 +51,7 @@
                                </td>
                                <td class="title">
                                    <a href="?feed=$rss[$feed_item]['link']" class="subscription-title path feed <!--#if int($rss[$feed_item]['enable']) != 0 then 'feed_enabled' else 'feed_disabled'#-->">
-                                         $feed_item
+                                         $feed_item_html
                                    </a>
                                </td>
                                <td class="controls">
@@ -75,8 +73,7 @@
            </form>
            <!--#if $feeds#-->
            <br/>
-            <form action="rss_now" method="post" autocomplete="off">
-                <input type="hidden" name="apikey" value="$apikey" />
+            <form action="$url('config/rss/rss_now')" method="post" autocomplete="off">
                <button type="submit" class="btn btn-default readAll"><span class="glyphicon glyphicon-sort"></span> $T('button-rssNow')</button>
            </form>
            <!--#end if#-->
@@ -84,8 +81,7 @@
    </div>
    <!--#end if#-->
    <div class="section">
-        <form action="save_rss_rate" method="post" autocomplete="off">
-            <input type="hidden" name="apikey" value="$apikey" />
+        <form action="$url('config/rss/save_rss_rate')" method="post" autocomplete="off">
            <div class="col1">
                <fieldset>
                    <div class="field-pair">
@@ -102,23 +98,23 @@
    </div>
    <!--#end if#-->
    <!--#if $active_feed#-->
-    <!--#set $feed = $active_feed#-->
+    <!--#set $feed = html.unescape($active_feed)#-->
    <div class="section rss-section">
        <div class="padTable">
-            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
            <h2 class="nomargin activeRSS">
-                <a href="${root}config/rss/">$T('cmenu-rss')</a> &raquo;
+                <a href="$url('config/rss')">$T('cmenu-rss')</a> &raquo;
                $active_feed
            </h2>
-            <!--#if $error#-->
+            <!--#if $errors#-->
            <div class="alert alert-danger">
-                <span class="glyphicon glyphicon-exclamation-sign"></span>
-                <!--#echo html.escape($error)#-->
+                <!--#for $error in $errors#-->
+                <div><span class="glyphicon glyphicon-exclamation-sign"></span> $error</div>
+                <!--#end for#-->
            </div>
            <!--#end if#-->
-            <form action="upd_rss_feed" method="post">
-                <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$feed" />
+            <form action="$url('config/rss/upd_rss_feed')" method="post">
+                <input type="hidden" name="feed" value="$active_feed" />
                <input type="hidden" name="uri" value="$rss[$feed]['uris']" />
                <table class="catTable">
                    <thead>
@@ -156,7 +152,8 @@
                                    <option value=">"> $T('rss-atleast')</option>
                                    <option value="<"> $T('rss-atmost')</option>
                                    <option value="F"> $T('rss-from')</option>
-                                    <option value="F"> $T('rss-from-show') ($T('rss-accept'))</option>
+                                    <option value="S"> $T('rss-from-show') ($T('rss-accept'))</option>
+                                    <option value="G"> $T('rss-age')</option>
                                </select>
                            </td>
                            <td>
@@ -207,10 +204,9 @@
                </table>
            </form>
            <!-- add new filter -->
-            <form action="upd_rss_filter" method="post">
-                <input type="hidden" name="apikey" value="$apikey" />
+            <form data-form="update-rss-filter" action="$url('config/rss/upd_rss_filter')" method="post">
                <input type="hidden" name="index" value="$rss[$feed]['filtercount']" />
-                <input type="hidden" name="feed" value="$feed" />
+                <input type="hidden" name="feed" value="$active_feed" />
                <table class="catTable">
                    <tbody>
                        <tr>
@@ -230,6 +226,7 @@
                                    <option value="<"> $T('rss-atmost')</option>
                                    <option value="F"> $T('rss-from')</option>
                                    <option value="S"> $T('rss-from-show') ($T('rss-accept'))</option>
+                                    <option value="G"> $T('rss-age')</option>
                                </select>
                            </td>
                            <td>
@@ -283,10 +280,9 @@
            <!--#set $fnum = 0#-->
            <!--#for $filter in $rss[$feed].filters#-->
                <!--#set $odd = not $odd#-->
-                <form action="upd_rss_filter" method="post" autocomplete="off">
-                    <input type="hidden" name="apikey" value="$apikey" />
+                <form data-form="update-rss-filter" action="$url('config/rss/upd_rss_filter')" method="post" autocomplete="off">
                    <input type="hidden" name="index" value="$fnum" />
-                    <input type="hidden" name="feed" value="$feed" />
+                    <input type="hidden" name="feed" value="$active_feed" />
                    <table class="catTable">
                        <tbody>
                            <tr class="<!--#if $odd then " alt " else " "#--> <!--#if $filter[3]!="A" and $filter[3]!="S" then 'disabled_options_rule' else ""#-->">
@@ -302,10 +298,11 @@
                                        <option value="M" <!--#if $filter[3]=="M" then 'selected="selected"' else ""#-->> $T('rss-must')</option>
                                        <option value="R" <!--#if $filter[3]=="R" then 'selected="selected"' else ""#-->> $T('rss-reject')</option>
                                        <option value="C" <!--#if $filter[3]=="C" then 'selected="selected"' else ""#-->> $T('rss-mustcat')</option>
-                                        <option value=">" <!--#if $filter[3]==">" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
-                                        <option value="<" <!--#if $filter[3]=="<" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
+                                        <option value=">" <!--#if $filter[3]=="&gt;" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
+                                        <option value="<" <!--#if $filter[3]=="&lt;" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
                                        <option value="F" <!--#if $filter[3]=="F" then 'selected="selected"' else ""#-->> $T('rss-from')</option>
                                        <option value="S" <!--#if $filter[3]=="S" then 'selected="selected"' else ""#-->> $T('rss-from-show') ($T('rss-accept'))</option>
+                                        <option value="G" <!--#if $filter[3]=="G" then 'selected="selected"' else ""#-->> $T('rss-age')</option>
                                    </select>
                                </td>
                                <td>
@@ -361,138 +358,53 @@
                </form>
                <!--#set $fnum = $fnum+1#-->
            <!--#end for#-->
-            <form action="download_rss_feed" method="post">
-                <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$feed" />
+            <form action="$url('config/rss/download_rss_feed')" method="post">
+                <input type="hidden" name="feed" value="$active_feed" />
                <div class="padding">
-                    <button type="button" class="btn btn-default testFeed" rel="$feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                    <button type="button" class="btn btn-default testFeed" rel="$active_feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                    <button type="submit" class="btn btn-default Save"><span class="glyphicon glyphicon-forward"></span> $T('button-forceFeed')</button>
                    <button type="button" class="btn btn-default cleanFeed"><span class="glyphicon glyphicon-trash"></span> $T('button-clear') $T('rss-done')</button>
-                    <!--#if $evalButton#-->
-                      <button type="button" class="btn btn-default evalFeed" rel="$feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
-                    <!--#end if#-->
                </div>
            </form>
        </div>
    </div>
-    <br/>
-    <div style="padding-left: 10px; border-bottom: 1px solid #DFDEDE;">
-        <ul class="tabs">
-            <li class="active"><a href="#rss-tab-matched" data-toggle="tab">$T('rss-matched') <span class="count"><!--#echo len($matched)#--></span></a></li>
-            <li><a href="#rss-tab-not-matched">$T('rss-notMatched') <span class="count"><!--#echo len($unmatched)#--></span></a></li>
-            <li><a href="#rss-tab-done">$T('rss-done') <span class="count"><!--#echo len($downloaded)#--></span></a></li>
-        </ul>
-    </div>
-    <div class="tab-content">
-        <div class="tab-pane fade in active padTable" id="rss-tab-matched">
-            <!--#if $matched#-->
-            <table class="catTable">
-                <thead>
-                    <tr>
-                        <th class="no-sort">$T('link-download')</th>
-                        <th>$T('rss-filter')</th>
-                        <th>$T('size')</th>
-                        <th width="60%">$T('sort-title')</th>
-                        <th>$T('category')</th>
-                        <th class="default-sort">$T('nzo-age')</th>
-                        <th>$T('source')</th>
-                    </tr>
-                </thead>
-                <!--#for $job in $matched#-->
-                    <tr class="infoTableSeperator">
-                        <td>
-                            <form action="download" method="get">
-                                <input type="hidden" value="$feed" name="feed" />
-                                <input type="hidden" name="apikey" value="$apikey" />
-                                <input type="hidden" name="url" value="$job['url']" />
-                                <input type="hidden" name="nzbname" value="$job['nzbname']" />
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
-                            </form>
-                        </td>
-                        <td>$job['rule'] $job['skip']</td>
-                        <td data-sort-value="$job['size']">$job['size_units']</td>
-                        <td>$job['title']</td>
-                        <td>$job['cat']</td>
-                        <td data-sort-value="$job['age_ms']">$job['age']</td>
-                        <td data-sort-value="$job['baselink']" title="$job['baselink']">
-                            <!--#if not $job['infourl']#-->
-                            <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
-                            <!--#else#-->
-                            <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
-                            <!--#end if#-->
-                        </td>
-                    </tr>
-                <!--#end for#-->
-            </table>
-            <!--#else#-->
-            $T('none')
-            <!--#end if#-->
-        </div>
-        <div class="tab-pane padTable" id="rss-tab-not-matched">
-            <!--#if $unmatched#-->
-            <table class="catTable">
-                <thead>
-                    <tr>
-                        <th class="no-sort">$T('link-download')</th>
-                        <th>$T('rss-filter')</th>
-                        <th>$T('size')</th>
-                        <th width="60%">$T('sort-title')</th>
-                        <th>$T('category')</th>
-                        <th class="default-sort">$T('nzo-age')</th>
-                        <th>$T('source')</th>
-                    </tr>
-                </thead>
-                <!--#for $job in $unmatched#-->
-                    <tr class="infoTableSeperator">
-                        <td>
-                            <form action="download" method="get">
-                                <input type="hidden" value="$feed" name="feed" />
-                                <input type="hidden" name="apikey" value="$apikey" />
-                                <input type="hidden" name="url" value="$job['url']" />
-                                <input type="hidden" name="nzbname" value="$job['nzbname']" />
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
-                            </form>
-                        </td>
-                        <td>$job['rule'] $job['skip']</td>
-                        <td data-sort-value="$job['size']">$job['size_units']</td>
-                        <td>$job['title']</td>
-                        <td>$job['cat']</td>
-                        <td data-sort-value="$job['age_ms']">$job['age']</td>
-                        <td data-sort-value="$job['baselink']" title="$job['baselink']">
-                            <!--#if not $job['infourl']#-->
-                            <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
-                            <!--#else#-->
-                            <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
-                            <!--#end if#-->
-                        </td>
-                    </tr>
-                <!--#end for#-->
-            </table>
-            <!--#else#-->
-                $T('none')
-            <!--#end if#-->
-        </div>
-        <div class="tab-pane padTable" id="rss-tab-done">
-            <!--#if $downloaded#-->
-            <form action="clean_rss_jobs" method="post">
-                <input type="hidden" value="$feed" name="feed" />
-                <input type="hidden" name="apikey" value="$apikey" />
+
+    <ul class="nav nav-tabs">
+        <li class="active"><a href="#rss-tab-matched" data-toggle="tab">$T('rss-matched') <span class="count"><!--#echo len($matched)#--></span></a></li>
+        <li><a href="#rss-tab-not-matched">$T('rss-notMatched') <span class="count"><!--#echo len($unmatched)#--></span></a></li>
+        <li><a href="#rss-tab-done">$T('rss-done') <span class="count"><!--#echo len($downloaded)#--></span></a></li>
+    </ul>
+    <div class="section">
+        <div class="tab-content">
+            <div class="tab-pane fade in active padTable" id="rss-tab-matched">
+                <!--#if $matched#-->
                <table class="catTable">
                    <thead>
                        <tr>
-                            <th class="default-sort">$T('rss-added')</th>
+                            <th class="no-sort">$T('link-download')</th>
+                            <th>$T('rss-filter')</th>
                            <th>$T('size')</th>
                            <th width="60%">$T('sort-title')</th>
                            <th>$T('category')</th>
+                            <th class="default-sort">$T('nzo-age')</th>
                            <th>$T('source')</th>
                        </tr>
                    </thead>
-                    <!--#for $job in $downloaded#-->
+                    <!--#for $job in $matched#-->
                        <tr class="infoTableSeperator">
-                            <td data-sort-value="$job['time_downloaded_ms']">$job['time_downloaded']</td>
+                            <td>
+                                <form data-form="download-rss-job" action="$url('config/rss/download')" method="post">
+                                    <input type="hidden" value="$active_feed" name="feed" />
+                                    <input type="hidden" name="url" value="$job['url']" />
+                                    <input type="hidden" name="nzbname" value="$job['nzbname']" />
+                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
+                                </form>
+                            </td>
+                            <td>$job['rule'] $job['skip']</td>
                            <td data-sort-value="$job['size']">$job['size_units']</td>
                            <td>$job['title']</td>
                            <td>$job['cat']</td>
+                            <td data-sort-value="$job['age_ms']">$job['age']</td>
                            <td data-sort-value="$job['baselink']" title="$job['baselink']">
                                <!--#if not $job['infourl']#-->
                                <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
@@ -503,22 +415,104 @@
                        </tr>
                    <!--#end for#-->
                </table>
-            </form>
-            <!--#else#-->
+                <!--#else#-->
                $T('none')
+                <!--#end if#-->
+            </div>
+            <div class="tab-pane padTable" id="rss-tab-not-matched">
+                <!--#if $unmatched#-->
+                <table class="catTable">
+                    <thead>
+                        <tr>
+                            <th class="no-sort">$T('link-download')</th>
+                            <th>$T('rss-filter')</th>
+                            <th>$T('size')</th>
+                            <th width="60%">$T('sort-title')</th>
+                            <th>$T('category')</th>
+                            <th class="default-sort">$T('nzo-age')</th>
+                            <th>$T('source')</th>
+                        </tr>
+                    </thead>
+                    <!--#for $job in $unmatched#-->
+                        <tr class="infoTableSeperator">
+                            <td>
+                                <form data-form="download-rss-job" action="$url('config/rss/download')" method="post">
+                                    <input type="hidden" value="$active_feed" name="feed" />
+                                    <input type="hidden" name="url" value="$job['url']" />
+                                    <input type="hidden" name="nzbname" value="$job['nzbname']" />
+                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
+                                </form>
+                            </td>
+                            <td>$job['rule'] $job['skip']</td>
+                            <td data-sort-value="$job['size']">$job['size_units']</td>
+                            <td>$job['title']</td>
+                            <td>$job['cat']</td>
+                            <td data-sort-value="$job['age_ms']">$job['age']</td>
+                            <td data-sort-value="$job['baselink']" title="$job['baselink']">
+                                <!--#if not $job['infourl']#-->
+                                <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
+                                <!--#else#-->
+                                <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
+                                <!--#end if#-->
+                            </td>
+                        </tr>
+                    <!--#end for#-->
+                </table>
+                <!--#else#-->
+                    $T('none')
+                <!--#end if#-->
+            </div>
+            <div class="tab-pane padTable" id="rss-tab-done">
+                <!--#if $downloaded#-->
+                <form action="$url('config/rss/clean_rss_jobs')" method="post">
+                    <input type="hidden" value="$active_feed" name="feed" />
+                    <table class="catTable">
+                        <thead>
+                            <tr>
+                                <th class="default-sort">$T('rss-added')</th>
+                                <th>$T('rss-filter')</th>
+                                <th>$T('size')</th>
+                                <th width="60%">$T('sort-title')</th>
+                                <th>$T('category')</th>
+                                <th>$T('nzo-age')</th>
+                                <th>$T('source')</th>
+                            </tr>
+                        </thead>
+                        <!--#for $job in $downloaded#-->
+                            <tr class="infoTableSeperator">
+                                <td data-sort-value="$job['time_downloaded_ms']">$job['time_downloaded']</td>
+                                <td>$job['rule'] $job['skip']</td>
+                                <td data-sort-value="$job['size']">$job['size_units']</td>
+                                <td>$job['title']</td>
+                                <td>$job['cat']</td>
+                                <td data-sort-value="$job['age_ms']">$job['age']</td>
+                                <td data-sort-value="$job['baselink']" title="$job['baselink']">
+                                    <!--#if not $job['infourl']#-->
+                                    <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
+                                    <!--#else#-->
+                                    <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
+                                    <!--#end if#-->
+                                </td>
+                            </tr>
+                        <!--#end for#-->
+                    </table>
+                </form>
+                <!--#else#-->
+                $T('none')
+                <!--#end if#-->
+            </div>
            <!--#end if#-->
        </div>
-        <!--#end if#-->
    </div>
 </div>
 <!-- /colmask -->

-<form method="post" action="save_rss_feed" class="modal fade" id="rss_edit_modal">
+<form method="post" action="$url('config/rss/save_rss_feed')" class="modal fade" id="rss_edit_modal" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="rss-edit-modal-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Edit') <span id="feed_edit_name_label"></span></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="rss-edit-modal-title">$T('Edit') <span id="feed_edit_name_label"></span></h4>
            </div>
            <div class="modal-body">
                <div class="form-group">
@@ -531,7 +525,6 @@
                    <span class="help-block">$T('addMultipleFeeds')</span>
                </div>
                <input type="hidden" name="feed" id="feed_edit_old_name" />
-                <input type="hidden" name="apikey" value="$apikey" />
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
@@ -541,52 +534,52 @@
    </div><!-- /.modal-dialog -->
 </form><!-- /.modal -->

-<script type="text/javascript" src="${root}staticcfg/js/jquery.tablesort.min.js"></script>
+<script type="text/javascript" src="$url('staticcfg/js/jquery.tablesort.min.js', v=$cache_buster)"></script>
 <script type="text/javascript">
 function urlencode(str) {
    return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
 }

-\$(document).ready(function(){
-    \$('.favicon').each(function(i, theContainer) {
+jQuery(document).ready(function(){
+    jQuery('.favicon').each(function(i, theContainer) {
        // Easy favicon grabber
-        var favUrl = '//' + \$(theContainer).data('domain') + '/favicon.ico'
+        var favUrl = '//' + jQuery(theContainer).data('domain') + '/favicon.ico'

        // Does the image exist? Otherwise place a glyphicon
        var testFavImg = new Image();
        testFavImg.src = favUrl;
        testFavImg.onerror = function (evt){
-            \$(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
+            jQuery(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
        }
    })

-    \$('.tabs a').click(function (e) {
+    jQuery('.nav-tabs a').click(function (e) {
        e.preventDefault()
-        \$(this).tab('show')
+        jQuery(this).tab('show')
    })

-    \$('.editFeed').click(function(){
-        var oldURI = \$(this).prev().val();
-        var whichFeed = \$(this).attr("rel");
+    jQuery('.editFeed').click(function(){
+        var oldURI = jQuery(this).prev().val();
+        var whichFeed = jQuery(this).attr("rel");

        // Fill the values
-        \$('#feed_edit_name_label').text(whichFeed)
-        \$('#feed_edit_old_name').val(whichFeed)
-        \$('#feed_edit_new_name').val(whichFeed)
-        \$('#feed_edit_url').val(oldURI)
+        jQuery('#feed_edit_name_label').text(whichFeed)
+        jQuery('#feed_edit_old_name').val(whichFeed)
+        jQuery('#feed_edit_new_name').val(whichFeed)
+        jQuery('#feed_edit_url').val(oldURI)

        // Show the modal
-        \$('#rss_edit_modal').modal('show');
+        jQuery('#rss_edit_modal').modal('show');
    });

-    \$('.delFeed').click(function(e){
+    jQuery('.delFeed').click(function(e){
        e.preventDefault();
        if ( confirm("$T('confirm')") ) {
-            var whichFeed = \$(this).attr("rel");
-            \$.ajax({
+            var whichFeed = jQuery(this).attr("rel");
+            jQuery.ajax({
                type: "POST",
-                url: "del_rss_feed",
-                data: {feed: whichFeed, apikey: "$apikey" }
+                url: "$url('config/rss/del_rss_feed')",
+                data: {feed: whichFeed }
            }).done(function( msg ) {
                // Let us leave!
                formWasSubmitted = true;
@@ -596,12 +589,12 @@ function urlencode(str) {
        }
    });

-    \$('.toggleFeedCheckbox').click(function(){
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+    jQuery('.toggleFeedCheckbox').click(function(){
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
            type: "POST",
-            url: "toggle_rss_feed",
-            data: {feed: whichFeed, apikey: "$apikey" }
+            url: "$url('config/rss/toggle_rss_feed')",
+            data: {feed: whichFeed }
        }).done(function() {
            // Let us leave!
            formWasSubmitted = true;
@@ -611,37 +604,37 @@ function urlencode(str) {
    });

    // Only the Accept filter needs all the options
-    \$('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
-        \$(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', \$(this).val() != "A" && \$(this).val() != "S")
+    jQuery('form[data-form="update-rss-filter"]').find('select[name="filter_type"]').change(function() {
+        jQuery(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', jQuery(this).val() !== "A" && jQuery(this).val() !== "S")
    })
    // Trigger on-load for all
-    \$('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
+    jQuery('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)

    function setActiveIcon(objButton) {
        // Let's make it look like things are happening!
-        \$(objButton).attr('disabled', true)
-        \$(objButton).find('span').remove()
-        \$(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
+        jQuery(objButton).attr('disabled', true)
+        jQuery(objButton).find('span').remove()
+        jQuery(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
    }

    // Enable sorting and set default
-    if (\$('#rss-tab-matched table').length) {
-        \$('#rss-tab-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-matched table').length) {
+        jQuery('#rss-tab-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-matched th.default-sort'), 'desc');
    }
-    if (\$('#rss-tab-not-matched table').length) {
-        \$('#rss-tab-not-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-not-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-not-matched table').length) {
+        jQuery('#rss-tab-not-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-not-matched th.default-sort'), 'desc');
    }
-    if (\$('#rss-tab-done table').length) {
-        \$('#rss-tab-done table').tablesort().data('tablesort').sort(\$('#rss-tab-done th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-done table').length) {
+        jQuery('#rss-tab-done table').tablesort().data('tablesort').sort(jQuery('#rss-tab-done th.default-sort'), 'desc');
    }

-    \$('.testFeed').click(function(){
+    jQuery('.testFeed').click(function(){
        setActiveIcon(this)
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
            type: "POST",
-            url: "test_rss_feed",
-            data: {feed: whichFeed, apikey: "$apikey" }
+            url: "$url('config/rss/test_rss_feed')",
+            data: {feed: whichFeed }
        }).done(function( msg ) {
            // Let us leave!
            formWasSubmitted = true;
@@ -650,34 +643,34 @@ function urlencode(str) {
        });
    });

-    \$('.cleanFeed').click(function(){
+    jQuery('.cleanFeed').click(function(){
        setActiveIcon(this)
-        var theForm = \$(this).closest("form");
-        theForm.attr("action", "clean_rss_jobs").submit();
+        var theForm = jQuery(this).closest("form");
+        theForm.attr("action", "$url('config/rss/clean_rss_jobs')").submit();
    });

-    \$('.evalFeed').click(function(){
+    jQuery('.evalFeed').click(function(){
        setActiveIcon(this)
-        var theForm = \$(this).closest("form");
-        theForm.attr("action", "eval_rss_feed").submit();
+        var theForm = jQuery(this).closest("form");
+        theForm.attr("action", "$url('config/rss/eval_rss_feed')").submit();
    });

-    \$('.delFilter').click(function(){
-        var theForm = \$(this).closest("form");
-        theForm.attr("action", "del_rss_filter").submit();
+    jQuery('.delFilter').click(function(){
+        var theForm = jQuery(this).closest("form");
+        theForm.attr("action", "$url('config/rss/del_rss_filter')").submit();
    });

-    \$('form[action="download"]').ajaxForm({
+    jQuery('form[data-form="download-rss-job"]').ajaxForm({
        datatype: 'json',
        beforeSubmit: function (_, form) {
-            \$(form).find('button').attr("disabled", "disabled")
+            jQuery(form).find('button').attr("disabled", "disabled")
            // Remove icon and add new one
-            \$(form).find('button span').remove()
-            \$(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
+            jQuery(form).find('button span').remove()
+            jQuery(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
        },
        success: function (_, _, _, form) {
            // Set success
-            \$(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
+            jQuery(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
        }
    });

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.4s/scheduling"#-->
+<!--#set global $help_uri = $confighelpuri + "scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <%
@@ -15,19 +15,18 @@ else:
 <div class="colmask">
    <div class="section">
        <div class="col2">
-            <h3>$T('addSchedule') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addSchedule') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
        </div><!-- /col2 -->
-        <form action="addSchedule" method="post" autocomplete="off">
-        <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+        <form data-form="add-schedule" action="$url('config/scheduling/add_schedule')" method="post" autocomplete="off">
        <div class="col1">
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="hour">$T('hour').capitalize() : $T('minute').capitalize()</label>
-                    <select name="hour" id="hour">
+                    <select name="hour" id="hour" aria-label="$T('hour').capitalize()">
                        <!--#for $i in range(24)#-->
                            <option value="$i" <!--#if hour == i then 'selected="selected"' else ""#--> > $str($i).zfill(2) </option>
                        <!--#end for#-->
-                    </select>&nbsp;<b>:</b>&nbsp;<select name="minute" id="minute">
+                    </select>&nbsp;<b>:</b>&nbsp;<select name="minute" id="minute" aria-label="$T('minute').capitalize()">
                        <!--#for $i in range(60)#-->
                            <option value="$i"> $str($i).zfill(2) </option>
                        <!--#end for#-->
@@ -90,13 +89,12 @@ else:
                        <!--#set $odd = True#-->
                        <!--#for $schednum, $line in enumerate($schedlines)#-->
                            <!--#set $odd = not $odd#-->
-                            <form action="delSchedule" method="post">
-                                <input type="hidden" name="apikey" value="$apikey"/>
-                                <input type="hidden" name="line" id="line" value="$line"/>
+                            <form data-form="del-schedule" action="$url('config/scheduling/del_schedule')" method="post">
+                                <input type="hidden" name="line" value="$line"/>
                                <div class="field-pair infoTableSeperator <!--#if $odd then "" else " alt"#-->">
-                                    <input type="checkbox" name="schedenabled" value="$line" <!--#if int($taskinfo[$schednum][5]) > 0 then 'checked="checked"' else ""#-->>
-                                    <button class="btn btn-default float-left"><span class="glyphicon glyphicon-trash"></span></button>
-                                    <div class="scheduleEntry">
+                                    <input type="checkbox" name="schedenabled" value="$line" aria-label="$T('enabled')" aria-describedby="schedule-description-$schednum" <!--#if int($taskinfo[$schednum][5]) > 0 then 'checked="checked"' else ""#-->>
+                                    <button class="btn btn-default float-left" type="submit" aria-label="$T('nzo-delete')" aria-describedby="schedule-description-$schednum"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button>
+                                    <div class="scheduleEntry" id="schedule-description-$schednum">
                                        <span class="time">$taskinfo[$schednum][1]:$taskinfo[$schednum][2]</span><span class="frequency">$taskinfo[$schednum][3]</span> <span class="darkred">$taskinfo[$schednum][4]</span>
                                    </div>
                                </div>
@@ -112,32 +110,32 @@ else:
    </div><!-- /section -->
 </div><!-- /colmask -->
 <script type="text/javascript">
-    \$('#action').on('change', function() {
+    jQuery('#action').on('change', function() {
        // Set the action
-        \$('#arguments').val((\$(this).find('option:selected').data('action')))
+        jQuery('#arguments').val((jQuery(this).find('option:selected').data('action')))

        // Is it speedlimit?
-        if(\$(this).find('option:selected').val() == 'speedlimit') {
-            \$('#hidden_arguments').show()
-            \$('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
+        if(jQuery(this).find('option:selected').val() === 'speedlimit') {
+            jQuery('#hidden_arguments').show()
+            jQuery('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
        } else {
-            \$('#hidden_arguments').hide()
-            \$('#hidden_arguments input').attr('placeholder', '')
+            jQuery('#hidden_arguments').hide()
+            jQuery('#hidden_arguments input').attr('placeholder', '')
        }

        /* Arguments - since we only have speedlimit with arguments, disabled for now
-        if(\$(this).find('option:selected').data('noarg')) {
-            \$('#hidden_arguments').hide()
+        if(jQuery(this).find('option:selected').data('noarg')) {
+            jQuery('#hidden_arguments').hide()
        } else {
-            \$('#hidden_arguments').show()
+            jQuery('#hidden_arguments').show()
        }*/
    })

-    \$('[name="schedenabled"]').click(function() {
-        \$.ajax({
+    jQuery('[name="schedenabled"]').click(function() {
+        jQuery.ajax({
            type: "POST",
-            url: "toggleSchedule",
-            data: {line: \$(this).val(), apikey: "$apikey" }
+            url: "$url('config/scheduling/toggle_schedule')",
+            data: {line: jQuery(this).val() }
        }).done(function() {
            // Let us leave!
            formWasSubmitted = true;
@@ -1,17 +1,25 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.4/servers"#-->
+<!--#set global $help_uri = $confighelpuri + "servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <!--#import json#-->
 <!--#import datetime#-->

-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+<script type="text/javascript">
    // Define variable needed for the server-statistics
    var serverBandwithData = {}
    var serverArticleTries = {}
    var serverArticleFailed = {}
+
+    // Keep track of all used hostnames
+    var hostnames = ""
 </script>

+<div class="server-frame">
+    <a href="#">&times;</a>
+    <iframe></iframe>
+</div>
+
 <div class="colmask">
    <div class="padding alt section">
        <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
@@ -20,7 +28,7 @@
        </label>

        <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('selectedDates')">
+        <div class="chart-selector-container" title="$T('selectedDates')" data-placement="bottom">
            <span class="glyphicon glyphicon-signal"></span>
            <!--#set today = datetime.date.today()#-->
            <input type="date" name="chart-start" id="chart-start" value="<!--#echo (today-datetime.timedelta(days=30)).strftime('%Y-%m-%d')#-->"> -
@@ -29,17 +37,15 @@
    </div>
    <div class="section" id="addServerContent" style="display: none;">
        <div class="col2">
-            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
        </div>
        <div class="col1">
-            <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
-                <input type="hidden" name="apikey" value="$apikey" />
+            <form data-form="add-server" action="$url('config/server/add_server')" method="post" autocomplete="off">
                <input type="hidden" name="output" value="json" />
                <fieldset>
                    <div class="field-pair">
                        <label class="config" for="enable">$T('srv-enable')</label>
                        <input type="checkbox" name="enable" id="enable" value="1" checked="checked" />
-                        <span class="desc">$T('srv-enable')</span>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="displayname">$T('srv-displayname')</label>
@@ -49,27 +55,27 @@
                        <label class="config" for="host">$T('srv-host')</label>
                        <input type="text" name="host" id="host" required />
                    </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                        <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="119" min="0" />
+                        <input type="number" name="port" id="port" size="8" value="563" min="0" max="65535" />
                    </div>
                    <div class="field-pair">
                        <label class="config" for="ssl">$T('srv-ssl')</label>
-                        <input type="checkbox" name="ssl" id="ssl" value="1" />
+                        <input type="checkbox" name="ssl" id="ssl" value="1" checked />
                        <span class="desc">$T('explain-ssl')</span>
                    </div>
                    <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
                    <div class="field-pair">
-                        <label class="config" for="${pid}_00">$T('srv-username')</label>
-                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
+                        <label class="config" for="${pid}_000">$T('srv-username')</label>
+                        <input type="text" name="${pid}_000" id="${pid}_000" data-hide="username" />
                    </div>
                    <div class="field-pair">
-                        <label class="config" for="${pid}_01">$T('srv-password')</label>
-                        <input type="text" name="${pid}_01" id="${pid}_01" data-hide="password" />
+                        <label class="config" for="${pid}_001">$T('srv-password')</label>
+                        <input type="text" name="${pid}_001" id="${pid}_001" data-hide="password" />
                    </div>
                    <div class="field-pair">
                        <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="1000" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="500" value="16" required />
                    </div>
                    <div class="field-pair">
                        <label class="config" for="priority">$T('srv-priority')</label>
@@ -83,31 +89,38 @@
                        <label class="config" for="timeout">$T('srv-timeout')</label>
                        <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
                    </div>
-                    <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
+                    <div class="field-pair advanced-settings">
                        <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
-                        <select name="ssl_verify" id="ssl_verify" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                            <option value="2" selected>$T('ssl_verify-strict')</option>
-                            <option value="1">$T('ssl_verify-normal')</option>
+                        <select name="ssl_verify" id="ssl_verify">
+                            <option value="3" selected>$T('ssl_verify-strict')</option>
+                            <option value="2">$T('ssl_verify-medium')</option>
+                            <option value="1">$T('ssl_verify-minimal')</option>
                            <option value="0">$T('ssl_verify-disabled')</option>
                        </select>
-                        <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
+                        <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
                        <input type="text" name="ssl_ciphers" id="ssl_ciphers" />
                        <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                        <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                    </div>
                    <div class="field-pair advanced-settings">
-                        <label class="config" for="send_group">$T('srv-send_group')</label>
-                        <input type="checkbox" name="send_group" id="send_group" value="1" />
-                        <span class="desc">$T('srv-explain-send_group')</span>
+                        <label class="config" for="required">$T('srv-required')</label>
+                        <input type="checkbox" name="required" id="required" value="1" />
+                        <span class="desc">$T('explain-required')</span>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="optional">$T('srv-optional')</label>
                        <input type="checkbox" name="optional" id="optional" value="1" />
                        <span class="desc">$T('explain-optional')</span>
                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="pipelining_requests">$T('srv-pipelining_requests')</label>
+                        <input type="number" name="pipelining_requests" id="pipelining_requests" min="1" max="20" value="2" />
+                        <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
+                        <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
+                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="expire_date">$T('srv-expire_date')</label>
                        <input type="date" name="expire_date" id="expire_date" />
@@ -123,30 +136,29 @@
                        <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                    </div>
                    <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
-                        <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
-                    </div>
-                    <div class="field-pair result-box">
-                        <div class="alert"></div>
+                        <button class="btn btn-default addNewServer" disabled data-toggle="tooltip" data-placement="top" title="$T('wizard-test-server-required')"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <button class="btn btn-default testServer" type="button" aria-busy="false"><span class="glyphicon glyphicon-sort" aria-hidden="true"></span> $T('button-testServer')</button>
+                        <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                            <div class="alert"></div>
+                        </div>
                    </div>
+
                </fieldset>
            </form>
        </div>
    </div>

-    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
+    <!--#set $prio_colors = ["#59cc33", "#26a69a", "#3366cc", "#7f33cc", "#cc33a6", "#f39c12", "#cc3333", "#8d6e63"] #-->
    <!--#set $cur_prio_color = -1 #-->
    <!--#set $last_prio = -1 #-->
    <!--#for $cur, $server in enumerate($servers) #-->
-        <form action="saveServer" method="post" class="fullform" autocomplete="off">
-            <input type="hidden" name="apikey" value="$apikey" />
+        <form action="$url('config/server/save_server')" method="post" class="fullform" autocomplete="off">
            <input type="hidden" name="output" value="json" />
            <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" id="ajax" name="ajax" value=1 />

            <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
                <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3 title="$server['displayname']">$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3 title="$server['displayname']">$server['displayname'] <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                    <!--#if int($server['enable']) != 0 #-->
                        <!--#if $last_prio != $server['priority'] and $cur_prio_color+1 < len($prio_colors) #-->
                            <!--#set $cur_prio_color = $cur_prio_color+1 #-->
@@ -163,6 +175,9 @@
                    </table>
                    <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
                    <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
+                    <!--#if $server['notes'] #-->
+                    <p>$server['notes'].replace('\n', '<br>')</p>
+                    <!--#end if#-->
                </div>
                <div class="col1" style="display:none;">
                    <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
@@ -175,9 +190,9 @@
                            <label class="config" for="host$cur">$T('srv-host')</label>
                            <input type="text" name="host" id="host$cur" value="$server['host']" required />
                        </div>
-                        <div class="field-pair">
+                        <div class="field-pair advanced-settings">
                            <label class="config" for="port$cur">$T('srv-port')</label>
-                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
+                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" max="65535" required />
                        </div>
                        <div class="field-pair">
                            <label class="config" for="ssl$cur">$T('srv-ssl')</label>
@@ -195,7 +210,7 @@
                        </div>
                        <div class="field-pair">
                            <label class="config" for="connections$cur">$T('srv-connections')</label>
-                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="1000" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="500" required />
                        </div>
                        <div class="field-pair">
                            <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -210,20 +225,26 @@
                            <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
                        </div>

-                        <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
+                        <div class="field-pair advanced-settings">
                            <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
-                            <select name="ssl_verify" id="ssl_verify$cur" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
-                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                            <select name="ssl_verify" id="ssl_verify$cur">
+                                <option value="3" <!--#if $server['ssl_verify'] == 3 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-medium')</option>
+                                <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-minimal')</option>
                                <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                            </select>
-                            <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
+                            <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                        </div>
                        <div class="field-pair advanced-settings">
-                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
+                            <label class="config" for="ssl_ciphers$cur">$T('opt-ssl_ciphers')</label>
+                            <input type="text" name="ssl_ciphers" id="ssl_ciphers$cur" value="$server['ssl_ciphers']" />
                            <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                            <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
+                        </div>
+                        <div class="field-pair advanced-settings">
+                            <label class="config" for="required$cur">$T('srv-required')</label>
+                            <input type="checkbox" name="required" id="required$cur" value="1" <!--#if int($server['required']) != 0 then 'checked="checked"' else ""#--> />
+                            <span class="desc">$T('explain-required')</span>
                        </div>
                        <div class="field-pair advanced-settings">
                            <label class="config" for="optional$cur">$T('srv-optional')</label>
@@ -231,9 +252,10 @@
                            <span class="desc">$T('explain-optional')</span>
                        </div>
                        <div class="field-pair advanced-settings">
-                            <label class="config" for="send_group$cur">$T('srv-send_group')</label>
-                            <input type="checkbox" name="send_group" id="send_group$cur" value="1" <!--#if int($server['send_group']) != 0 then 'checked="checked"' else ""#--> />
-                            <span class="desc">$T('srv-explain-send_group')</span>
+                            <label class="config" for="pipelining_requests$cur">$T('srv-pipelining_requests')</label>
+                            <input type="number" name="pipelining_requests" id="pipelining_requests$cur" value="$server['pipelining_requests']" min="1" max="20" required />
+                            <span class="desc">$T('explain-pipelining_requests')<br>$T('readwiki')
+                            <a href="https://sabnzbd.org/wiki/advanced/nntp-pipelining" target="_blank">https://sabnzbd.org/wiki/advanced/nntp-pipelining</a></span>
                        </div>
                        <div class="field-pair advanced-settings">
                            <label class="config" for="expire_date$cur">$T('srv-expire_date')</label>
@@ -249,17 +271,18 @@
                            <label class="config" for="notes$cur">$T('srv-notes')</label>
                            <textarea name="notes" id="notes$cur" rows="3" cols="50">$server['notes']</textarea>
                        </div>
-                        <div class="field-pair">
+                        <div class="field-pair no-field-pair-bg">
                            <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                            <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
+                            <button class="btn btn-default testServer" type="button" aria-busy="false"><span class="glyphicon glyphicon-sort" aria-hidden="true"></span> $T('button-testServer')</button>
                            <button class="btn btn-default delServer"><span class="glyphicon glyphicon-trash"></span> $T('button-delServer')</button>
-                        </div>
-                        <div class="field-pair result-box">
-                            <div class="alert"></div>
+
+                            <div class="result-box" role="status" aria-live="polite" aria-atomic="true">
+                                <div class="alert"></div>
+                            </div>
                        </div>
                    </fieldset>
                </div>
-                <div class="col1" style="display:block;">
+                <div class="col1 padding" style="display:block;">
                    <!--#if 'amounts' in $server#-->
                        <div class="server-amounts-text">
                            <p>
@@ -273,13 +296,14 @@

                            <p title="$T('readwiki')">
                                <b>$T('srv-article-availability'):</b><br/>
-                                $T('selectedDates'): <span id="server-article-value-${cur}"></span>
+                                $T('selectedDates'): <span id="server-article-value-${cur}"></span><br/>
+                                <a href="https://sabnzbd.org/not-complete" id="server-article-not-complete-${cur}" target="_blank">https://sabnzbd.org/not-complete</a>
                            </p>
                            <!--#if $server['expire_date']#-->
                            <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
                            <!--#end if#-->
                            <!--#if $server['quota']#-->
-                            <p><b>$T('quota-left'):</b> $(server['quota_left'])B</p>
+                            <p><b>$T('quota-left'):</b> $(server['quota_left'])</p>
                            <!--#end if#-->
                        </div>
                        <div class="server-chart" data-serverid="${cur}">
@@ -290,6 +314,9 @@
                            serverBandwithData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
                            serverArticleTries[${cur}] = <!--#echo json.dumps($server['amounts'][5])#-->
                            serverArticleFailed[${cur}] = <!--#echo json.dumps($server['amounts'][6])#-->
+                            <!--#if int($server['enable']) != 0#-->
+                            hostnames += ",$server['host']"
+                            <!--#end if#-->
                        </script>
                    <!--#end if#-->
                </div>
@@ -298,8 +325,8 @@
    <!--#end for#-->
 </div>

-<script type="text/javascript" src="${root}staticcfg/js/chartist.min.js"></script>
-<script type="text/javascript" src="${root}staticcfg/js/filesize.min.js"></script>
+<script type="text/javascript" src="$url('staticcfg/js/chartist.min.js', v=$cache_buster)"></script>
+<script type="text/javascript" src="$url('staticcfg/js/filesize.min.js', v=$cache_buster)"></script>
 <script type="text/javascript">
    // Standardize chart options
    var chartOptions = {
@@ -327,8 +354,8 @@

    function showCharts() {
        // Get the constants
-        const startDate = new Date(\$('#chart-start').val())
-        const endDate = new Date(\$('#chart-end').val())
+        const startDate = new Date(jQuery('#chart-start').val())
+        const endDate = new Date(jQuery('#chart-end').val())
        const oneDay = 24 * 60 * 60 * 1000
        const nrDays = Math.round((endDate-startDate)/oneDay)

@@ -339,8 +366,8 @@
        var maxBandwith = 0

        // For each chart
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')
            var totalBandwithThisRange = 0
            var totalArticlesTriedThisRange = 0
            var totalArticlesFailedThisRange = 0
@@ -383,7 +410,7 @@
            }

            // Update the text value
-            \$('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
+            jQuery('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))

            // Calculate article success ratio, if available
            var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
@@ -391,14 +418,17 @@
            // If values were missing
            if(!isNaN(articleRatio)) {
                // Use filesize to convert to unit-display
-                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
+                jQuery('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
+                // If we have a low value, we link them to the website
+                if(articleRatio > 60) jQuery('#server-article-not-complete-' + server_id).hide()
            } else {
-                \$('#server-article-value-' + server_id).text('$T("notAvailable")')
+                jQuery('#server-article-value-' + server_id).text('$T("notAvailable")')
+                jQuery('#server-article-not-complete-' + server_id).hide()
            }

            // Save bandwidth data in a very ugly way, but we need to do this
            // so we can calculate the maximum Y-axis for all graphs
-            \$(elemn).data("chart-data", data)
+            jQuery(elemn).data("chart-data", data)
        })

        // Set the maximum
@@ -406,11 +436,11 @@
        chartOptions.axisY.low = 0

        // Update all the axis with the largest value and draw the graph
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')

            // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, \$(elemn).data("chart-data"), chartOptions)
+            chart = new Chartist.Line('#server-chart-'+server_id, jQuery(elemn).data("chart-data"), chartOptions)
            chart.on('created', function(context) {
                // Make sure to add this as the first child so it's at the bottom
                context.svg.elem('rect', {
@@ -422,15 +452,15 @@
                    stroke: '#b9b9b9',
                    'stroke-width': '1px'
                }, '', context.svg, true)
-                \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                jQuery('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
                    elmn.innerHTML = filesize(elmn.innerHTML, {round: 1}).replace(' ','')
                })
            });
        })

        // Limit input to sensible values
-        \$('#chart-start').attr("max", \$('#chart-end').val())
-        \$('#chart-end').attr("min", \$('#chart-start').val())
+        jQuery('#chart-start').attr("max", jQuery('#chart-end').val())
+        jQuery('#chart-end').attr("min", jQuery('#chart-start').val())
    }

    // Need to mitigate timezone effects!
@@ -443,21 +473,19 @@
    /**
        When finished loading
    **/
-    \$(document).ready(function(){
-        // Exception when change of priority, reload
-        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
-            \$('.fullform').submit(function() {
-                // No ajax this time
-                \$('input[name="ajax"]').val('')
-                // Skip the fancy stuff, just submit
-                this.submit()
-            })
+    jQuery(document).ready(function(){
+        // Initialize tooltips
+        jQuery('[data-toggle="tooltip"]').tooltip()
+        
+        // Reload the page after saving in case we change items that make the servers appear different
+        jQuery('input[name="priority"], input[name="displayname"], textarea[name="notes"]').on('change', function(event) {
+            jQuery(event.target).parents("form").attr("data-reload-on-save", "")
        })

        /**
            Update charts when changed
        **/
-        \$('#chart-start, #chart-end').on('change', function(elemn) {
+        jQuery('#chart-start, #chart-end').on('change', function(elemn) {
            showCharts()

            // Lets us leave (needs to be called after the change event)
@@ -472,41 +500,37 @@
        /**
            Click events
        **/
-        \$('.showserver').click(function () {
-            if(\$(this).parent().hasClass('server-disabled')) {
-                \$(this).parent().parent().toggleClass('server-disabled')
+        jQuery('.showserver').click(function () {
+            if(jQuery(this).parent().hasClass('server-disabled')) {
+                jQuery(this).parent().parent().toggleClass('server-disabled')
            }
-            \$(this).parent().next().toggle();
-            \$(this).parent().next().next().toggle();
-            if (\$(this).text().indexOf("$T('showDetails')") > 0) {
-                \$(this).html(\$(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
+            jQuery(this).parent().next().toggle();
+            jQuery(this).parent().next().next().toggle();
+            if (jQuery(this).text().indexOf("$T('showDetails')") > 0) {
+                jQuery(this).html(jQuery(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
            } else {
-                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
+                jQuery(this).html(jQuery(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
                // Recalculate the charts if changed while details were open
                showCharts()
            }
-            // Add coloring
-            addRowColor()
        });

-        \$('#addServerButton').click(function(){
-            \$('#addServerContent').show();
-            // Add coloring
-            addRowColor()
+        jQuery('#addServerButton').click(function(){
+            jQuery('#addServerContent').show();
        });

-        \$('[name="ssl"]').click(function() {
+        jQuery('[name="ssl"]').click(function() {
            // Use CSS transitions to do some highlighting
-            var portBox = \$(this).parent().parent().find('[name="port"]')
+            var portBox = jQuery(this).parent().parent().find('[name="port"]')
            if(this.checked) {
                // Enabled SSL change port when not already a custom port
-                if(portBox.val() == '119') {
+                if(portBox.val() === '119') {
                    portBox.val('563')
                    portBox.addClass('port-highlight')
                }
            } else {
                // Remove SSL port
-                if(portBox.val() == '563') {
+                if(portBox.val() === '563') {
                    portBox.val('119')
                    portBox.addClass('port-highlight')
                }
@@ -515,65 +539,110 @@
        })

        // Testing servers
-        \$('.testServer').click(function(event){
+        jQuery('.testServer').click(function(event){
            removeObfuscation()
-            var theButton = \$(this)
+            var theButton = jQuery(this)
            var resultBox = theButton.parents('.col1').find('.result-box .alert');
            theButton.attr("disabled", "disabled")
+            theButton.attr("aria-busy", "true")
            theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            \$.ajax({
+            resultBox.removeClass('alert-success alert-danger').addClass('alert-info').html("$T('srv-testing')").show()
+            jQuery.ajax({
                type: "POST",
-                url: "../../api",
-                data: "mode=config&name=test_server&" + \$(this).parents('form:first').serialize()
+                url: "$url('api')",
+                data: "mode=config&name=test_server&" + jQuery(this).parents('form:first').serialize()
            }).then(function(data) {
                // Let's replace the link
                msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
                msg = msg.replace('-', '<br>')
                // Fill the box and enable the button
-                resultBox.removeClass('alert-success alert-danger').show()
+                resultBox.removeClass('alert-info alert-success alert-danger').show()
                resultBox.html(msg)
                theButton.removeAttr("disabled")
+                theButton.attr("aria-busy", "false")
                theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')

-                // Succes or not?
+                // Success or not?
                if(data.value.result) {
                    resultBox.addClass('alert-success')
-                    resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
+                    resultBox.prepend('<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> ')
+
+                    // Allow adding the new server if we are in the new-server section
+                    if(theButton.parents("form[data-form='add-server']").length) {
+                        jQuery(".addNewServer").removeAttr("disabled")
+                        jQuery(".addNewServer").removeAttr("data-toggle")
+                        jQuery(".addNewServer").removeAttr("title")
+                        jQuery(".addNewServer").tooltip("destroy")
+                    }
                } else {
                    resultBox.addClass('alert-danger')
-                    resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
+                    resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> ')
+
+                    // Disable the adding of new server, just to be sure
+                    if(theButton.parents("form[data-form='add-server']").length) {
+                        jQuery(".addNewServer").attr("disabled", "disabled")
+                        jQuery(".addNewServer").attr("data-toggle", "tooltip")
+                        jQuery(".addNewServer").attr("data-placement", "top")
+                        jQuery(".addNewServer").attr("title", "$T('wizard-test-server-required')")
+                        jQuery(".addNewServer").tooltip()
+                    }
                }
            });
        });

-        \$('.delServer').click(function(){
-            if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','delServer').submit();
-                // Let us leave!
-                formWasSubmitted = true;
-                formHasChanged = false;
-                setTimeout(function() { location.reload(); }, 500)
-            }
-            return false;
-        });
-
-        \$('.clrServer').click(function(){
-            if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','clrServer').submit();
-                // Let us leave!
-                formWasSubmitted = true;
-                formHasChanged = false;
-                setTimeout(function() { location.reload(); }, 500)
-            }
-            return false;
-        });
-
-        \$('.toggleServerCheckbox').click(function(){
-            var whichServer = \$(this).attr("name");
-            \$.ajax({
+        jQuery('.addNewServer').click(function(event){
+            event.preventDefault()
+            removeObfuscation()
+            var theButton = jQuery(this)
+            var resultBox = theButton.parents('.col1').find('.result-box .alert')
+            theButton.attr("disabled", "disabled")
+            jQuery.ajax({
                type: "POST",
-                url: "toggleServer",
-                data: {server: whichServer, apikey: "$apikey" }
+                url: "$url('config/server/add_server')",
+                data: theButton.parents('form:first').serialize()
+            }).then(function(data) {
+                if(data.status) {
+                    // Success — reload to show the new server
+                    formWasSubmitted = true
+                    formHasChanged = false
+                    location.reload()
+                } else {
+                    // Show error in the result box
+                    resultBox.removeClass('alert-success').addClass('alert-danger').show()
+                    resultBox.html('<span class="glyphicon glyphicon-exclamation-sign"></span> ' + data.error)
+                    theButton.removeAttr("disabled")
+                }
+            })
+        })
+
+        jQuery('.delServer').click(function(){
+            if( confirm("$T('confirm')") ) {
+                jQuery(this).parents('form:first').attr('action',"$url('config/server/delete_server')").submit();
+                // Let us leave!
+                formWasSubmitted = true;
+                formHasChanged = false;
+                setTimeout(function() { location.reload(); }, 500)
+            }
+            return false;
+        });
+
+        jQuery('.clrServer').click(function(){
+            if( confirm("$T('confirm')") ) {
+                jQuery(this).parents('form:first').attr('action',"$url('config/server/clear_server')").submit();
+                // Let us leave!
+                formWasSubmitted = true;
+                formHasChanged = false;
+                setTimeout(function() { location.reload(); }, 500)
+            }
+            return false;
+        });
+
+        jQuery('.toggleServerCheckbox').click(function(){
+            var whichServer = jQuery(this).attr("name");
+            jQuery.ajax({
+                type: "POST",
+                url: "$url('config/server/toggle_server')",
+                data: {server: whichServer }
            }).done(function() {
                // Let us leave!
                formWasSubmitted = true;
@@ -581,6 +650,35 @@
                setTimeout(function() { location.reload(); }, 100)
            });
        });
+
+        // Show text-ad if there is space
+        if((jQuery("body").width() - jQuery("#content").width())/2 > (jQuery('.Servers .server-frame').width() + 40)) {
+            // Do not show if dismissed previously
+            if(localStorage.getItem("server-frame-hide-$version") === null) {
+                // Let the page on the server tell us if we need to show
+                function receiveMessage(event) {
+                    // Check origin of message for security reasons
+                    if(event.origin === 'https://sabnzbd.org') {
+                        if(event.data === 'show_server') {
+                            jQuery('.Servers .server-frame').show()
+                            jQuery('.Servers .server-frame a').click(function () {
+                                localStorage.setItem("server-frame-hide-$version", "hide")
+                                jQuery('.Servers .server-frame').hide()
+                            })
+                        }
+                        if(event.data === 'hide_server') {
+                            // Hide and don't load anymore until the next release
+                            jQuery('.Servers .server-frame').hide()
+                            localStorage.setItem("server-frame-hide-$version", "hide")
+                        }
+                    }
+                }
+                window.addEventListener("message", receiveMessage, false);
+
+                // NOTE: The hash-part cannot be seen by the server, so we don't know which hostnames you use!
+                jQuery('.Servers .server-frame iframe').attr("src", "https://sabnzbd.org/servers#$active_lang" + hostnames)
+            }
+        }
    });
 </script>

@@ -1,16 +1,15 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.4/special"#-->
+<!--#set global $help_uri = $confighelpuri + "special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
-    <form action="saveSpecial" method="post" autocomplete="off">
-        <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+    <form action="$url('config/special/save')" method="post" class="fullform" autocomplete="off">
        <div class="padTable">
            <h4 class="darkred nomargin">$T('explain-special')</h4>
        </div>
        <div class="section">
            <div class="col2">
-                <h3>$T('sptag-boolean') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-boolean') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -33,7 +32,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('sptag-entries') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-entries') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.4/switches"#-->
+<!--#set global $help_uri = $confighelpuri + "switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -8,25 +8,14 @@
            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
        </label>
    </div>
-    <form action="saveSwitches" method="post" name="fullform" class="fullform" autocomplete="off">
-        <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-        <input type="hidden" id="ajax" name="ajax" value="1" />
+    <form action="$url('config/switches/save')" method="post" class="fullform" autocomplete="off">
        <input type="hidden" name="output" value="json" />
        <div class="section advanced-settings">
            <div class="col2">
-                <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-server') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="load_balancing">$T('opt-load_balancing')</label>
-                        <select name="load_balancing" id="load_balancing">
-                            <option value="0" <!--#if $load_balancing == 0 then 'selected="selected"' else ""#--> >$T('no-load-balancing')</option>
-                            <option value="1" <!--#if $load_balancing == 1 then 'selected="selected"' else ""#--> >$T('load-balancing')</option>
-                            <option value="2" <!--#if $load_balancing == 2 then 'selected="selected"' else ""#--> >$T('load-balancing-happy-eyeballs')</option>
-                        </select>
-                        <span class="desc">$T('explain-load_balancing')</span>
-                    </div>
                    <div class="field-pair">
                        <label class="config" for="max_art_tries">$T('opt-max_art_tries')</label>
                        <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
@@ -46,11 +35,11 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-queue') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-queue') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                        <label class="config" for="pre_script">$T('opt-pre_script')</label>
                        <select name="pre_script" id="pre_script">
                        <!--#for $sc in $scripts#-->
@@ -63,9 +52,22 @@
                        </select>
                        <span class="desc">$T('explain-pre_script')</span>
                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="end_queue_script">$T('opt-end_queue_script')</label>
+                        <select name="end_queue_script" id="end_queue_script">
+                        <!--#for $sc in $scripts#-->
+                            <!--#if $sc.lower() == $end_queue_script.lower()#-->
+                                <option value="$sc" selected="selected">$Tspec($sc)</option>
+                            <!--#else#-->
+                                <option value="$sc">$Tspec($sc)</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
+                        </select>
+                        <span class="desc">$T('explain-end_queue_script')</span>
+                    </div>
                    <div class="field-pair">
                        <label class="config" for="propagation_delay">$T('opt-propagation_delay')</label>
-                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
+                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" min="0" /> <i>$T('minutes')</i>
                        <span class="desc">$T('explain-propagation_delay')</span>
                    </div>
                    <div class="field-pair advanced-settings">
@@ -89,33 +91,39 @@
                            <option value="0" <!--#if int($no_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                            <option value="4" <!--#if int($no_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                            <option value="2" <!--#if int($no_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                            <option value="1" <!--#if int($no_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                        </select>
-                        <span class="desc">$T('explain-no_dupes')</span>
+                        <span class="desc">
+                            $T('explain-no_dupes')<br>
+                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
+                        </span>
                    </div>
                    <div class="field-pair">
-                        <label class="config" for="no_series_dupes">$T('opt-no_series_dupes')</label>
-                        <select name="no_series_dupes" id="no_series_dupes">
-                            <option value="0" <!--#if int($no_series_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
-                            <option value="4" <!--#if int($no_series_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
-                            <option value="2" <!--#if int($no_series_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_series_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
-                            <option value="1" <!--#if int($no_series_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
+                        <label class="config" for="no_smart_dupes">$T('opt-no_smart_dupes')</label>
+                        <select name="no_smart_dupes" id="no_smart_dupes">
+                            <option value="0" <!--#if int($no_smart_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
+                            <option value="4" <!--#if int($no_smart_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
+                            <option value="2" <!--#if int($no_smart_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
+                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="1" <!--#if int($no_smart_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                        </select>
-                        <span class="desc">$T('explain-no_series_dupes')</span>
+                        <span class="desc">
+                            $T('explain-no_smart_dupes')<br>
+                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
+                        </span>
                    </div>
                    <div class="field-pair advanced-settings">
-                        <label class="config" for="series_propercheck">$T('opt-series_propercheck')</label>
-                        <input type="checkbox" name="series_propercheck" id="series_propercheck" value="1" <!--#if int($series_propercheck) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-series_propercheck')</span>
+                        <label class="config" for="dupes_propercheck">$T('opt-dupes_propercheck')</label>
+                        <input type="checkbox" name="dupes_propercheck" id="dupes_propercheck" value="1" <!--#if int($dupes_propercheck) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-dupes_propercheck')</span>
                    </div>
                    <div class="field-pair">
                        <label class="config" for="pause_on_pwrar">$T('opt-pause_on_pwrar')</label>
                        <select name="pause_on_pwrar" id="pause_on_pwrar">
                            <option value="0" <!--#if int($pause_on_pwrar) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                            <option value="1" <!--#if int($pause_on_pwrar) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                        </select>
                        <span class="desc">$T('explain-pause_on_pwrar')</span>
                    </div>
@@ -133,7 +141,7 @@
                        <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
                            <option value="0" <!--#if int($action_on_unwanted_extensions) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                            <option value="1" <!--#if int($action_on_unwanted_extensions) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                        </select>
                        <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                    </div>
@@ -141,6 +149,8 @@
                        <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                        <select name="auto_sort" id="auto_sort">
                            <option value="">$T('default')</option>
+                            <option value="remaining asc" <!--#if $auto_sort == "remaining asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortRemaining')</option>
+                            <option value="remaining_bytes asc" <!--#if $auto_sort == "remaining_bytes asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortRemainingBytesAsc')</option>
                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
                            <option value="name asc" <!--#if $auto_sort == "name asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameAsc')</option>
@@ -148,7 +158,7 @@
                            <option value="size asc" <!--#if $auto_sort == "size asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeAsc')</option>
                            <option value="size desc" <!--#if $auto_sort == "size desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeDesc')</option>
                        </select>
-                        <span class="desc">$T('explain-auto_sort')</span>
+                        <span class="desc">$T('explain-auto_sort') $T('explain-auto_sort_remaining')</span>
                    </div>
                    <div class="field-pair">
                        <label class="config" for="direct_unpack">$T('opt-direct_unpack')</label>
@@ -164,7 +174,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-pp') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-pp') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -178,16 +188,16 @@
                        <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                    </div>
-                    <!--#if not $nt#-->
+                    <!--#if not $windows#-->
                    <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
                        <label class="config" for="nice">$T('opt-nice')</label>
                        <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-nice')</span>
+                        <span class="desc">$T('readwiki')</span>
                    </div>
                    <div class="field-pair advanced-settings <!--#if not $have_ionice then "disabled" else "" #-->">
                        <label class="config" for="ionice">$T('opt-ionice')</label>
                        <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-ionice')</span>
+                        <span class="desc">$T('readwiki')</span>
                    </div>
                    <!--#else#-->
                    <div class="field-pair advanced-settings">
@@ -199,13 +209,13 @@
                            <option value="2" <!--#if int($win_process_prio) == 2 then 'selected="selected"' else ""#-->>$T('win_process_prio-low')</option>
                            <option value="1" <!--#if int($win_process_prio) == 1 then 'selected="selected"' else ""#-->>$T('win_process_prio-idle')</option>
                        </select>
-                        <span class="desc">$T('explain-win_process_prio')</span>
+                        <span class="desc">$T('readwiki')</span>
                    </div>
                    <!--#end if#-->
                    <div class="field-pair advanced-settings">
                        <label class="config" for="par_option">$T('opt-par_option')</label>
                        <input type="text" name="par_option" id="par_option" value="$par_option" />
-                        <span class="desc">$T('explain-par_option')</span>
+                        <span class="desc">$T('readwiki')</span>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
@@ -232,11 +242,6 @@
                        <input type="checkbox" name="script_can_fail" id="script_can_fail" value="1" <!--#if int($script_can_fail) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-script_can_fail')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="new_nzb_on_failure">$T('opt-new_nzb_on_failure')</label>
-                        <input type="checkbox" name="new_nzb_on_failure" id="new_nzb_on_failure" value="1" <!--#if int($new_nzb_on_failure) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-new_nzb_on_failure')</span>
-                    </div>
                    <div class="field-pair">
                        <label class="config" for="ignore_samples">$T('opt-ignore_samples')</label>
                        <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
@@ -247,27 +252,23 @@
                        <input type="checkbox" name="deobfuscate_final_filenames" id="deobfuscate_final_filenames" value="1" <!--#if int($deobfuscate_final_filenames) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-deobfuscate_final_filenames') $T('explain-deobfuscate_final_filenames-ext')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
-                        <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-enable_meta').replace('. ', '.<br/>')</span>
-                    </div>
                    <div class="field-pair">
                        <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
                        <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list"/>
                        <span class="desc">$T('explain-cleanup_list')</span>
                    </div>
                    <div class="field-pair">
-                        <label class="config" for="history_retention_select">$T('opt-history_retention')</label>
-                        <input type="hidden" name="history_retention" id="history_retention" value="$history_retention">
-                        <select name="history_retention_select" id="history_retention_select">
-                            <option value="0">$T('history_retention-all')</option>
-                            <option value="n">$T('history_retention-number')</option>
-                            <option value="d">$T('history_retention-days')</option>
-                            <option value="-1">$T('history_retention-none')</option>
+                        <label class="config" for="history_retention_option">$T('opt-history_retention')</label>
+                        <select name="history_retention_option" id="history_retention_option">
+                            <option value="all" <!--#if $history_retention_option == "all" then 'selected="selected"' else ""#-->>$T('history_retention-all')</option>
+                            <option value="number-archive" <!--#if $history_retention_option == "number-archive" then 'selected="selected"' else ""#-->>$T('history_retention-number-archive')</option>
+                            <option value="number-delete" <!--#if $history_retention_option == "number-delete" then 'selected="selected"' else ""#-->>$T('history_retention-number-delete')</option>
+                            <option value="days-archive" <!--#if $history_retention_option == "days-archive" then 'selected="selected"' else ""#-->>$T('history_retention-days-archive')</option>
+                            <option value="days-delete" <!--#if $history_retention_option == "days-delete" then 'selected="selected"' else ""#-->>$T('history_retention-days-delete')</option>
+                            <option value="all-archive" <!--#if $history_retention_option == "all-archive" then 'selected="selected"' else ""#-->>$T('history_retention-archive')</option>
+                            <option value="all-delete" <!--#if $history_retention_option == "all-delete" then 'selected="selected"' else ""#-->>$T('history_retention-none')</option>
                        </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
-                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
                    </div>
                    <div class="field-pair">
                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -278,7 +279,7 @@
        </div><!-- /section -->
        <div class="section advanced-settings">
            <div class="col2">
-                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-naming') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -292,12 +293,17 @@
                        <input type="checkbox" name="replace_spaces" id="replace_spaces" value="1" <!--#if int($replace_spaces) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-replace_spaces')</span>
                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="replace_underscores">$T('opt-replace_underscores')</label>
+                        <input type="checkbox" name="replace_underscores" id="replace_underscores" value="1" <!--#if int($replace_underscores) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-replace_underscores')</span>
+                    </div>
                    <div class="field-pair">
                        <label class="config" for="replace_dots">$T('opt-replace_dots')</label>
                        <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-replace_dots')</span>
                    </div>
-                    <!--#if not $nt#-->
+                    <!--#if not $windows#-->
                    <div class="field-pair">
                        <label class="config" for="sanitize_safe">$T('opt-sanitize_safe')</label>
                        <input type="checkbox" name="sanitize_safe" id="sanitize_safe" value="1" <!--#if int($sanitize_safe) > 0 then 'checked="checked"' else ""#--> />
@@ -313,7 +319,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-quota') <a href="$helpuri$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-quota') <a href="$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -348,199 +354,33 @@
                </fieldset>
            </div><!-- /col1 -->
        </div><!-- /section -->
-        <div class="section">
-            <div class="col2">
-                <h3>$T('swtag-indexing') <a href="$helpuri$help_uri#toc6" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="rating_enable">$T('opt-rating_enable')</label>
-                        <input type="checkbox" name="rating_enable" id="rating_enable" value="1" <!--#if int($rating_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_enable').replace('. ', '.<br/>')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_api_key">$T('opt-rating_api_key')</label>
-                        <input type="text" name="rating_api_key" id="rating_api_key" value="$rating_api_key" />
-                        <span class="desc">$T('explain-rating_api_key')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_filter_enable">$T('opt-rating_filter_enable')</label>
-                        <input type="checkbox" name="rating_filter_enable" id="rating_filter_enable" value="1" <!--#if int($rating_filter_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_filter_enable')</span>
-                    </div>
-                    <div class="field-pair" id="rating_filter_abort">
-                        <label class="config">$T('opt-rating_filter_abort_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_abort_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_abort_video" id="rating_filter_abort_video">
-                                    <option value="0" <!--#if $rating_filter_abort_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_abort_audio" id="rating_filter_abort_audio">
-                                    <option value="0" <!--#if $rating_filter_abort_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted" name="rating_filter_abort_encrypted" <!--#if int($rating_filter_abort_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted_confirm" name="rating_filter_abort_encrypted_confirm" <!--#if int($rating_filter_abort_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam" name="rating_filter_abort_spam" <!--#if int($rating_filter_abort_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam_confirm" name="rating_filter_abort_spam_confirm" <!--#if int($rating_filter_abort_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_abort_downvoted" name="rating_filter_abort_downvoted" <!--#if int($rating_filter_abort_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_abort_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_abort_keywords" id="rating_filter_abort_keywords" value="$rating_filter_abort_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair" id="rating_filter_pause">
-                        <label class="config">$T('opt-rating_filter_pause_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_pause_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_pause_video" id="rating_filter_pause_video">
-                                    <option value="0" <!--#if $rating_filter_pause_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_pause_audio" id="rating_filter_pause_audio">
-                                    <option value="0" <!--#if $rating_filter_pause_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess') </option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted" name="rating_filter_pause_encrypted" <!--#if int($rating_filter_pause_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted_confirm" name="rating_filter_pause_encrypted_confirm" <!--#if int($rating_filter_pause_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam" name="rating_filter_pause_spam" <!--#if int($rating_filter_pause_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam_confirm" name="rating_filter_pause_spam_confirm" <!--#if int($rating_filter_pause_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_pause_downvoted" name="rating_filter_pause_downvoted" <!--#if int($rating_filter_pause_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_pause_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_pause_keywords" id="rating_filter_pause_keywords" value="$rating_filter_pause_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
    </form>
 </div><!-- /colmask -->

 <script type="text/javascript">
-\$(document).ready(function() {
-    if (!\$('#rating_filter_enable').is(":checked")) {
-        \$("#rating_filter_abort").hide();
-        \$("#rating_filter_pause").hide();
-    }
-    \$('#rating_filter_enable').change(function () {
-        if (\$(this).is(":checked")) {
-            \$("#rating_filter_abort").show();
-            \$("#rating_filter_pause").show();
-        }
-        else {
-            \$("#rating_filter_abort").hide();
-            \$("#rating_filter_pause").hide();
-        }
-    });
-
-    \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
+jQuery(document).ready(function() {
+    jQuery('#history_retention_option').on('change', updateHistoryRetention)
    function updateHistoryRetention() {
-        var retention_setting = \$('#history_retention')
-        var retention_select = \$('#history_retention_select').val()
-        var retention_number = \$('#history_retention_number')
-        // Keep all or keep none
-        if(retention_select == "0" || retention_select == "-1") {
+        var retention_option = jQuery('#history_retention_option').val()
+        var retention_number = jQuery('#history_retention_number')
+
+        if(retention_option === "number-archive" || retention_option === "number-delete") {
+            retention_number.show()
+            retention_number.attr('placeholder', '$T('history_retention-limit')')
+        } else if(retention_option === "days-archive" || retention_option === "days-delete") {
+            retention_number.show()
+            retention_number.attr('placeholder', '$T('days').capitalize()')
+        } else {
            retention_number.hide()
            retention_number.val('')
            retention_number.attr('placeholder', '')
-            retention_setting.val(retention_select)
-        } else {
-            retention_number.show()
-            // Days or number?
-            if(retention_select.indexOf("d") !== -1) {
-                retention_number.attr('placeholder', '$T('days').capitalize()')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val() + 'd')
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            } else {
-                retention_number.attr('placeholder', '$T('history_retention-limit')')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val())
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            }
        }
    }
-    // Set the history-retention settig
-    var retention_setting_value = \$('#history_retention').val()
-    if(parseInt(retention_setting_value) > 0) {
-        // Days or number?
-        if(retention_setting_value.indexOf("d") !== -1) {
-            \$('#history_retention_select').val("d")
-        } else {
-            \$('#history_retention_select').val("n")
-        }
-        \$('#history_retention_number').val(parseInt(retention_setting_value))
-    } else {
-        // Keep all or keep none
-        \$('#history_retention_select').val(retention_setting_value)
-        \$('#history_retention_number').hide()
-    }
+    updateHistoryRetention()

-    \$('.restoreDefaults').click(function(e) {
+    jQuery('.restoreDefaults').click(function(e) {
        // Get section name
-        var sectionName = \$(this).parents('.section').find('.col2 h3').text().trim()
+        var sectionName = jQuery(this).parents('.section').find('.col2 h3').text().trim()

        // Confirm?
        if(!confirm("$T('explain-restoreDefaults') \""+sectionName+"\"\n$T('confirm')")) return false
@@ -548,14 +388,14 @@

        // Need to get all the input values, so same way as saving normally
        var key_container = {}
-        \$(this).parents('.section').extractFormDataTo(key_container);
+        jQuery(this).parents('.section').extractFormDataTo(key_container);
        key_container = Object.keys(key_container)

        // Send request
-        \$.ajax({
-            type: "GET",
-            url: "../../api",
-            data: "mode=set_config_default&apikey=${apikey}&output=json&keyword=" + key_container.join('&keyword=')
+        jQuery.ajax({
+            type: "POST",
+            url: "$url('api')",
+            data: "mode=set_config_default&output=json&keyword=" + key_container.join('&keyword=')
        }).then(function(data) {
            // Reload page
            document.location = document.location
@@ -1,4 +1,5 @@
-<html lang="$active_lang">
+<!DOCTYPE HTML>
+<html lang="$active_lang" data-color-scheme="$color_scheme">
 <head>
    <title>SABnzbd - $T('login')</title>

@@ -6,57 +7,56 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
    <meta name="apple-mobile-web-app-title" content="SABnzbd" />

-    <link rel="apple-touch-icon" sizes="76x76" href="../staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="../staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="../staticcfg/ico/android-192x192.png" />
-    <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
+    <link rel="apple-touch-icon" sizes="76x76" href="$url('staticcfg/ico/apple-touch-icon-76x76-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="120x120" href="$url('staticcfg/ico/apple-touch-icon-120x120-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="152x152" href="$url('staticcfg/ico/apple-touch-icon-152x152-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="180x180" href="$url('staticcfg/ico/apple-touch-icon-180x180-precomposed.png', v=$cache_buster)" />
+    <link rel="apple-touch-icon" sizes="192x192" href="$url('staticcfg/ico/android-192x192.png', v=$cache_buster)" />
+    <link rel="shortcut icon" href="$url('staticcfg/ico/favicon.ico', v=$cache_buster)" />

-    <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
-    <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?v=$version" />
+    <link rel="stylesheet" type="text/css" href="$url('staticcfg/bootstrap/css/bootstrap.min.css', v=$cache_buster)" />
+    <link rel="stylesheet" type="text/css" href="$url('staticcfg/css/login.css', v=$cache_buster)" />

-    <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
-    <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
+    <script type="text/javascript" src="$url('staticcfg/js/jquery-3.7.1.min.js', v=$cache_buster)"></script>
+    <script type="text/javascript" src="$url('staticcfg/bootstrap/js/bootstrap.min.js', v=$cache_buster)"></script>
 </head>
-<html>
    <body>
        <div class="account-wall">
            <div class="text-center logo-header">
                <!--#include $webdir + "/staticcfg/images/logo-full.svg"#-->
-                <a href="https://sabnzbd.org/wiki/faq#why-login" target="_blank">
-                    <span class="glyphicon glyphicon-question-sign"></span>
+                <a href="https://sabnzbd.org/wiki/faq#why-login" target="_blank" aria-label="$T('menu-help')">
+                    <span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span>
                </a>
            </div>
-            <form class="form-signin" action="./" method="post">
+            <form class="form-signin" action="./login" method="post">
                <!--#if $error#-->
                <div class="alert alert-danger" role="alert">$error</div>
                <!--#end if#-->

-                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" required autofocus>
-                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" required>
+                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" aria-label="$T('srv-username')" autocomplete="username" required autofocus>
+                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" aria-label="$T('srv-password')" autocomplete="current-password" required>

                <button class="btn btn-default"><span class="glyphicon glyphicon-circle-arrow-right"></span> $T('login') </button>

-                <div class="checkbox text-center" data-toggle="tooltip" data-placement="bottom" title="$T('explain-sessionExpire')">
+                <div class="text-center" data-toggle="tooltip" data-placement="bottom" title="$T('explain-sessionExpire')">
                    <label>
-                        <input type="checkbox" name="remember_me" value="1"> $T('rememberme')
+                        $T('rememberme') <input type="checkbox" name="remember_me" value="1">
                    </label>
                  </div>
            </form>
        </div>
        <script type="text/javascript">
            // Tooltip
-            \$('[data-toggle="tooltip"]').tooltip()
+            jQuery('[data-toggle="tooltip"]').tooltip()
            // Try-catch in case somebody disabled localstorage
            try {
                // Set what was done previously
-                \$('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
+                jQuery('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
                // Store if we change something
-                \$('input[type="checkbox"]').on('change', function() {
-                    localStorage.setItem("remember_me", \$(this).is(':checked'));
+                jQuery('input[type="checkbox"]').on('change', function() {
+                    localStorage.setItem("remember_me", jQuery(this).is(':checked'));
                })
            } catch(err) { }
        </script>
    </body>
- </html>
+</html>
@@ -1,15 +1,32 @@
+:root {
+    /* Follow the OS by default (Auto); forced by data-color-scheme below */
+    color-scheme: light dark;
+
+    /* Color palette — light-dark(light value, dark value) */
+    --clr-page-bg:    light-dark(#E4E4E4, black);
+    --clr-surface:    light-dark(#FFFFFF, #303030);
+    --clr-input-bg:   light-dark(#FFFFFF, #555555);
+    --clr-border:     light-dark(rgba(0, 0, 0, 0.15), #555555);
+    --clr-text:       light-dark(#000000, #EBEBEB);
+    --clr-text-muted: light-dark(#636363, #c7c7c7);
+    --radius-lg:      8px;
+    --clr-toggle-active:   #f9ca33;
+    --clr-toggle-inactive: light-dark(#aaaaaa, #666666);
+}
+
+/* The server renders the configured scheme into this attribute; empty/unknown = Auto */
+html[data-color-scheme="light" i] {
+    color-scheme: light;
+}
+
+html[data-color-scheme="night" i] {
+    color-scheme: dark;
+}
+
 body {
    overflow-y: scroll;
-    background-color: #E4E4E4;
-}
-
-* {
-    border-radius: 0 !important;
-}
-
-.btn, .btn:hover, .btn:active, .btn:focus {
-    box-shadow: 1px 1px 1px rgba(0,0,0,.1) !important;
-    background-color: white !important;
+    background-color: var(--clr-page-bg);
+    color: var(--clr-text);
 }

 .logo-header {
@@ -22,38 +39,55 @@ body {
 }

 .account-wall {
-    width: 300px;
+    width: 400px;
    position: absolute;
    top: 30%;
    left: 50%;
-      transform: translate(-50%, -30%);
+    transform: translate(-50%, -30%);
+    background-color: var(--clr-surface);
+    border: 1px solid var(--clr-border);
+    border-radius: var(--radius-lg);
+    padding: 25px 40px 15px;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
 }

 .text-center a {
    position: absolute;
    right: 13px;
    top: 12px;
-    color: #636363;
+    color: var(--clr-text-muted);
    font-size: 1.2em
 }

 .text-center a:hover {
-    color: black !important;
+    color: var(--clr-text);
 }

 .form-signin .alert {
    margin: 5px 0px;
 }

-
 .form-signin input {
    margin-top: 5px
 }

+.form-signin input,
+.form-signin .btn {
+    background-color: var(--clr-input-bg);
+    color: var(--clr-text);
+    border-color: light-dark(#ccc, #252525);
+}
+
 .form-signin .btn {
    width: 100%;
    margin-top: 10px;
    font-weight: bold;
+    box-shadow: 1px 1px 1px light-dark(transparent, rgba(255, 255, 255, .1));
+}
+
+::placeholder {
+    color: var(--clr-text) !important;
+    opacity: 0.5;
 }

 .btn .glyphicon {
@@ -63,12 +97,109 @@ body {
    font-size: 1.2em;
 }

-input[type="checkbox"] {
-    width: 16px;
-    height: 16px;
-    margin-top: 2px;
+/* Toggle switch — text on the left, switch on the right */
+label {
+    margin-top: 10px;
+    color: var(--clr-text-muted);
 }

-label {
-    color: #636363;
-}
+input[type="checkbox"] {
+    appearance: none;
+    -webkit-appearance: none;
+    position: relative;
+    top: 5px;
+    left: 5px;
+    width: 36px;
+    height: 20px;
+    background-color: var(--clr-toggle-inactive);
+    background-image:
+        radial-gradient(circle at 10px 10px, #ffffff 6.5px, rgba(255,255,255,0) 7px),
+        radial-gradient(circle at 11px 11px, rgba(0,0,0,0.30) 6.5px, transparent 9.5px);
+    background-size: 20px 20px;
+    background-repeat: no-repeat;
+    background-position: 0px center;
+    border-radius: 10px;
+    border: none;
+    cursor: pointer;
+    transition: background-color 0.2s, background-position 0.15s;
+}
+
+input[type="checkbox"]:checked {
+    background-color: var(--clr-toggle-active);
+    background-position: 16px center;
+    background-image:
+        radial-gradient(circle at 10px 10px, #ffffff 6.5px, rgba(255,255,255,0) 7px),
+        radial-gradient(circle at 10.5px 10.5px, rgba(0,0,0,0.30) 6.5px, transparent 9.5px);
+}
+
+input[type="checkbox"]:focus-visible {
+    outline: 2px solid var(--clr-toggle-active);
+    outline-offset: 2px;
+    border-radius: 10px;
+}
+
+/***
+    Dark-mode structural rules
+    Colors live in the light-dark() tokens above; these are the rules that cannot
+    be expressed as a color value. The two blocks below MUST stay identical:
+    the first applies when Night is forced, the second when the OS is dark and Light is not forced.
+***/
+html[data-color-scheme="night" i] {
+    /* Focus / active border */
+    .form-signin input:focus,
+    .form-signin .btn:focus {
+        border-color: #707070 !important;
+        outline: initial !important;
+        box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+    }
+
+    .text-center a,
+    .text-center a:hover {
+        color: var(--clr-text);
+    }
+
+    /* Tooltip — inverted (light tooltip on dark page) */
+    .tooltip-inner {
+        background-color: #E4E4E4 !important;
+        color: #000 !important;
+    }
+
+    .tooltip.bottom .tooltip-arrow {
+        border-bottom-color: #E4E4E4 !important;
+    }
+
+    .tooltip.top .tooltip-arrow {
+        border-top-color: #E4E4E4 !important;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not([data-color-scheme="light" i]) {
+        /* Focus / active border */
+        .form-signin input:focus,
+        .form-signin .btn:focus {
+            border-color: #707070 !important;
+            outline: initial !important;
+            box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+        }
+
+        .text-center a,
+        .text-center a:hover {
+            color: var(--clr-text);
+        }
+
+        /* Tooltip — inverted (light tooltip on dark page) */
+        .tooltip-inner {
+            background-color: #E4E4E4 !important;
+            color: #000 !important;
+        }
+
+        .tooltip.bottom .tooltip-arrow {
+            border-bottom-color: #E4E4E4 !important;
+        }
+
+        .tooltip.top .tooltip-arrow {
+            border-top-color: #E4E4E4 !important;
+        }
+    }
+}
@@ -60,6 +60,7 @@
        // Initialize
        this.element = $(element);
        this.initialDir = null;
+        this.showFiles = false;
        this.currentBrowserPath = null;
        this.currentRequest = null;
        this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -99,6 +100,11 @@
            this.initialDir = this.element.data('initialdir') + folderSeperator + this.element.val();
        }

+        // Are we selecting files or folders
+        if(this.element.data('files')) {
+            this.showFiles = true
+        }
+
        // Browse
        this.browse(this.initialDir , folderBrowseUrl);

@@ -109,13 +115,13 @@
                // Remove start
                self.currentBrowserPath = self.currentBrowserPath.replace(self.element.data('initialdir')+folderSeperator, '');
                // If it's identical to the initial dir the replacement won't work
-                if(self.currentBrowserPath == self.element.data('initialdir')) {
+                if(self.currentBrowserPath === self.element.data('initialdir')) {
                    self.currentBrowserPath = '';
                }
            }

            // Changed?
-            if(self.element.val() != self.currentBrowserPath) {
+            if(self.element.val() !== self.currentBrowserPath) {
                self.element.val(self.currentBrowserPath);
                formHasChanged = true;
            }
@@ -144,12 +150,20 @@
        // Still loading
        if (this.currentRequest) this.currentRequest.abort();

-        // Show hidden folders on Linux?
-        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';
+        // Show hidden folders
+        var params = { name: path}
+        if($('#show_hidden_folders').is(':checked')) {
+            params['show_hidden_folders'] = "1"
+        }
+
+        // Show files?
+        if(this.showFiles) {
+            params['show_files'] = "1"
+        }

        // Get current folders
        this.currentBrowserPath = path;
-        this.currentRequest = $.getJSON(endpoint + extraHidden, { name: path }, function (data) {
+        this.currentRequest = $.getJSON(endpoint, params, function (data) {
            // Clean
            self.fileBrowserDialog.empty();

@@ -157,17 +171,27 @@
            var list = $('<div class="list-group">').appendTo(self.fileBrowserDialog);
            $.each(data.paths, function (i, entry) {
                // Title for first one
-                if(i == 0) {
+                if(i === 0) {
                    self.fileBrowserDialog.prepend($('<h4>').text(entry.current_path))
                    return
                }
                // Regular link
                link = $('<a class="list-group-item" href="javascript:void(0)" />').click(function () {
-                    self.browse(entry.path, endpoint); }
-                ).text(entry.name);
+                    // Are we looking for files and did we select a file?
+                    if(self.showFiles && !entry.dir) {
+                        // Trigger selection
+                        self.currentBrowserPath = entry.path
+                        $('#filebrowser_modal_accept').click()
+                    } else {
+                        self.browse(entry.path, endpoint);
+                    }
+                }).text(entry.name);
+
                // Back image
-                if(entry.name == '..') {
+                if(entry.name === '..') {
                    $('<span class="glyphicon glyphicon-arrow-left"></span> ').prependTo(link);
+                } else if(!entry.dir) {
+                    $('<span class="glyphicon glyphicon-file"></span> ').prependTo(link);
                } else {
                    $('<span class="glyphicon glyphicon-folder-open"></span> ').prependTo(link);
                }
@@ -203,7 +227,12 @@ $.fn.extractFormDataTo = function(target) {
    var selects = $("select", this);

    selects.each(function (i,elem) {
-        target[elem.name] = elem.value;
+        if (elem.selectedOptions.length > 1) {
+            // Handle <select multiple="multiple">
+            target[elem.name] = Array.from(elem.selectedOptions).map(({ value }) => value).toString();
+        } else {
+            target[elem.name] = elem.value;
+        }
    });

    return this;
@@ -214,8 +243,13 @@ $.fn.extractFormDataTo = function(target) {
 *
 * (c) 2015 SABnzbd Team, Inc. All rights reserved.
 */
+
+$.ajaxSetup({
+    headers: { "X-SABnzbd-CSRF": csrfToken }
+});
+
 function config_success() {
-    $('.saveButton').each(function () {
+    $('.saveButton[disabled=disabled]').each(function () {
        $(this).removeAttr("disabled").html('<span class="glyphicon glyphicon-ok"></span> '+configTranslate.saveChanges);
    });
    // Let us leave!
@@ -223,7 +257,7 @@ function config_success() {
    formHasChanged = false;
 }
 function config_failure() {
-    $('.saveButton').each(function () {
+    $('.saveButton[disabled=disabled]').each(function () {
        $(this).removeAttr("disabled").addClass('btn-danger').html('<span class="glyphicon glyphicon-remove"></span> '+configTranslate.failed);
    });
    // Can't go yet..
@@ -233,8 +267,9 @@ function do_restart() {
    // Show overlay
    $('.main-restarting').show()

-    // What template
-    var switchedHTTPS = ($('#enable_https').is(':checked') == ($('#enable_https').data('original') === undefined))
+    // Check if we need redirect
+    // Uses == on purpose, because val() returns string and data() returns int!
+    var switchedHTTPS = ($('#enable_https').is(':checked') === ($('#enable_https').data('original') === undefined))
    var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))

    // Are we on settings page or did nothing change?
@@ -243,7 +278,7 @@ function do_restart() {
        var urlTotal = window.location.origin + urlBase
    } else {
        // Protocol and port depend on http(s) setting
-        if($('#enable_https').is(':checked') && (window.location.protocol == 'https:' || !$('#https_port').val())) {
+        if($('#enable_https').is(':checked') && (window.location.protocol === 'https:' || !$('#https_port').val())) {
            // Https on and we visited this page from HTTPS
            var urlProtocol = 'https:';
            var urlPort = $('#https_port').val() ? $('#https_port').val() : $('#port').val();
@@ -261,7 +296,7 @@ function do_restart() {
    $('.main-restarting .restarting-url').text(urlTotal)

    // Initiate restart
-    $.ajax({ url: '../../api?mode=restart&apikey=' + sabSession,
+    $.ajax({ url: rootURL + 'api?mode=restart', type: 'POST',
        complete: function() {
            // Keep counter of failures
            var loopCounter = 0;
@@ -292,7 +327,7 @@ function do_restart() {

            // Exception if we go from HTTPS to HTTP
            // (this is not allowed by browsers and all of the above will be ignored)
-            if(window.location.protocol != urlProtocol) {
+            if(window.location.protocol !== urlProtocol) {
                // Saftey redirect after 20 sec
                setTimeout(function() {
                    location.href = urlTotal;
@@ -302,7 +337,7 @@ function do_restart() {
    });
 }

-// Remove obfusication
+// Remove obfuscation
 function removeObfuscation() {
    $('input[data-hide]').each(function(index, objInput) {
        $(objInput).attr('name', $(objInput).data('hide'))
@@ -310,15 +345,39 @@ function removeObfuscation() {
    return true
 }

-// Add coloring to rows (shorthand function)
-function addRowColor() {
-    // Have to do it seperate for each section
-    $('.section').each(function(i, elmn) {
-        $(elmn).find('.field-pair:visible').removeClass('even').filter(':even').addClass('even')
-    })
-}
+// Set default functions for the autocomplete everywhere
+jQuery.extend(jQuery.fn.typeahead.defaults, {
+    source: function (query, process) {
+        // If there's no separator, it must be a relative path
+        if(query.split(folderSeperator).length < 2 && this.$element.data('initialdir')) {
+            query  = this.$element.data('initialdir') + folderSeperator + query;
+        }
+        var params = { compact: "1", name: query }
+        if($('#show_hidden_folders').is(':checked')) {
+            params['show_hidden_folders'] = "1"
+        }
+        if(this.$element.data('files')) {
+            params['show_files'] = "1"
+        }
+        // Get info from the API
+        return jQuery.get(folderBrowseUrl, params, function (data) {
+            return process(data["paths"]);
+        });
+    },
+    updater: function(item) {
+        // Is it a relative path?
+        if(item.indexOf(this.$element.data('initialdir')) === 0) {
+            // Remove start
+            return item.replace(this.$element.data('initialdir') + folderSeperator, '');
+        }
+        // Full path
+        return item
+    }
+})

 $(document).ready(function () {
+    $('form').append('<input type="hidden" name="csrf_token" value="' + csrfToken + '">');
+
    /**
        Restart function
    **/
@@ -345,12 +404,13 @@ $(document).ready(function () {
        datatype: 'json',
        // But first remove Obfuscation!
        beforeSerialize: removeObfuscation,
-        beforeSubmit: function () {
-            $('.saveButton').each(function () {
+        beforeSubmit: function (arr, form, options) {
+            // Only in the current form
+            form.find('.saveButton').each(function () {
                $(this).attr("disabled", "disabled").removeClass('btn-danger').html('<span class="glyphicon glyphicon-transfer"></span> ' + configTranslate.saving);
            });
        },
-        success: function (json) {
+        success: function (json, statusText, xhr, form) {
            if (json.error) {
               $('#config_err_msg').text(json.error);
               alert(json.error)
@@ -364,6 +424,12 @@ $(document).ready(function () {
                    $('#config_err_msg').text(" ");
                    setTimeout(config_success, 1000);
                }
+            } else if(form && form.is('[data-reload-on-save]')) {
+                // Values changed that are rendered by the server, so reload the page
+                $('#config_err_msg').text(" ");
+                formWasSubmitted = true;
+                formHasChanged = false;
+                location.reload();
            } else {
               $('#config_err_msg').text(" ");
               setTimeout(config_success, 1000);
@@ -407,7 +473,7 @@ $(document).ready(function () {
    $('input[type="checkbox"]').parents('label').addClass('config-hover')

    // Disable sections
-    var checkDisabled = '#rating_enable, #enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
+    var checkDisabled = '#enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'

    $(checkDisabled).on('change', function() {
        $(this).parent().nextAll().toggleClass('disabled')
@@ -421,14 +487,16 @@ $(document).ready(function () {
    $('.advanced-button').on('change', function(event){
        localStorage.setItem('advanced-settings', !$('.advanced-settings').is(':visible'))
        $('.advanced-settings').toggle()
-        addRowColor()
    })
-    if(localStorage.getItem('advanced-settings') == 'true') {
+    if(localStorage.getItem('advanced-settings') === 'true') {
        $('.advanced-settings').show()
        $('#advanced-settings-button').prop('checked', true)
-        addRowColor()
    }
-    addRowColor()
+
+    // Add tooltips
+    // Render tooltips in the body, otherwise they get clipped by sections with overflow: hidden
+    jQuery.fn.tooltip.Constructor.DEFAULTS.container = 'body'
+    jQuery('[title]').tooltip()
 });

 /*
@@ -448,16 +516,56 @@ var pagesContainer = new Array(arrPages.length);
 // Add trigger to focus on the field and load the results
 $(document).ready(function() {
    $('#search-menu').on('shown.bs.dropdown', function(event) {
+        setConfigSearchExpanded(true)
        // Focus so easy typing
        $('#search-box').focus()
        // Load things to search if we haven't yet
        if(!pagesContainer[0]) {
            $.each(arrPages, function(index, page) {
-                $.get(rootURL + 'config/' + page + '/', function(data) {
+                $.get(rootURL + 'config/' + page, function(data) {
                    pagesContainer[index] = $(data).find('label')
                });
            });
        }
+    }).on('hidden.bs.dropdown', function(event) {
+        setConfigSearchExpanded(false)
+    });
+
+    $('#search-box').on('keydown', function(event) {
+        var key = event.key || event.which;
+        var isArrowDown = key === 'ArrowDown' || key === 40;
+        var isArrowUp = key === 'ArrowUp' || key === 38;
+        var isEscape = key === 'Escape' || key === 'Esc' || key === 27;
+
+        if(isArrowDown || isArrowUp) {
+            event.preventDefault();
+            event.stopPropagation();
+            focusConfigSearchResult(isArrowDown ? 1 : -1)
+        } else if(isEscape) {
+            event.preventDefault();
+            event.stopPropagation();
+            closeConfigSearch()
+        }
+    });
+
+    $('#search-dropdown').on('keydown', 'a.config-search-result', function(event) {
+        var key = event.key || event.which;
+        var isArrowDown = key === 'ArrowDown' || key === 40;
+        var isArrowUp = key === 'ArrowUp' || key === 38;
+        var isEscape = key === 'Escape' || key === 'Esc' || key === 27;
+
+        if(isArrowDown || isArrowUp) {
+            event.preventDefault();
+            event.stopPropagation();
+            focusConfigSearchResult(isArrowDown ? 1 : -1)
+        } else if(isEscape) {
+            event.preventDefault();
+            event.stopPropagation();
+            closeConfigSearch()
+        }
+    }).on('mouseenter focus', 'a.config-search-result', function() {
+        getConfigSearchResults().parent().removeClass('active')
+        $(this).parent().addClass('active')
    });

    // For the scrolling
@@ -483,11 +591,46 @@ $(document).ready(function() {

 // Don't go too fast
 var searchTimeout
+
+function getConfigSearchResults() {
+    return $('#search-dropdown').find('a.config-search-result')
+}
+
+function setConfigSearchExpanded(expanded) {
+    $('#search-menu > a[data-toggle="dropdown"]').attr('aria-expanded', expanded ? 'true' : 'false')
+}
+
+function closeConfigSearch() {
+    $('#search-menu').removeClass('open')
+    setConfigSearchExpanded(false)
+    $('#search-box').focus()
+}
+
+function focusConfigSearchResult(offset) {
+    var $results = getConfigSearchResults()
+    var activeIndex = $results.index(document.activeElement)
+    var nextIndex
+
+    if(!$results.length) return
+
+    if(activeIndex < 0) {
+        nextIndex = offset > 0 ? 0 : $results.length - 1
+    } else {
+        nextIndex = activeIndex + offset
+        if(nextIndex >= $results.length) nextIndex = 0
+        if(nextIndex < 0) nextIndex = $results.length - 1
+    }
+
+    getConfigSearchResults().parent().removeClass('active')
+    $results.eq(nextIndex).parent().addClass('active')
+    $results.eq(nextIndex).focus()
+}
+
 function doConfigSearch(value) {
    // Cancel previous
    clearTimeout(searchTimeout)
    // Build new search
-    var searchTerm = $(value).val().replace('"', '\"')
+    var searchTerm = $.trim($(value).val())
    var searchOutput = $('#search-dropdown')

    // Build new search
@@ -498,14 +641,24 @@ function doConfigSearch(value) {
        if (searchTerm.length < 2) return
        // Find some results!
        $.each(pagesContainer, function(page_index, results) {
+            if(!results) return
            // Get the matches
-            var subResults = results.filter(':contains("'+searchTerm+'")')
+            var subResults = results.filter(function() {
+                return $(this).text().toUpperCase().indexOf(searchTerm.toUpperCase()) >= 0
+            })
            if(subResults.length > 0) {
                // Add the section
-                searchOutput.append('<li class="divider"></li>')
-                searchOutput.append('<li class="dropdown-header">'+configTranslate.searchPages[page_index]+'</li>')
+                searchOutput.append($('<li class="divider"></li>'))
+                searchOutput.append($('<li class="dropdown-header"></li>').text(configTranslate.searchPages[page_index]))
                $.each(subResults, function(index, result) {
-                    searchOutput.append('<li><a href="'+rootURL + 'config/' + arrPages[page_index] +  '/#' + $(result).attr('for') +'">'+$(result).text()+'</a></li>')
+                    var resultUrl = rootURL + 'config/' + arrPages[page_index] +  '#' + $(result).attr('for')
+                    searchOutput.append(
+                        $('<li></li>').append(
+                            $('<a class="config-search-result"></a>')
+                                .attr('href', resultUrl)
+                                .text($(result).text())
+                        )
+                    )
                })
            }
        })
@@ -9,7 +9,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE B

 1. Definitions

-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("syncing") will be considered an Adaptation for the purpose of this License.
   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
   3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
   4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
@@ -44,7 +44,7 @@ The above rights may be exercised in all media and formats whether now known or

 5. Representations, Warranties and Disclaimer

-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.

 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

@@ -1,25 +1,39 @@
-<div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
-    <h2>$T('menu-history')</h2>
-    <table class="table table-hover history-table paginated">
+<div class="history" id="history-tab">
+    <div class="history-header">
+        <h2>$T('menu-history') <small data-bind="visible: history.showArchive()">($T('archive'))</small></h2>
+        <a href="#" aria-label="$T('Glitter-multiOperations')" data-bind="click: history.showMultiEdit, visible: hasHistory()">
+            <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
+        </a>
+    </div>
+    <table class="table table-hover history-table paginated" aria-label="$T('menu-history')">
        <thead>
            <tr>
-                <th style="width: 25px;"></th>
-                <th></th>
-                <th class="table-status-header" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumns().length }"></th>
+                <th scope="col" style="width: 25px;"><span class="sr-only">$T('Glitter-result')</span></th>
+                <th scope="col"><span class="sr-only">$T('name')</span></th>
+                <th class="table-status-header" scope="col" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumns().length || displayCompact() }"><span class="sr-only">$T('status')</span></th>
                <!-- ko foreach: extraHistoryColumns -->
-                <th class="table-header-extra"></th>
+                <th class="table-header-extra" scope="col"><span class="sr-only" data-bind="text: glitterTranslate.column[\$data]"></span></th>
                <!-- /ko -->
-                <th style="width: 130px;"></th>
-                <th style="width: 60px;"></th>
+                <th scope="col" style="width: 130px;"><span class="sr-only">$T('post-Completed')</span></th>
+                <th scope="col" style="width: 60px;"><span class="sr-only">$T('Glitter-actions')</span></th>
            </tr>
        </thead>
-        <tbody data-bind="foreach: history.historyItems">
+        <!-- ko if: !hasHistory() -->
+        <tbody class="no-downloads">
+            <tr>
+                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraHistoryColumns().length }">
+                    <span>$T('empty')</span>
+                </td>
+            </tr>
+        </tbody>
+        <!-- /ko -->
+        <tbody data-bind="foreach: history.historyItems, visible: hasHistory()" style="display: none;">
            <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                <td>
-                    <div data-bind="visible: processingWaiting()">
-                        <span class="glyphicon glyphicon-time"></span>
+                    <div role="img" aria-label="$T('post-Queued')" data-bind="visible: processingWaiting()">
+                        <span class="glyphicon glyphicon-time" aria-hidden="true"></span>
                    </div>
-                    <div data-bind="visible: processingDownload()">
+                    <div role="img" aria-label="$T('stage-download')" data-bind="visible: processingDownload()">
                        <div class="processing-download">
                            <div class="loader-bar-one"></div>
                            <div class="loader-bar-two"></div>
@@ -27,116 +41,25 @@
                            <div class="loader-bar-four"></div>
                        </div>
                    </div>
-                    <div data-bind="visible: (!failed() && !processingDownload() && !processingWaiting())">
-                        <span class="glyphicon glyphicon-ok"></span>
+                    <div role="img" aria-label="$T('post-Completed')" data-bind="visible: (!failed() && !processingDownload() && !processingWaiting())">
+                        <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
                    </div>
                    <div data-bind="visible: failed() && canRetry()">
-                        <a class="retry-button" href="#" data-bind="click: retry">
-                            <span class="glyphicon glyphicon-exclamation-sign"></span>
+                        <a class="retry-button" href="#" aria-label="$T('button-retry')" data-bind="click: retry">
+                            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
                        </a>
                    </div>
                    <div data-bind="visible: failed() && !canRetry()">
-                        <span class="retry-button-inactive">
-                            <span class="glyphicon glyphicon-exclamation-sign"></span>
+                        <span class="retry-button-inactive" role="img" aria-label="$T('post-Failed')">
+                            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
                        </span>
                    </div>
                </td>
-                <td class="name" data-bind="css: { 'name-has-ratings' : historyStatus.has_rating }">
+                <td class="name">
                    <div class="row-wrap-text">
                        <a class="retry-buttontext" href="#" data-bind="visible: (failed() && canRetry()), click: retry">$T('button-retry')</a>
                        <span data-bind="text: historyStatus.name, attr: { 'title': historyStatus.name() }"></span>
                    </div>
-
-                    <!-- ko if: historyStatus.has_rating -->
-                    <div class="dropdown history-ratings">
-                        <a href="#" class="name-icons hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
-                            <span class="glyphicon glyphicon-thumbs-up"></span> <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                            <span class="glyphicon glyphicon-thumbs-down"></span> <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                        </a>
-                        <ul class="dropdown-menu history-ratings-menu">
-                            <li>
-                                <form class="history-ratings-basic">
-                                    <label>
-                                        <input type="radio" value="up" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 1 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-up"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                                    </label>
-                                    <label>
-                                        <input type="radio" value="down" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 2 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-down"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-facetime-video"></span>
-                                        <select name="ratings-video" data-bind="value: historyStatus.rating_user_video, event: { change: setUserRating }, disable: historyStatus.rating_user_video">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-volume-up"></span>
-                                        <select name="ratings-audio" data-bind="value: historyStatus.rating_user_audio, event: { change: setUserRating }, disable: historyStatus.rating_user_audio">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <!-- ko if: historyStatus.url_info -->
-                                    <a href="#" target="_blank" data-bind="attr: { 'href':historyStatus.url_info }" title="$T('Glitter-openInfoURL')"><span class="glyphicon glyphicon-globe"></span></a>
-                                    <!-- /ko -->
-                                </form>
-                            </li>
-                            <li class="divider"></li>
-                            <li>
-                                <form class="history-ratings-report" data-bind="submit: setUserReport">
-                                    <strong>$T('report')</strong>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="spam" /> $T('spam')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="encrypted" /> $T('encrypted')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="expired" /> $T('expired')
-                                        <select name="ratings-report-expired-server" class="ratings-report-hidden form-control" data-bind="options: \$parent.servers, optionsText: 'host', optionsValue: 'host', optionsCaption: '$T('nzo-all')'"></select>
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="other" /> $T('otherProblem')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-other" />
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="comment" /> $T('comment')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-comment" />
-                                    </label>
-                                    <br />
-                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('send')</button>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <!-- /ko -->
                </td>
                <td class="status row-wrap-text" data-bind="text: statusText()" onclick="showDetails(this)"></td>
                <!-- ko foreach: parent.parent.extraHistoryColumns -->
@@ -146,8 +69,11 @@
                <!-- /ko -->
                <td class="history-completedon row-wrap-text" data-bind="text: completedOn(), attr: { 'data-timestamp': completed }" onclick="showDetails(this)"></td>
                <td class="delete">
-                    <div class="dropdown">
-                        <a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
+                    <label data-bind="visible: parent.isMultiEditing()">
+                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" aria-label="$T('Glitter-selectJob')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
+                    </label>
+                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
+                        <a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="$T('nzoDetails')" data-bind="click: updateAllHistoryInfo">
                            <span class="caret"></span>
                        </a>
                        <!-- ko if: hasDropdown() -->
@@ -157,13 +83,19 @@
                                    <div class="col-sm-2">$T('name')</div>
                                    <div class="col-sm-10" data-bind="text: historyStatus.name"></div>
                                </div>
+                                <div class="row" data-bind="visible: historyStatus.time_added">
+                                    <div class="col-sm-2">$T('rss-added')</div>
+                                    <div class="col-sm-10" data-bind="text: timeAdded(), attr: { 'data-timestamp': historyStatus.time_added }"></div>
+                                </div>
                                <div class="row">
                                    <div class="col-sm-2">$T('post-Completed')</div>
                                    <div class="col-sm-10" data-bind="text: completedOn, attr: { 'data-timestamp': completed }"></div>
                                </div>
                                <div class="row">
                                    <div class="col-sm-2">$T('status')</div>
-                                    <div class="col-sm-10" data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></div>
+                                    <div class="col-sm-10">
+                                        <span data-bind="text: glitterTranslate.status[historyStatus.status()] ? glitterTranslate.status[historyStatus.status()] : statusText()"></span>
+                                    </div>
                                </div>
                                <div class="row">
                                    <div class="col-sm-2">$T('size')</div>
@@ -177,7 +109,7 @@
                                    <div class="col-sm-2">$T('srv-password')</div>
                                    <div class="col-sm-10" data-bind="text: historyStatus.password"></div>
                                </div>
-                                <div class="row">
+                                <div class="row" data-bind="visible: historyStatus.storage() || historyStatus.path()">
                                    <div class="col-sm-2">$T('msg-path')</div>
                                    <div class="col-sm-10" data-bind="text: historyStatus.storage() == '' ? historyStatus.path : historyStatus.storage"></div>
                                </div>
@@ -187,11 +119,14 @@
                                    <div class="col-sm-10 history-status-modallink" data-bind="longText: actions, longTextType: name()"></div>
                                </div>
                                <!-- /ko -->
+                                <div class="col-sm-12 text-right" data-bind="visible: failed()">
+                                    <a href="#" class="btn btn-default mark-completed-btn" data-bind="click: markAsCompleted"><span class="glyphicon glyphicon-ok"></span> $T('button-mark-completed')</a>
+                                </div>
                            </div>
                        </div>
                        <!-- /ko -->
                    </div>
-                    <a href="#" data-bind="click: deleteSlot">
+                    <a href="#" data-bind="click: parent.triggerRemoveDownload, attr: { 'aria-label': processingDownload() == 2 ? '$T('abort')' : '$T('nzo-delete')' }">
                        <span class="hover-button glyphicon glyphicon-trash" data-bind="css: { 'glyphicon-stop' : processingDownload() == 2, disabled : processingDownload() == 1 }, attr: { title: processingDownload() == 2 ? '$T('abort')' : '$T('nzo-delete')' }"></span>
                    </a>
                </td>
@@ -199,23 +134,45 @@
        </tbody>
    </table>

+    <div class="history-footer">
+
    <div class="input-group search-box">
-        <input type="text" class="form-control" placeholder="$T('Glitter-search')" required data-bind="textInput: history.searchTerm, event: { keydown: history.clearSearchTerm }" />
-        <a data-bind="event: { mousedown: history.clearSearchTerm }">
+        <input type="text" class="form-control" placeholder="$T('Glitter-search')" aria-label="$T('Glitter-search')" required data-bind="textInput: history.searchTerm, event: { keydown: history.clearSearchTerm }" />
+        <a href="#" data-tooltip="true" data-html="true" data-placement="right" title="$T('Glitter-searchExplain')" data-bind="click: history.clearSearchTerm, attr: { 'aria-label': history.searchTerm() ? '$T('Glitter-clearSearch')' : '$T('Glitter-search')' }">
            <span class="glyphicon" data-bind="css: { 'glyphicon-search' : !history.searchTerm(), 'glyphicon-remove' : history.searchTerm() }"></span>
        </a>
    </div>

    <ul class="pagination" data-bind="foreach: history.pagination.allpages(), visible: history.pagination.hasPagination" style="display: none;">
-        <li data-bind="css: { active: isCurrent, disabled: isDots }, click: onclick">
-            <span data-bind="text: page"></span>
+        <li data-bind="css: { active: isCurrent, disabled: isDots }">
+            <!-- ko ifnot: isDots -->
+            <a href="#" data-bind="text: page, click: onclick, attr: { 'aria-current': isCurrent ? 'page' : null }"></a>
+            <!-- /ko -->
+            <!-- ko if: isDots -->
+            <span aria-hidden="true" data-bind="text: page"></span>
+            <!-- /ko -->
        </li>
    </ul>

    <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
-        <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-toggle="modal" data-tooltip="true" data-placement="left"><span class="glyphicon glyphicon-trash"></span></a>
+        <a href="#" class="hover-button history-archive" title="$T('showArchive') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowArchive, css: { 'history-options-show-failed': history.showArchive }"><svg viewBox="6 6 36 36" height="14" width="14" class="archive-icon"><path d="M41.09 10.45l-2.77-3.36c-.56-.66-1.39-1.09-2.32-1.09h-24c-.93 0-1.76.43-2.31 1.09l-2.77 3.36c-.58.7-.92 1.58-.92 2.55v25c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-25c0-.97-.34-1.85-.91-2.55zm-17.09 24.55l-11-11h7v-4h8v4h7l-11 11zm-13.75-25l1.63-2h24l1.87 2h-27.5z"/></svg></a>
+        <a href="#" class="hover-button" title="$T('showFailedHis') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
+        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="top" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
+        <a href="#" class="hover-button" title="$T('button-mark-completed')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiMarkCompleted" data-tooltip="true" data-placement="top"><span class="glyphicon glyphicon-ok"></span></a>
+
+        <div data-bind="visible: (history.isMultiEditing() && hasHistory())">
+            <span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>
+            <label for="multiedit-checkall-history">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-history" title="$T('Glitter-checkAll')" data-bind="click: history.checkAllJobs" data-tooltip="true" data-placement="top" />
+            </label>
+        </div>
+
+        <a href="#" class="hover-button" title="$T('nzo-delete')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiDelete"  data-tooltip="true" data-placement="top">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
+        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !(history.isMultiEditing() && hasHistory())" data-toggle="modal" data-tooltip="true" data-placement="top">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
    </div>

    <div class="info-container history-info">
@@ -224,10 +181,6 @@
        <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
        <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
    </div>
+
+    </div><!-- /.history-footer -->
 </div>
-<div class="info-container history-info" data-bind="visible: !hasHistory() && !displayTabbed()" style="display: none">
-    <span class="glyphicon glyphicon-save"></span>
-    <span data-bind="text: history.downloadedToday"></span>B $T('Glitter-today')
-    <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
-    <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
-</div>
@@ -1,19 +1,19 @@
 <nav class="navbar navbar-inverse main-navbar">
    <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-label="$T('Glitter-toggleNavigation')" aria-controls="navbar-collapse" aria-expanded="false">
            <span class="icon-bar"></span>
            <span class="icon-bar"></span>
            <span class="icon-bar"></span>
        </button>
-        <a class="navbar-logo" href="./">
+        <a class="navbar-logo" href="$url()" aria-label="SABnzbd $T('menu-queue')">
            #include $webdir + "/../../Config/templates/staticcfg/images/logo-small.svg"#
        </a>
        <div class="btn-group">
            <div class="btn-group">
-                <button type="button" class="btn btn-default navbar-btn" data-bind="click: pauseToggle, attr: { 'title': downloadsPaused() ? '$T('link-resume')' : '$T('link-pause')' }">
+                <button type="button" class="btn btn-default navbar-btn" data-bind="click: pauseToggle, attr: { 'title': downloadsPaused() ? '$T('link-resume')' : '$T('link-pause')', 'aria-label': downloadsPaused() ? '$T('link-resume')' : '$T('link-pause')' }">
                    <span class="glyphicon" data-bind="css: { 'glyphicon-play' : downloadsPaused(), 'glyphicon-pause' : !downloadsPaused() }"></span>
                </button>
-                <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown">
+                <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" aria-label="$T('pauseFor')" aria-haspopup="true" aria-expanded="false">
                    <span class="caret"></span>
                </button>
                <ul class="dropdown-menu">
@@ -26,7 +26,7 @@
                    <li class="divider"></li>
                    <li><a href="#" data-bind="click: openCustomPauseTime">$T('Glitter-custom')</a></li>
                </ul>
-                <span class="btn btn-default navbar-btn navbar-timeleft" data-bind="text: timeLeft"  data-toggle="dropdown">0:00</span>
+                <span class="btn btn-default navbar-btn navbar-timeleft" data-bind="text: timeLeft" data-toggle="dropdown">0:00</span>
            </div>
        </div>
    </div>
@@ -37,18 +37,18 @@
            <li class="speedlimit-dropdown dropdown">
                <div class="btn-group">
                    <div class="btn-group">
-                        <button type="button" class="btn btn-default navbar-btn navbar-speed" data-toggle="dropdown">
+                        <button type="button" class="btn btn-default navbar-btn navbar-speed" data-toggle="dropdown" aria-haspopup="true">
                            <span data-bind="text: speedText">0 KB/s</span>
                        </button>
-                        <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" onclick="keepOpen(this)">
+                        <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" onclick="keepOpen(this)" aria-hidden="true" tabindex="-1">
                            <span class="caret"></span>
                        </button>
-                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() != 100)" style="display: none;">
+                        <a href="#" class="max-speed-input-clear hover-button" aria-label="$T('button-clear')" data-bind="click: clearSpeedLimit, visible:(speedLimit() < 100 && speedLimit() > 0)" style="display: none;">
                            <span class="glyphicon glyphicon-link"></span>
                        </a>
                        <div class="dropdown-menu max-speed-input">
                            <div data-bind="visible: !bandwithLimit()">
-                                <a href="./config/general/#bandwidth_max_value">
+                                <a href="$url('config/general#bandwidth_max_value')">
                                    <span class="glyphicon glyphicon-cog"></span> $T('Glitter-setMaxLinespeed')
                                </a>
                            </div>
@@ -61,14 +61,14 @@
                </div>
            </li>
            <li data-tooltip="true" data-placement="bottom" title="$T('Glitter-addNZB')">
-                <a href="#modal-add-nzb" data-toggle="modal"><span class="glyphicon glyphicon-plus-sign"></span></a>
+                <a href="#modal-add-nzb" data-toggle="modal" aria-label="$T('Glitter-addNZB')"><span class="glyphicon glyphicon-plus-sign"></span></a>
            </li>
            <li data-tooltip="true" data-placement="bottom" title="$T('Glitter-statusInterfaceOptions')" data-bind="click: loadStatusInfo">
-                <a href="#modal-options" data-toggle="modal"><span class="glyphicon glyphicon-wrench"></span></a>
+                <a href="#modal-options" data-toggle="modal" aria-label="$T('Glitter-statusInterfaceOptions')"><span class="glyphicon glyphicon-wrench"></span></a>
            </li>
            <!--#if $have_rss_defined#-->
            <li data-tooltip="true" data-placement="bottom" title="$T('cmenu-rss')">
-                <a href="./config/rss/">
+                <a href="$url('config/rss')" aria-label="$T('cmenu-rss')">
                    <svg class="rss-icon-svg" viewBox="0 0 8 8">
                        <rect class="rss-button" width="8" height="8" />
                        <circle class="rss-symbol" cx="2" cy="6" r="1" />
@@ -79,10 +79,10 @@
            </li>
            <!--#end if#-->
            <li data-tooltip="true" data-placement="bottom" title="SABnzbd $T('menu-config')">
-                <a href="./config/"><span class="glyphicon glyphicon-cog"></span></a>
+                <a href="$url('config')" aria-label="SABnzbd $T('menu-config')"><span class="glyphicon glyphicon-cog"></span></a>
            </li>
-            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': onQueueFinish()}">
-                <a href="#" data-toggle="dropdown"  onclick="keepOpen(this)">
+            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': finishaction()}">
+                <a href="#" data-toggle="dropdown"  onclick="keepOpen(this)" aria-label="$T('Glitter-mainMenu')" aria-haspopup="true" aria-expanded="false">
                    <span class="icon-bar"></span>
                    <span class="icon-bar"></span>
                    <span class="icon-bar"></span>
@@ -91,38 +91,43 @@
                    <li><a href="#modal-help" data-toggle="modal"><span class="glyphicon glyphicon-question-sign"></span> $T('menu-help')</a></li>
                    <li><a href="https://sabnzbd.org/donate" target="_blank"><span class="glyphicon glyphicon-heart"></span> $T('menu-donate')</a></li>
                    <!--#if $have_logout or $have_quota or $have_rss_defined or $have_watched_dir or $pp_pause_event#--><li class="divider"></li><!--#end if#-->
-                    <!--#if $have_logout#--><li><a href="./login/?logout=1"><span class="glyphicon glyphicon-log-out"></span> $T('logout')</a></li><!--#end if#-->
+                    <!--#if $have_logout#--><li>
+                        <form method="post" action="$url('logout')">
+                            <input type="hidden" name="csrf_token" value="$csrf_token" />
+                            <button type="submit"><span class="glyphicon glyphicon-log-out"></span> $T('logout')</button>
+                        </form>
+                    </li><!--#end if#-->
                    <!--#if $have_quota#--><li><a href="#" data-bind="click: doQueueAction" data-mode="reset_quota">$T('link-resetQuota')</a></li><!--#end if#-->
                    <!--#if $have_rss_defined#--><li><a href="#" data-bind="click: doQueueAction" data-mode="rss_now">$T('button-rssNow')</a></li><!--#end if#-->
                    <!--#if $have_watched_dir#--><li><a href="#" data-bind="click: doQueueAction" data-mode="watched_now">$T('sch-scan_folder')</a></li><!--#end if#-->
                    <!--#if $pp_pause_event#--><li><a href="#" data-bind="click: doQueueAction" data-mode="resume_pp">$T('sch-resume_post')</a></li><!--#end if#-->
                    <li class="divider"></li>
-                    <li><a href="./shutdown/?apikey=$apikey&amp;pid=$pid" data-bind="click: shutdownSAB">$T('shutdownSab')</a></li>
-                    <li><a href="#" data-bind="click: restartSAB">$T('Glitter-restartSab')</a></li>
+                    <li>
+                        <form method="post" action="$url('shutdown')" data-bind="submit: shutdownSAB">
+                            <input type="hidden" name="csrf_token" value="$csrf_token" />
+                            <button type="submit">$T('shutdownSab')</button>
+                        </form>
+                    </li>
+                    <li>
+                        <form data-bind="submit: restartSAB">
+                            <button type="submit">$T('Glitter-restartSab')</button>
+                        </form>
+                    </li>
                    <li class="divider"></li>
                    <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                    <li>
-                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
+                        <select data-bind="value: finishaction, event: { change: setOnQueueFinish }" class="form-control" aria-label="$T('Glitter-onFinish')">
                            <option value=""></option>
-                            <optgroup label="$T('eoq-actions')">
-                                <option value="shutdown_program">$T('shutdownSab')</option>
-                                <!--#if $power_options#-->
-                                <option value="shutdown_pc">$T('shutdownPc')</option>
-                                <option value="standby_pc">$T('standbyPc')</option>
-                                <option value="hibernate_pc">$T('hibernatePc')</option>
-                                <!--#end if#-->
-                            </optgroup>
-                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
-                                <!-- ko foreach: queue.scriptsList -->
-                                    <!-- ko if: \$data != glitterTranslate.noneText -->
-                                        <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
-                                    <!-- /ko -->
-                                <!-- /ko -->
-                            </optgroup>
+                            <option value="shutdown_program">$T('shutdownSab')</option>
+                            <!--#if $power_options#-->
+                            <option value="shutdown_pc">$T('shutdownPc')</option>
+                            <option value="standby_pc">$T('standbyPc')</option>
+                            <option value="hibernate_pc">$T('hibernatePc')</option>
+                            <!--#end if#-->
                        </select>
                    </li>
                </ul>
            </li>
        </ul>
    </div>
-</nav>
+</nav>
@@ -1,8 +1,8 @@
 <div id="queue-messages" class="queue-messages" data-bind="visible: hasMessages() || displayTabbed()" style="display: none;">
-    <table class="table table-hover table-messages">
+    <table class="table table-hover table-messages" aria-label="$T('warnings')">
        <thead>
            <tr>
-                <th class="table-messages-header-label"></th>
+                <th class="table-messages-header-label"><span class="sr-only">$T('warnings')</span></th>
                <th style="width: 30px;"></th>
            </tr>
        </thead>
@@ -11,7 +11,7 @@
                <tr>
                    <td class="table-messages-hide"></td>
                    <td data-bind="attr: { 'rowspan': parseInt(nrWarnings())+1 }, click: clearWarnings" class="table-messages-remove">
-                        <a href="#" class="hover-button"><span class="glyphicon glyphicon-remove"></span></a>
+                        <a href="#" class="hover-button" aria-label="$T('button-clear')"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a>
                    </td>
                </tr>
                <!-- ko foreach: allWarnings -->
@@ -32,7 +32,7 @@
                    </td>
                    <!-- ko if: \$data.hasOwnProperty("clear") -->
                    <td class="table-messages-remove">
-                        <a href="#" data-bind="click: clear"  class="hover-button"><span class="glyphicon glyphicon-remove"></span></a>
+                        <a href="#" data-bind="click: clear" class="hover-button" aria-label="$T('button-clear')"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a>
                    </td>
                    <!-- /ko -->
                </tr>
@@ -45,4 +45,4 @@
            <!-- /ko -->
        </tbody>
    </table>
-</div>
+</div>
@@ -1,13 +1,17 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
 <!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
-<!-- Notifcation box -->
+<!-- Notification box -->
 <div class="main-notification-box" style="display: none">
    <div class="main-notification-box-uploading">
        <span class="glyphicon glyphicon-open"></span> $T('Glitter-notification-uploading') <span class="main-notification-box-file-count"></span>
    </div>

+    <div class="main-notification-box-uploading-failed">
+        <span class="glyphicon glyphicon-exclamation-sign"></span> $T('Glitter-notification-upload-failed').replace('%s', '') <span class="main-notification-box-file-count"></span>
+    </div>
+
    <div class="main-notification-box-queue-repair">
-        <span class="glyphicon glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
+        <span class="glyphicon glyphicon-wrench"></span> $T('Glitter-repairQueue')
    </div>

    <div class="main-notification-box-disconnect">
@@ -68,13 +72,13 @@
 </div>

 <!-- Modals -->
-<div id="modal-options" class="modal fade" tabindex="-1">
+<div id="modal-options" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-options-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
                <a href="#" data-bind="click: loadStatusInfo, css: { 'rotate-refresh': !hasStatusInfo() }" title="$T('Glitter-interfaceRefresh')"><span class="glyphicon glyphicon-repeat"></span></a>
-                <h4 class="modal-title">$T('Glitter-statusInterfaceOptions')</h4>
+                <h4 class="modal-title" id="modal-options-title">$T('Glitter-statusInterfaceOptions')</h4>
            </div>
            <div class="modal-body">
                <ul class="nav nav-tabs">
@@ -85,6 +89,11 @@
                </ul>
                <div class="tab-content">
                    <div class="tab-pane fade in active" id="options-status">
+                        <div class="row" data-bind="visible: statusInfo.active_socks5_proxy">
+                            <div class="col-sm-6">$T('opt-socks5_proxy_url') &nbsp </div>
+                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.active_socks5_proxy"></div>
+                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+                        </div>
                        <div class="row">
                            <div class="col-sm-6">$T('dashboard-localIP4') &nbsp; </div>
                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.localipv4() ? '$T('dashboard-connectionError')' : statusInfo.localipv4(), css: { 'options-bad-status' : !statusInfo.localipv4() }"></div>
@@ -102,7 +111,7 @@
                        </div>
                        <div class="row">
                            <div class="col-sm-6">$T('dashboard-NameserverDNS') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : statusInfo.dnslookup(), css: { 'options-bad-status' : (statusInfo.dnslookup() != 'OK') }"></div>
+                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : 'OK', css: { 'options-bad-status' : !statusInfo.dnslookup() }"></div>
                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                        </div>
                        <hr/>
@@ -112,30 +121,43 @@
                                <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                            </div>
                        </div>
+                        <div class="row" data-bind="visible: statusInfo.loadavg()">
+                            <div class="col-sm-6">$T('dashboard-loadavg') &nbsp; </div>
+                            <div class="col-sm-6">
+                                <span data-bind="text: statusInfo.loadavg"></span>
+                            </div>
+                        </div>
+                        <div class="row" data-bind="visible: statusInfo.delayed_assembler() > 5">
+                            <div class="col-sm-6">$T('dashboard-delayed') &nbsp; </div>
+                            <div class="col-sm-6">
+                                <span data-bind="visible: statusInfo.delayed_assembler() > 5">$T('dashboard-delayed-disk')</span>
+                                <small data-bind="visible: statusInfo.delayed_assembler() > 5">(<span data-bind="text: statusInfo.delayed_assembler"></span>x)</small>
+                            </div>
+                        </div>
                        <div class="row">
                            <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                <span data-bind="text: statusInfo.pystone"></span>
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small data-bind="truncatedText: statusInfo.cpumodel, length: 25, attr: { 'data-original-title': statusInfo.cpumodel }" data-tooltip="true"></small>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small title="$cpumodel $cpusimd" data-tooltip="true">$cpumodel $cpusimd</small>
                            </div>
                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                        </div>
                        <div class="row">
                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.downloaddir, length: 24, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></span>)</small>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small data-bind="text: statusInfo.downloaddir, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></small>
                            </div>
                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                        </div>
                        <div class="row">
                            <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.completedir, length: 24, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></span>)</small>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small data-bind="text: statusInfo.completedir, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></small>
                            </div>
                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                        </div>
@@ -143,18 +165,23 @@
                            <div class="col-sm-6">$T('dashboard-internetBandwidth') &nbsp; </div>
                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
-                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps)</small>
+                                <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small><span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps</small>
                            </div>
                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                        </div>
+                        <div class="row">
+                            <div class="col-sm-6">$T('platform') &nbsp; </div>
+                            <div class="col-sm-6">
+                                $platform
+                            </div>
+                        </div>
                        <div class="row test-download">
                            <div class="col-sm-6">$T('dashboard-testDownload') &nbsp; </div>
                            <div class="col-sm-6">
                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1 GB</a>
                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="10GB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 10 GB</a>
-
                            </div>
                        </div>
                        <hr />
@@ -170,14 +197,17 @@
                        </div>
                        <div class="row options-function-box">
                            <div class="col-sm-6">
-                                <a href="./api?mode=showlog&apikey=$apikey" target="_blank" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('Glitter-logText')">
-                                    <span class="glyphicon glyphicon-file"></span> $T('link-showLog')
-                                </a>
+                                <form method="post" action="$url('log')" target="_blank">
+                                    <input type="hidden" name="csrf_token" value="$csrf_token" />
+                                    <button type="submit" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('Glitter-logText')">
+                                        <span class="glyphicon glyphicon-file"></span> $T('link-showLog')
+                                    </button>
+                                </form>
                            </div>
                            <div class="col-sm-6">
                                <div class="input-group" data-tooltip="true" data-placement="top" title="$T('logging')">
                                    <span class="input-group-addon"><span class="glyphicon glyphicon-comment"></span></span>
-                                    <select class="form-control" data-bind="value: statusInfo.loglevel">
+                                    <select class="form-control" data-bind="value: loglevel">
                                        <option value="0">$T('log-errWarn')</option>
                                        <option value="1">$T('log-info')</option>
                                        <option value="2">$T('log-debug')</option>
@@ -208,15 +238,20 @@
                                </div>
                                <div class="row" data-bind="visible: serverssl">
                                    <div class="col-sm-6">$T('srv-ssl')</div>
-                                    <div class="col-sm-6">
-                                        <span class="glyphicon glyphicon-ok"></span> <span data-bind="text: serversslinfo"></span>
+                                    <div class="col-sm-6 col-dot-overflow">
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                        <span data-bind="text: serversslinfo"></span>
                                    </div>
                                </div>
                                <div class="row">
                                    <div class="col-sm-6"># $T('connections')</div>
                                    <div class="col-sm-6">
                                        <span data-bind="text: serverconnections().length"></span> /
-                                        <span data-bind="text: servertotalconn"></span>
+                                        <span data-bind="text: servertotalconn"></span><br>
+                                        <!-- ko if: serveripaddress() -->
+                                        <span data-bind="text: servercanonname"></span><br>
+                                        <span data-bind="text: serveripaddress"></span>
+                                        <!-- /ko -->
                                    </div>
                                </div>
                                <div class="row">
@@ -232,17 +267,17 @@
                                        </div>
                                    </div>
                                </div>
-                                <div class="row" data-bind="visible: !isFinite(serveractiveconn())">
+                                <div class="row" data-bind="visible: serverwarning()">
                                    <div class="col-sm-12">
                                        <div class="alert alert-warning">
                                            <span class="glyphicon glyphicon-info-sign"></span>
-                                            <span data-bind="text: serveractiveconn()"></span>
+                                            <span data-bind="text: serverwarning()"></span>
                                        </div>
                                    </div>
                                </div>

                                <!-- ko if: serverconnections().length > 0 -->
-                                <table class="table table-hover table-server-connections" data-bind="visible: \$root.showActiveConnections()">
+                                <table class="table table-hover table-server-connections" aria-label="$T('connections')" data-bind="visible: \$root.showActiveConnections()">
                                    <thead>
                                        <tr>
                                            <th><strong>$T('article-id')</strong></th>
@@ -272,7 +307,7 @@
                        <a href="#" class="hover-button process-all-orphaned" data-bind="click: removeAllOrphaned">$T('Glitter-purgeOrphaned') <span class="glyphicon glyphicon-trash"></span></a>
                        <a href="#" class="hover-button process-all-orphaned" data-bind="click: addAllOrphaned">$T('Glitter-retryAllOrphaned') <span class="glyphicon glyphicon-plus-sign"></span></a>
                        <div class="clearfix"></div>
-                        <table class="table table-hover table-striped">
+                        <table class="table table-hover table-striped" aria-label="$T('Glitter-orphanedJobs')">
                            <thead>
                                <tr>
                                    <th style="width: 30px;"></th>
@@ -301,7 +336,7 @@
                                </label>
                            </div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">$T('Glitter-interfaceRefresh')</label>
+                                <label class="col-sm-6 control-label" for="refreshRate-option">$T('Glitter-interfaceRefresh')</label>
                                <div class="col-sm-4">
                                    <select id="refreshRate-option" class="form-control" data-bind="value: refreshRate">
                                        <option value="1">1 $T('second')</option>
@@ -319,9 +354,9 @@
                                </div>
                            </div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">$T('Glitter-queueItemLimit')</label>
+                                <label class="col-sm-6 control-label" for="queue-pagination-limit">$T('Glitter-queueItemLimit')</label>
                                <div class="col-sm-4">
-                                    <select name="queue-pagination-limit" class="form-control" data-bind="value: queue.paginationLimit">
+                                    <select name="queue-pagination-limit" id="queue-pagination-limit" class="form-control" data-bind="value: queue.paginationLimit">
                                        <option value="5">5 / $T('Glitter-page')</option>
                                        <option value="10">10 / $T('Glitter-page')</option>
                                        <option value="20">20 / $T('Glitter-page')</option>
@@ -334,9 +369,9 @@
                                </div>
                            </div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">$T('Glitter-historyItemLimit')</label>
+                                <label class="col-sm-6 control-label" for="history-pagination-limit">$T('Glitter-historyItemLimit')</label>
                                <div class="col-sm-4">
-                                    <select name="history-pagination-limit" class="form-control" data-bind="value: history.paginationLimit">
+                                    <select name="history-pagination-limit" id="history-pagination-limit" class="form-control" data-bind="value: history.paginationLimit">
                                        <option value="5">5 / $T('Glitter-page')</option>
                                        <option value="10">10 / $T('Glitter-page')</option>
                                        <option value="20">20 / $T('Glitter-page')</option>
@@ -348,11 +383,10 @@
                                    </select>
                                </div>
                            </div>
-                            <div class="options-switch"></div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">$T('Glitter-dateFormat')</label>
+                                <label class="col-sm-6 control-label" for="general-date-format">$T('Glitter-dateFormat')</label>
                                <div class="col-sm-4">
-                                    <select name="general-date-format" class="form-control" data-bind="value: dateFormat">
+                                    <select name="general-date-format" id="general-date-format" class="form-control" data-bind="value: dateFormat">
                                        <option value="DD/MM/YYYY HH:mm"></option>
                                        <option value="DD/MM/YYYY h:mma"></option>
                                        <option value="MM/DD/YYYY HH:mm"></option>
@@ -368,12 +402,12 @@
                                </div>
                            </div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="general-extra-queue-columns">
                                    $T('Glitter-showExtraQueueColumn')<br />
                                    <span class="label label-warning">&gt; 1200 pixels</span>
                                </label>
                                <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraQueueColumns" multiple="true">
+                                    <select name="general-extra-column" id="general-extra-queue-columns" class="form-control-multiselect form-control" data-bind="selectedOptions: extraQueueColumns" multiple="true">
                                        <option value="category">$T('category')</option>
                                        <option value="priority">$T('priority')</option>
                                        <option value="processing">$T('swtag-pp')</option>
@@ -383,12 +417,12 @@
                                </div>
                            </div>
                            <div class="form-group">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="general-extra-history-columns">
                                    $T('Glitter-showExtraHistoryColumn')<br />
                                    <span class="label label-warning">&gt; 1200 pixels</span>
                                </label>
                                <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraHistoryColumns" multiple="true">
+                                    <select name="general-extra-column" id="general-extra-history-columns" class="form-control-multiselect form-control" data-bind="selectedOptions: extraHistoryColumns" multiple="true">
                                        <option value="category">$T('category')</option>
                                        <option value="size">$T('size')</option>
                                        <option value="speed">$T('Glitter-speed')</option>
@@ -396,43 +430,53 @@
                                </div>
                            </div>
                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="displayCompact">
                                    $T("Glitter-displayCompact")
                                </label>
                                <div class="col-sm-4">
-                                    <input type="checkbox" name="displayCompact" value="true" data-bind="checked: displayCompact" />
+                                    <input type="checkbox" name="displayCompact" id="displayCompact" value="true" data-bind="checked: displayCompact" />
                                </div>
                            </div>
                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="displayFullWidth">
                                    $T("Glitter-displayFullWidth")
                                </label>
                                <div class="col-sm-4">
-                                    <input type="checkbox" name="displayFullWidth" value="true" data-bind="checked: displayFullWidth" />
+                                    <input type="checkbox" name="displayFullWidth" id="displayFullWidth" value="true" data-bind="checked: displayFullWidth" />
                                </div>
                            </div>
                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="displayTabbed">
                                    $T("Glitter-displayTabbed")
                                </label>
                                <div class="col-sm-4">
-                                    <input type="checkbox" name="displayTabbed" value="true" data-bind="checked: displayTabbed" />
+                                    <input type="checkbox" name="displayTabbed" id="displayTabbed" value="true" data-bind="checked: displayTabbed" />
                                </div>
                            </div>
                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="confirmDeleteQueue">
                                    $T("Glitter-confirmDeleteQueue")
                                </label>
                                <div class="col-sm-4">
-                                    <input type="checkbox" name="confirmDeleteQueue" value="true" data-bind="checked: confirmDeleteQueue" />
+                                    <input type="checkbox" name="confirmDeleteQueue" id="confirmDeleteQueue" value="true" data-bind="checked: confirmDeleteQueue" />
                                </div>
                            </div>
                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
+                                <label class="col-sm-6 control-label" for="confirmDeleteHistory">
                                    $T("Glitter-confirmDeleteHistory")
                                </label>
                                <div class="col-sm-4">
-                                    <input type="checkbox" name="confirmDeleteHistory" value="true" data-bind="checked: confirmDeleteHistory" />
+                                    <input type="checkbox" name="confirmDeleteHistory" id="confirmDeleteHistory" value="true" data-bind="checked: confirmDeleteHistory" />
+                                </div>
+                            </div>
+                            <div class="form-group form-checkbox">
+                                <label class="col-sm-6 control-label" for="keyboardShortcuts">
+                                    $T("Glitter-keyboardShortcuts")
+                                    <span class="glyphicon glyphicon-question-sign" data-tooltip="true" data-placement="top" data-html="true"
+                                        data-original-title="P: $T('link-pause')<br>A: $T('Glitter-addNZB')<br>S: $T('Glitter-statusInterfaceOptions')<br>C: $T('menu-config')<br>$T('Glitter-keyboardShortcuts-arrows')"></span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <input type="checkbox" name="keyboardShortcuts" id="keyboardShortcuts" value="true" data-bind="checked: keyboardShortcuts" />
                                </div>
                            </div>
                        </form>
@@ -444,12 +488,12 @@
    </div>
 </div>

-<div id="modal-add-nzb" class="modal fade" tabindex="-1">
+<div id="modal-add-nzb" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-add-nzb-title">
    <div class="modal-dialog">
        <form class="modal-content" data-bind="submit: addNZB">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Glitter-addNZB')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="modal-add-nzb-title">$T('Glitter-addNZB')</h4>
            </div>
            <div class="modal-body form-horizontal">
                <div class="row">
@@ -483,42 +527,50 @@
                <div class="clearfix"></div>
                <hr />
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('name')</label>
+                    <label class="col-sm-4 control-label" for="nzbname">$T('name')</label>
                    <div class="col-sm-6">
                        <input type="text" name="nzbname" id="nzbname" placeholder="$T('Glitter-addnzbFilename')" class="form-control" />
                    </div>
                </div>
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('srv-password')</label>
+                    <label class="col-sm-4 control-label" for="password">$T('srv-password')</label>
                    <div class="col-sm-6">
                        <input type="text" name="password" id="password" placeholder="$T('srv-optional')" class="form-control" />
                    </div>
                </div>
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('category')</label>
+                    <label class="col-sm-4 control-label" for="add-nzb-category">$T('category')</label>
                    <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
+                        <select name="Category" id="add-nzb-category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: ''"></select>
                        <span class="glyphicon glyphicon-tag"></span>
                    </div>
                </div>
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('priority')</label>
+                    <label class="col-sm-4 control-label" for="add-nzb-priority">$T('priority')</label>
                    <div class="col-sm-6">
-                        <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <!-- This list is different from the one during download! -->
+                        <select name="Priority" id="add-nzb-priority" class="form-control">
+                            <option value=""></option>
+                            <option value="2">$T('pr-force')</option>
+                            <option value="1">$T('pr-high')</option>
+                            <option value="0">$T('pr-normal')</option>
+                            <option value="-1">$T('pr-low')</option>
+                            <option value="-2" >$T('pr-paused')</option>
+                        </select>
                        <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
                    </div>
                </div>
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('swtag-pp')</label>
+                    <label class="col-sm-4 control-label" for="add-nzb-processing">$T('swtag-pp')</label>
                    <div class="col-sm-6">
-                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <select name="Processing" id="add-nzb-processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: ''"></select>
                        <span class="glyphicon glyphicon-check"></span>
                    </div>
                </div>
                <div class="form-group">
-                    <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
+                    <label class="col-sm-4 control-label" for="add-nzb-script">$T('eoq-scripts')</label>
                    <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" id="add-nzb-script" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
                        <span class="glyphicon glyphicon-flash"></span>
                    </div>
                </div>
@@ -528,12 +580,12 @@
    </div>
 </div>

-<div id="modal-item-files" class="modal fade" tabindex="-1">
+<div id="modal-item-files" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-item-files-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title row-wrap-text" data-bind="text: filelist.filelist_name">$T('Glitter-loading')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title row-wrap-text" id="modal-item-files-title" data-bind="text: filelist.filelist_name">$T('Glitter-loading')</h4>
            </div>
            <div class="modal-body">
                <div id="modal-item-filelist">
@@ -596,12 +648,65 @@
    </div>
 </div>

-<div id="modal-retry-job" class="modal modal-small fade" tabindex="-1">
+<div id="modal-delete-queue-job" class="modal modal-delete-job fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-delete-queue-job-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Glitter-retryJob')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title row-wrap-text" id="modal-delete-queue-job-title">$T('removeNZB-Files')</h4>
+            </div>
+            <form data-bind="submit: queue.removeDownloads">
+                <div class="modal-body">
+                    $T('confirm-delete')
+
+                    <ul data-bind="foreach: queue.deleteItems">
+                        <li data-bind="text: name"></li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
+                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<div id="modal-delete-history-job" class="modal modal-delete-job fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-delete-history-job-title">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title row-wrap-text" id="modal-delete-history-job-title">$T('nzo-delete')</h4>
+            </div>
+            <form data-bind="submit: history.removeDownloads">
+                <div class="modal-body">
+                    $T('confirm-delete')
+
+                    <ul data-bind="foreach: history.deleteItems">
+                        <li data-bind="text: historyStatus.name"></li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                     <div class="checkbox" data-bind="visible: !history.showArchive()">
+                        <label>
+                            <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
+                        </label>
+                    </div>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
+                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<div id="modal-retry-job" class="modal modal-small fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-retry-job-title">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="modal-retry-job-title">$T('Glitter-retryJob')</h4>
            </div>
            <form id="retry-job-form" data-bind="submit: history.retryJob">
                <div class="modal-body">
@@ -626,6 +731,9 @@
                            </div>
                        </div>
                    </fieldset>
+                    <fieldset>
+                        $T('Glitter-retryNoChecks')
+                    </fieldset>
                </div>
                <div class="modal-footer">
                    <button class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> $T('button-retry')</button>
@@ -635,24 +743,24 @@
    </div>
 </div>

-<div id="history-script-log" class="modal fade" tabindex="-1">
+<div id="history-script-log" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="history-script-log-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Glitter-scriptLog')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="history-script-log-title">$T('Glitter-scriptLog')</h4>
            </div>
-            <div class="modal-body"></div>
+            <div class="modal-body"><pre></pre></div>
        </div>
    </div>
 </div>

-<div id="modal-help" class="modal fade">
+<div id="modal-help" class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-help-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('menu-help')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="modal-help-title">$T('menu-help')</h4>
            </div>
            <div class="modal-body">
                #include $webdir + "/../../Config/templates/staticcfg/images/logo-full.svg"#
@@ -673,24 +781,24 @@
                            <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd/</a></td>
                        </tr>
                        <tr>
-                            <td><strong>$T('menu-irc'):</strong></td>
+                            <td><strong>$T('menu-live-chat'):</strong></td>
                            <td><a href="https://sabnzbd.org/live-chat" target="_blank">https://sabnzbd.org/live-chat</a></td>
                        </tr>
                    </tbody>
                </table>
                <hr/>
-                <p><small>Copyright (C) 2007-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
+                <p><small>Copyright &copy; 2007-2026 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)<br/>$T('yourRights') </small></p>
            </div>
        </div>
    </div>
 </div>

-<div id="modal-purge-history" class="modal modal-small fade" tabindex="-1">
+<div id="modal-purge-history" class="modal modal-small fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-purge-history-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Glitter-clearHistory')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="modal-purge-history-title">$T('Glitter-clearHistory')</h4>
            </div>
            <div class="modal-body">
                <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-failed"><span class="glyphicon glyphicon-floppy-remove"></span> $T('purgeFailed')</button>
@@ -698,16 +806,23 @@
                <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-completed"><span class="glyphicon glyphicon-floppy-saved"></span> $T('purgeCompl')</button><hr />
                <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-page"><span class="glyphicon glyphicon-check"></span> $T('purgePage') <span class="label label-default" data-bind="text: history.historyItems().length"></span></button>
            </div>
+            <div class="modal-footer">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" data-bind="checked: history.permanentlyDelete"> <span>$T('permanently-delete')</span>
+                    </label>
+                </div>
+            </div>
        </div>
    </div>
 </div>

-<div id="modal_custom_pause" class="modal modal-small fade" tabindex="-1">
+<div id="modal-custom-pause" class="modal modal-small fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="modal-custom-pause-title">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h4 class="modal-title">$T('Glitter-pauseFor')</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="$T('close')"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="modal-custom-pause-title">$T('Glitter-pauseFor')</h4>
            </div>
            <div class="modal-body">
                <form data-bind="submit: saveCustomPause">
@@ -9,22 +9,16 @@
            </a>
        </div>
        <!-- /ko -->
-        <!--#if $loadavg#-->
-        <div class="info-container-box" title="$T('ft-sysload') - $T('menu-config') &#10140; $T('cmenu-special') &#10140; show_sysload">
-            <span class="glyphicon glyphicon-record"></span>
-            <span data-bind="text: systemLoad"></span>
-        </div>
-        <!--#end if#-->
        <!-- ko if: (queueDataLeft() != '')  -->
        <div class="info-container-box">
            <span class="glyphicon glyphicon-save"></span>
            <span data-bind="text: queueDataLeft"></span> $T('Glitter-left')
        </div>
        <!-- /ko -->
-        <!-- ko if: (quotaLimit() != 0)  -->
+        <!-- ko if: (parseInt(quotaLimit()) != 0)  -->
        <div class="info-container-box">
            <span data-bind="css: { 'queue-error-info' : (parseInt(quotaLimitLeft())<=0) }">
-                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span>B / <span data-bind="text: quotaLimit"></span>B $T('quota-left')
+                <span class="glyphicon glyphicon-log-in"></span> <span data-bind="text: quotaLimitLeft"></span> / <span data-bind="text: quotaLimit"></span> $T('quota-left')
            </span>
        </div>
        <!-- /ko -->
@@ -52,6 +46,8 @@
                <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
            </a>
            <ul class="dropdown-menu">
+                <li><a href="#" data-action="sortRemainingAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortRemaining')</a></li>
+                <li><a href="#" data-action="sortRemainingBytesAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortRemainingBytesAsc')</a></li>
                <li><a href="#" data-action="sortAgeAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeAsc')</a></li>
                <li><a href="#" data-action="sortAgeDesc" data-bind="click: queue.queueSorting">$T('Glitter-sortAgeDesc')</a></li>
                <li><a href="#" data-action="sortNameAsc" data-bind="click: queue.queueSorting">$T('Glitter-sortNameAsc')</a></li>
@@ -62,17 +58,17 @@
        </div>
    </div>
    <div class="clearfix"></div>
-    <table class="table table-striped table-hover queue-table">
+    <table class="table table-striped table-hover queue-table" aria-label="$T('menu-queue')">
        <thead>
            <tr>
-                <th style="width: 25px;"></th>
-                <th></th>
+                <th scope="col" style="width: 25px;"><span class="sr-only">$T('status')</span></th>
+                <th scope="col"><span class="sr-only">$T('name')</span></th>
                <!-- ko foreach: extraQueueColumns -->
-                <th class="table-header-extra"></th>
+                <th class="table-header-extra" scope="col"><span class="sr-only" data-bind="text: glitterTranslate.column[\$data]"></span></th>
                <!-- /ko -->
-                <th class="table-header-progress" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumns().length }"></th>
-                <th style="width: 85px;"></th>
-                <th style="width: 60px;"></th>
+                <th class="table-header-progress" scope="col" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumns().length || displayCompact() }"><span class="sr-only">$T('Glitter-progress')</span></th>
+                <th scope="col" style="width: 85px;"><span class="sr-only">$T('status')</span></th>
+                <th scope="col" style="width: 60px;"><span class="sr-only">$T('Glitter-actions')</span></th>
            </tr>
        </thead>
        <!-- ko if: !hasQueue() -->
@@ -89,7 +85,7 @@
        <tbody data-bind="visible: hasQueue(), sortable: { data: queue.queueItems, afterMove: queue.move, options: { start: queue.dragStart, stop: queue.dragStop, axis: 'y', containment: '.queue', distance: 10 } }" style="display: none;">
            <tr class="queue-item">
                <td>
-                    <a href="#" data-bind="click: pauseToggle, attr: { 'title': pausedStatus() ? '$T('link-resume')' : '$T('link-pause')' }">
+                    <a href="#" data-bind="click: pauseToggle, attr: { 'title': pausedStatus() ? '$T('link-resume')' : '$T('link-pause')', 'aria-label': pausedStatus() ? '$T('link-resume')' : '$T('link-pause')' }">
                        <span class="hover-button glyphicon" data-bind="css: queueIcon"></span>
                    </a>
                </td>
@@ -107,27 +103,41 @@
                        <!-- /ko -->
                    </div>
                    <form data-bind="submit: editingNameSubmit">
-                        <input type="text" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
+                        <input type="text" aria-label="$T('Glitter-rename')" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
                    </form>
                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack() && !editingName()">
                        <span class="glyphicon glyphicon-compressed"></span> <span data-bind="text: direct_unpack"></span>
                    </div>
                    <div class="name-options" data-bind="visible: !editingName(), css: { disabled: isGrabbing() }">
-                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToTop" title="$T('Glitter-top')"><span class="glyphicon glyphicon-chevron-up"></span></a>
-                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToBottom" title="$T('Glitter-bottom')"><span class="glyphicon glyphicon-chevron-down"></span></a>
-                        <a href="#" data-bind="click: editName" class="hover-button" title="$T('Glitter-rename')"><span class="glyphicon glyphicon-pencil"></span></a>
-                        <a href="#" data-bind="click: showFiles" class="hover-button" title="$T('nzoDetails') - $T('srv-password')"><span class="glyphicon glyphicon-folder-open"></span></a>
+                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToTop" title="$T('Glitter-top')" aria-label="$T('Glitter-top')"><span class="glyphicon glyphicon-chevron-up"></span></a>
+                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToBottom" title="$T('Glitter-bottom')" aria-label="$T('Glitter-bottom')"><span class="glyphicon glyphicon-chevron-down"></span></a>
+                        <a href="#" data-bind="click: editName" class="hover-button" title="$T('Glitter-rename')" aria-label="$T('Glitter-rename')"><span class="glyphicon glyphicon-pencil"></span></a>
+                        <a href="#" data-bind="click: showFiles" class="hover-button" title="$T('nzoDetails') - $T('srv-password')" aria-label="$T('nzoDetails')"><span class="glyphicon glyphicon-folder-open"></span></a>
                        <small data-bind="text: avg_age"></small>
                    </div>
                </td>
                <!-- ko foreach: parent.parent.extraQueueColumns -->
                <td class="row-extra-text">
+                    <!-- ko if: \$data == 'category' -->
+                    <select class="form-control row-extra-select" data-bind="options: \$parent.parent.categoriesList, optionsValue: 'catValue', optionsText: 'catText', value: \$parent.category, valueAllowUnset: true, event: { change: \$parent.changeCat }"></select>
+                    <!-- /ko -->
+                    <!-- ko if: \$data == 'priority' && !\$parent.isFetchingBlocks -->
+                    <select class="form-control row-extra-select" data-bind="options: \$parent.parent.priorityOptions, optionsValue: 'value', optionsText: 'name', value: \$parent.priority, valueAllowUnset: true, event: { change: \$parent.changePriority }"></select>
+                    <!-- /ko -->
+                    <!-- ko if: \$data == 'processing' -->
+                    <select class="form-control row-extra-select" data-bind="options: \$parent.parent.processingOptions, optionsValue: 'value', optionsText: 'name', value: \$parent.unpackopts, valueAllowUnset: true, event: { change: \$parent.changeProcessing }"></select>
+                    <!-- /ko -->
+                    <!-- ko if: \$data == 'scripts' -->
+                    <select class="form-control row-extra-select" data-bind="options: \$parent.parent.scriptsList, optionsValue: 'scriptValue', optionsText: 'scriptText', value: \$parent.script, valueAllowUnset: true, event: { change: \$parent.changeScript }, enable: (\$parent.parent.scriptsList().length > 1)"></select>
+                    <!-- /ko -->
+                    <!-- ko if: \$data == 'age' -->
                    <div class="row-wrap-text" data-bind="text: \$parent.showColumn(\$data)"></div>
+                    <!-- /ko -->
                </td>
                <!-- /ko -->
                <td class="progress-indicator">
                    <div class="progress">
-                        <div class="progress-bar progress-bar-info" data-bind="attr: { 'style': 'width: ' + percentage() + '%; background-color: ' + progressColor() + ';' }">
+                        <div class="progress-bar progress-bar-info" role="progressbar" aria-label="$T('Glitter-progress')" aria-valuemin="0" aria-valuemax="100" data-bind="attr: { 'style': 'width: ' + percentage() + '%; background-color: ' + progressColor() + ';', 'aria-valuenow': percentage() }">
                            <strong data-bind="text: percentage() + '%'"></strong>
                            <i data-bind="text: missingText"></i>
                        </div>
@@ -137,93 +147,106 @@
                <td class="timeleft row-wrap-text" data-bind="text: statusText"></td>
                <td class="delete">
                    <label data-bind="visible: parent.isMultiEditing()">
-                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
+                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" aria-label="$T('Glitter-selectJob')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
                    </label>
-                    <!-- ko if: !isGrabbing() -->
                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
-                        <a href="#" data-toggle="dropdown" data-bind="click: toggleDropdown">
+                        <a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="$T('nzoDetails')" data-bind="click: toggleDropdown">
                            <span class="caret"></span>
                        </a>
                        <!-- ko if: hasDropdown()  -->
                        <ul class="dropdown-menu queue-item-settings">
                            <li title="$T('category')" data-tooltip="true" data-placement="left">
                                <span class="glyphicon glyphicon-tag"></span>
-                                <select name="Category" class="form-control" data-bind="options: parent.categoriesList, optionsValue: 'catValue', optionsText: 'catText',  value: category, event: { change: changeCat }"></select>
+                                <select name="Category" class="form-control" aria-label="$T('category')" data-bind="options: parent.categoriesList, optionsValue: 'catValue', optionsText: 'catText',  value: category, valueAllowUnset: true, event: { change: changeCat }"></select>
                            </li>
                            <!-- ko if: !isFetchingBlocks -->
                            <li title="$T('priority')" data-tooltip="true" data-placement="left">
                                <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
-                                <select name="Priority" class="form-control" data-bind="options: parent.priorityOptions, optionsValue: 'value', optionsText: 'name', value: priority, event: { change: changePriority }"></select>
+                                <select name="Priority" class="form-control" aria-label="$T('priority')" data-bind="options: parent.priorityOptions, optionsValue: 'value', optionsText: 'name', value: priority, valueAllowUnset: true, event: { change: changePriority }"></select>
                            </li>
                            <!-- /ko -->
                            <li title="$T('swtag-pp')" data-tooltip="true" data-placement="left">
                                <span class="glyphicon glyphicon-check"></span>
-                                <select name="Processing" class="form-control" data-bind="options: parent.processingOptions, optionsValue: 'value', optionsText: 'name', value: unpackopts, event: { change: changeProcessing }"></select>
+                                <select name="Processing" class="form-control" aria-label="$T('swtag-pp')" data-bind="options: parent.processingOptions, optionsValue: 'value', optionsText: 'name', value: unpackopts, valueAllowUnset: true, event: { change: changeProcessing }"></select>
                            </li>
                            <li title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
                                <span class="glyphicon glyphicon-flash"></span>
-                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
+                                <select name="Post-processing" class="form-control" aria-label="$T('eoq-scripts')" data-bind="options: parent.scriptsList, value: script, valueAllowUnset: true, optionsValue: 'scriptValue', optionsText: 'scriptText', event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
                            </li>
                        </ul>
                        <!-- /ko -->
                    </div>
-                    <!-- /ko -->
-                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" aria-label="$T('removeNZB-Files')" data-bind="click: parent.triggerRemoveDownload"><span class="glyphicon glyphicon-trash"></span></a>
                </td>
            </tr>
        </tbody>
    </table>

+    <div class="queue-footer">
+
    <form class="multioperations-selector" data-bind="visible: (hasQueue() && queue.isMultiEditing())" style="display: none;">
        <div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-options">
-            <label for="multiedit-checkall">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
+            <label for="multiedit-checkall-queue">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" aria-label="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
            </label>
-            <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
+            <a href="#" class="hover-button" title="$T('removeNZB-Files')" aria-label="$T('Glitter-removeSelected')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
                <span class="glyphicon glyphicon-trash"></span>
            </a>
        </div>
        <div class="add-nzb-inputbox add-nzb-inputbox-small">
-            <label for="multiedit-play">
-                <input type="radio" name="multiedit-status" value="resume" id="multiedit-play" data-bind="event: { change: queue.doMultiEditUpdate }" />
+            <label for="multiedit-play" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
+                <input type="radio" name="multiedit-status" value="resume" id="multiedit-play" aria-label="$T('link-resume')" data-bind="event: { change: queue.doMultiEditUpdate }" />
                <span class="glyphicon glyphicon-play" title="$T('link-resume')" data-tooltip="true" data-placement="top"></span>
            </label>
-            <label for="multiedit-pause">
-                <input type="radio" name="multiedit-status" value="pause" id="multiedit-pause" data-bind="event: { change: queue.doMultiEditUpdate }" />
+            <label for="multiedit-pause" data-bind="event: { mousedown: queue.handleMultiEditStatusMouseDown }">
+                <input type="radio" name="multiedit-status" value="pause" id="multiedit-pause" aria-label="$T('link-pause')" data-bind="event: { change: queue.doMultiEditUpdate }" />
                <span class="glyphicon glyphicon-pause" title="$T('link-pause')" data-tooltip="true" data-placement="top"></span>
            </label>
+            <a href="#" class="hover-button" title="$T('Glitter-top')" aria-label="$T('Glitter-top')" data-bind="click: queue.doMultiMoveToTop" data-tooltip="true" data-placement="top">
+                <span class="glyphicon glyphicon-chevron-up"></span>
+            </a>
+            <a href="#" class="hover-button" title="$T('Glitter-bottom')" aria-label="$T('Glitter-bottom')" data-bind="click: queue.doMultiMoveToBottom" data-tooltip="true" data-placement="top">
+                <span class="glyphicon glyphicon-chevron-down"></span>
+            </a>
            <span class="label label-default" data-bind="text: queue.multiEditItems().length">0</span>
        </div>
        <div class="add-nzb-inputbox-clear"></div>
        <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('category')">
            <span class="glyphicon glyphicon-tag"></span>
-            <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Category" class="form-control" aria-label="$T('category')" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
        </div>
        <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('priority')">
            <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
-            <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Priority" class="form-control" aria-label="$T('priority')" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
        </div>
        <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('swtag-pp')">
            <span class="glyphicon glyphicon-check"></span>
-            <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Processing" class="form-control" aria-label="$T('swtag-pp')" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
        </div>
        <div class="add-nzb-inputbox" data-tooltip="true" data-placement="top" title="$T('eoq-scripts')">
            <span class="glyphicon glyphicon-flash"></span>
-            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Post-processing" class="form-control" aria-label="$T('eoq-scripts')" data-bind="options: queue.scriptsList, optionsValue: 'scriptValue', optionsText: 'scriptText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
        </div>
        <div class="clearfix"></div>
    </form>

    <div class="input-group search-box" data-bind="visible: queue.hasQueueSearch" style="display: none;">
-        <input type="text" class="form-control" placeholder="$T('Glitter-search')" required data-bind="textInput: queue.searchTerm, event: { keydown: queue.clearSearchTerm }" />
-        <a data-bind="event: { mousedown: queue.clearSearchTerm }">
+        <input type="text" class="form-control" placeholder="$T('Glitter-search')" aria-label="$T('Glitter-search')" required data-bind="textInput: queue.searchTerm, event: { keydown: queue.clearSearchTerm }" />
+        <a href="#" data-tooltip="true" data-html="true" data-placement="right" title="$T('Glitter-searchExplain')" data-bind="click: queue.clearSearchTerm, attr: { 'aria-label': queue.searchTerm() ? '$T('Glitter-clearSearch')' : '$T('Glitter-search')' }">
            <span class="glyphicon" data-bind="css: { 'glyphicon-search' : !queue.searchTerm(), 'glyphicon-remove' : queue.searchTerm() }"></span>
        </a>
    </div>

    <ul class="pagination" data-bind="foreach: queue.pagination.allpages, visible: queue.pagination.hasPagination" style="display: none;">
-        <li data-bind="css: { active: isCurrent, disabled: isDots }, click: onclick">
-            <span data-bind="text: page"></span>
+        <li data-bind="css: { active: isCurrent, disabled: isDots }">
+            <!-- ko ifnot: isDots -->
+            <a href="#" data-bind="text: page, click: onclick, attr: { 'aria-current': isCurrent ? 'page' : null }"></a>
+            <!-- /ko -->
+            <!-- ko if: isDots -->
+            <span aria-hidden="true" data-bind="text: page"></span>
+            <!-- /ko -->
        </li>
    </ul>
-</div>
+
+    </div><!-- /.queue-footer -->
+</div>
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--#set $active_lang=$active_lang.replace('_', '-').lower()#-->
-<html lang="$active_lang" <!--#if $rtl#-->dir="rtl"<!--#end if#--> id="sabnzbd" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
+<html lang="$active_lang" <!--#if $rtl#-->dir="rtl"<!--#end if#--> id="sabnzbd" data-color-scheme="$color_scheme" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
    <head>
        <!--
                Glitter V2
@@ -25,25 +25,23 @@
        <meta name="msapplication-navbutton-color" content="#000000" />
        <meta name="theme-color" content="#000000" />

-        <link rel="apple-touch-icon" sizes="76x76" href="./staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
-        <link rel="apple-touch-icon" sizes="120x120" href="./staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
-        <link rel="apple-touch-icon" sizes="152x152" href="./staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
-        <link rel="apple-touch-icon" sizes="180x180" href="./staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
-        <link rel="apple-touch-icon" sizes="192x192" href="./staticcfg/ico/android-192x192.png" />
-        <link rel="mask-icon" href="./staticcfg/ico/safari-pinned-tab.svg" color="#383F45">
-        <link rel="shortcut icon" type="image/ico" href="./staticcfg/ico/favicon.ico?v=$version" data-bind="attr: { 'href': SABIcon }" />
+        <link rel="apple-touch-icon" sizes="76x76" href="$url('staticcfg/ico/apple-touch-icon-76x76-precomposed.png', v=$cache_buster)" />
+        <link rel="apple-touch-icon" sizes="120x120" href="$url('staticcfg/ico/apple-touch-icon-120x120-precomposed.png', v=$cache_buster)" />
+        <link rel="apple-touch-icon" sizes="152x152" href="$url('staticcfg/ico/apple-touch-icon-152x152-precomposed.png', v=$cache_buster)" />
+        <link rel="apple-touch-icon" sizes="180x180" href="$url('staticcfg/ico/apple-touch-icon-180x180-precomposed.png', v=$cache_buster)" />
+        <link rel="apple-touch-icon" sizes="192x192" href="$url('staticcfg/ico/android-192x192.png', v=$cache_buster)" />
+        <link rel="mask-icon" href="$url('staticcfg/ico/safari-pinned-tab.svg', v=$cache_buster)" color="#383F45">
+        <link rel="shortcut icon" type="image/ico" href="$url('staticcfg/ico/favicon.ico', v=$cache_buster)" data-bind="attr: { 'href': SABIcon }" />

-        <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/bootstrap.min.css?v=$version" />
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.css?v=$version" />
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.mobile.css?v=$version" media="all and (max-width: 768px)" />
-        <!--#if $color_scheme not in ('Light', '') #-->
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/colorschemes/${color_scheme}.css?v=$version"/>
-        <!--#end if#-->
+        <link rel="stylesheet" type="text/css" href="$url('static/bootstrap/css/bootstrap.min.css', v=$cache_buster)" />
+        <link rel="stylesheet" type="text/css" href="$url('static/stylesheets/glitter.css', v=$cache_buster)" />
+        <link rel="stylesheet" type="text/css" href="$url('static/stylesheets/glitter.mobile.css', v=$cache_buster)" media="all and (max-width: 768px)" />

        <!-- Make translations available in scripts -->
        <script type="text/javascript">
-            var apiKey = "$apikey";
+            var csrfToken = "$csrf_token";
            var displayLang = "$active_lang";
+            var dateScriptUrl = "$url('static/javascripts/date.min.js', v=$cache_buster)";
            var sabSpeedHistory = [$bytespersec_list];
            var newRelease = "$new_release";
            var newReleaseUrl = "$new_rel_url";
@@ -52,30 +50,21 @@
            var glitterTranslate = new Object();
            glitterTranslate.paused = "$T('post-Paused')";
            glitterTranslate.left = "$T('Glitter-left')";
-            glitterTranslate.clearWarn = "$T('confirm')";
+            glitterTranslate.clearOrphanWarning = "$T('Glitter-clearOrphanWarning')";
            glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
            glitterTranslate.pauseFor = "$T('pauseFor')"
            glitterTranslate.minutes = "$T('mins')"
            glitterTranslate.shutdown = "$T('shutdownOK?')";
            glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
            glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
-            glitterTranslate.deleteMsg = "$T('nzo-delete')";
-            glitterTranslate.removeDown = "$T('confirm')";
-            glitterTranslate.removeDow1 = "$T('confirm')";
+            glitterTranslate.confirm = "$T('confirm')";
+            glitterTranslate.markComplete = "$T('button-mark-completed')";
            glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
            glitterTranslate.retryAll = "$T('link-retryAll')?";
            glitterTranslate.fetch = "$T('Glitter-fetch')";
-            glitterTranslate.encrypted = "$T('Glitter-encrypted')";
-            glitterTranslate.duplicate = "$T('Glitter-duplicate')";
-            glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
-            glitterTranslate.unwanted = "$T('Glitter-unwanted')";
-            glitterTranslate.incomplete = "$T('Glitter-incomplete')";
-            glitterTranslate.filtered = "$T('Glitter-filtered')";
-            glitterTranslate.waitSec = "$T('Glitter-waitSec')";
            glitterTranslate.checking = "$T('post-Checking')";
            glitterTranslate.misingArt = "$T('missingArt')";
-            glitterTranslate.noSelect = "$T('Glitter-noSelect')";
-            glitterTranslate.sendThanks = "$T('Glitter-sendThanks')";
+            glitterTranslate.fetchingURL = "$T('Glitter-addFromURL')"
            glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
            glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
            glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -85,7 +74,14 @@
            glitterTranslate.defaultText = "$T('default')";
            glitterTranslate.noneText = "$T('None')";
            glitterTranslate.moreText = "$T('Glitter-more')";
-
+            glitterTranslate.column = [];
+            glitterTranslate.column['category'] = "$T('category')";
+            glitterTranslate.column['priority'] = "$T('priority')";
+            glitterTranslate.column['processing'] = "$T('swtag-pp')";
+            glitterTranslate.column['scripts'] = "$T('eoq-scripts')";
+            glitterTranslate.column['age'] = "$T('nzo-age')";
+            glitterTranslate.column['size'] = "$T('size')";
+            glitterTranslate.column['speed'] = "$T('Glitter-speed')";
            glitterTranslate.status = [];
            glitterTranslate.status['DirectUnpack'] = "$T('opt-direct_unpack')";
            glitterTranslate.status['Completed'] = "$T('post-Completed')";
@@ -103,7 +99,9 @@
            glitterTranslate.status['Repair'] = "$T('stage-repair')";
            glitterTranslate.status['Filejoin'] = "$T('stage-filejoin')";
            glitterTranslate.status['Unpack'] = "$T('stage-unpack')";
+            glitterTranslate.status['Deobfuscate'] = "$T('stage-deobfuscate')";
            glitterTranslate.status['Script'] = "$T('stage-script')";
+            glitterTranslate.status['RSS'] = "$T('stage-rss')";
            glitterTranslate.status['Source'] = "$T('stage-source')";
            glitterTranslate.status['Servers'] = "$T('stage-servers')";
            glitterTranslate.status['INFO'] = "$T('log-info')".replace('+', '').toUpperCase();
@@ -124,19 +122,27 @@
            glitterTranslate.priority['Stop'] = "$T('pr-stop')";
        </script>

-        <!-- Inclusion is faster than external scripts. We load momentJS locale seperatly so failure won't break anything -->
+        <script type="text/javascript" src="$url('staticcfg/js/jquery-3.7.1.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('staticcfg/js/jquery-ui.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/jquery.peity.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/jquery.hotkeys.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/moment-2.26.0.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/knockout-3.5.1.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/knockout-extensions.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/search-query-parser.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('staticcfg/bootstrap/js/bootstrap.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/glitter.basic.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/glitter.main.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/glitter.queue.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/glitter.history.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('static/javascripts/glitter.filelist.pagination.js', v=$cache_buster)"></script>
        <script type="text/javascript">
-            <!--#include raw $webdir + "/static/javascripts/jquery-3.5.1.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/jquery.peity.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/moment-2.26.0.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/knockout-3.5.1.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/knockout-extensions.js"#-->
-            <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->
-            <!--#include $webdir + "/static/javascripts/glitter.js"#-->
+            jQuery(function () {
+                ko.applyBindings(new ViewModel(), document.getElementById("sabnzbd"));
+            });
        </script>
        <!--#if active_lang != 'en'#-->
-        <script type="text/javascript" src="./static/javascripts/momentjs_locale/${active_lang}.js"></script>
+        <script type="text/javascript" src="$url('static/javascripts/momentjs_locale/' + $active_lang + '.js', v=$cache_buster)"></script>
        <!--#end if#-->
    </head>
    <body>
@@ -144,21 +150,21 @@
            <!--#include $webdir + "/include_menu.tmpl"#-->
        </div>

-        <div class="container main-content">
-            <div class="history-queue-swicher">
-                <ul class="nav nav-tabs">
-                    <li class="active">
-                        <a href="#queue-tab" data-toggle="tab">$T('menu-queue') <span class="badge" data-bind="text: queue.totalItems"></span></a>
-                    </li>
-                    <li>
-                        <a href="#history-tab" data-toggle="tab">$T('menu-history')<span class="badge" data-bind="text: history.totalItems"></span></a>
-                    </li>
-                    <li>
-                        <a href="#queue-messages" data-toggle="tab">$T('warnings')<span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
-                    </li>
-                </ul>
-            </div>
+        <div class="container history-queue-swicher">
+            <ul class="nav nav-tabs">
+                <li class="active">
+                    <a href="#queue-tab" data-toggle="tab">$T('menu-queue') <span class="badge" data-bind="text: queue.totalItems"></span></a>
+                </li>
+                <li>
+                    <a href="#history-tab" data-toggle="tab">$T('menu-history') <span class="badge badge-info" data-bind="text: history.ppItems, visible: history.ppItems"></span><span class="badge" data-bind="text: history.totalItems"></span></a>
+                </li>
+                <li>
+                    <a href="#queue-messages" data-toggle="tab">$T('warnings') <span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
+                </li>
+            </ul>
+        </div>

+        <div class="container main-content" data-bind="css: { 'main-content-loaded': isLoaded }">
            <!--#include $webdir + "/include_queue.tmpl"#-->
            <!--#include $webdir + "/include_messages.tmpl"#-->
            <!--#include $webdir + "/include_history.tmpl"#-->
@@ -23,34 +23,19 @@ if(isMobile) {
    });
 }

+$.ajaxSetup({
+    headers: { "X-SABnzbd-CSRF": csrfToken }
+});
+
 // Basic API-call
-function callAPI(data) {
+function callAPI(data, timeout = 10000) {
    // Fill basis var's
    data.output = "json";
-    data.apikey = apiKey;
    var ajaxQuery = $.ajax({
        url: "./api",
-        type: "GET",
-        cache: false,
+        type: "POST",
        data: data,
-        timeout: 10000 // Wait a little longer on mobile connections
-    });
-
-    return $.when(ajaxQuery);
-}
-
-// Special API call
-function callSpecialAPI(url, data) {
-    // Did we get input?
-    if(data == undefined) data = {};
-    // Fill basis var's
-    data.output = "json";
-    data.apikey = apiKey;
-    var ajaxQuery = $.ajax({
-        url: url,
-        type: "GET",
-        cache: false,
-        data: data
+        timeout: timeout
    });

    return $.when(ajaxQuery);
@@ -75,11 +60,11 @@ function convertHTMLtoText(htmltxt) {
 // Function to re-write 0:09:21=>9:21, 0:10:10=>10:10, 0:00:30=>0:30
 function rewriteTime(timeString) {
    // Remove "0:0" from start
-    if(timeString.substring(0,3) == '0:0') {
+    if(timeString.substring(0,3) === '0:0') {
        timeString = timeString.substring(3)
    }
    // Remove "0:" from start
-    else if(timeString.substring(0,2) == '0:') {
+    else if(timeString.substring(0,2) === '0:') {
        timeString = timeString.substring(2)
    }
    return timeString
@@ -88,13 +73,13 @@ function rewriteTime(timeString) {
 // How to display the date-time?
 function displayDateTime(inDate, outFormat, inFormat) {
    // What input?
-    if(inDate == '') {
+    if(inDate === '') {
        var theMoment = moment()
    } else {
        var theMoment = moment.utc(inDate, inFormat)
    }
    // Special format or regular format?
-    if(outFormat == 'fromNow') {
+    if(outFormat === 'fromNow') {
        return theMoment.fromNow()
    } else {
        return theMoment.local().format(outFormat)
@@ -172,7 +157,7 @@ function setCheckAllState(checkSelector, rangeSelector) {
    var nrChecks = allChecks.filter(":checked");
    if(nrChecks.length === 0) {
        $(checkSelector).prop({'checked': false, 'indeterminate': false})
-    } else if(nrChecks.length == allChecks.length) {
+    } else if(nrChecks.length === allChecks.length) {
        $(checkSelector).prop({'checked': true, 'indeterminate': false})
    } else {
        $(checkSelector).prop({'checked': false, 'indeterminate': true})
@@ -57,7 +57,7 @@ function Fileslisting(parent) {
            $.each(response.files, function(index, slot) {
                // Existing or updating?
                var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.nzf_id() == slot.nzf_id;
+                    return i.nzf_id() === slot.nzf_id;
                });

                if(existingItem) {
@@ -76,7 +76,7 @@ function Fileslisting(parent) {
            }

            // Check if we show/hide completed
-            if(localStorageGetItem('showCompletedFiles') == 'No') {
+            if(localStorageGetItem('showCompletedFiles') === 'No') {
                $('.item-files-table tr.files-done').hide();
                $('#filelist-showcompleted').removeClass('hover-button')
            }
@@ -217,8 +217,8 @@ function FileslistingModel(parent, data) {
    self.nzf_id = ko.observable(data.nzf_id);
    self.file_age = ko.observable(data.age);
    self.mb = ko.observable(data.mb);
-    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
-    self.isdone =  ko.observable(data.status == "finished");
+    self.canselect = ko.observable(data.status !== "finished" && data.status !== "queued");
+    self.isdone =  ko.observable(data.status === "finished");
    self.percentage = ko.observable(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));

    // Update internally
@@ -227,8 +227,8 @@ function FileslistingModel(parent, data) {
        self.nzf_id(data.nzf_id)
        self.file_age(data.age)
        self.mb(data.mb)
-        self.canselect(data.status != "finished" && data.status != "queued")
-        self.isdone(data.status == "finished")
+        self.canselect(data.status !== "finished" && data.status !== "queued")
+        self.isdone(data.status === "finished")
        // Data is given in MB, would always show 0% for small files even if completed
        self.percentage(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)))
    }
@@ -266,7 +266,7 @@ function paginationModel(parent) {
        // Return object for adding
        return {
            page: pageNr,
-            isCurrent: pageNr == self.currentPage(),
+            isCurrent: pageNr === self.currentPage(),
            isDots: false,
            onclick: function(data) {
                self.moveToPage(data.page);
@@ -294,7 +294,7 @@ function paginationModel(parent) {
            self.nrPages(1)
            self.currentStart(0);

-            // Are we on next page?
+            // Are we on next page? Bad!
            if(self.currentPage() > 1) {
                // Force full update
                parent.parent.refresh(true);
@@ -302,9 +302,6 @@ function paginationModel(parent) {

            // Move to current page
            self.currentPage(1);
-
-            // Force full update
-            parent.parent.refresh(true);
        } else {
            // Calculate number of pages needed
            var newNrPages = Math.ceil(parent.totalItems() / parent.paginationLimit())
@@ -359,7 +356,7 @@ function paginationModel(parent) {
            }

            // Change of number of pages?
-            if(newNrPages != self.nrPages()) {
+            if(newNrPages !== self.nrPages()) {
                // Update
                self.nrPages(newNrPages);
            }
@@ -9,11 +9,17 @@ function HistoryListModel(parent) {
    self.lastUpdate = 0;
    self.historyItems = ko.observableArray([])
    self.showFailed = ko.observable(false).extend({ persist: 'historyShowFailed' });
+    self.showArchive = ko.observable(false).extend({ persist: 'historyShowArchive' });
+    self.permanentlyDelete = ko.observable(false).extend({ persist: 'permanentlyDelete' });
    self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
    self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
    self.totalItems = ko.observable(0);
+    self.deleteItems = ko.observableArray([]);
+    self.ppItems = ko.observable(0);
    self.pagination = new paginationModel(self);
+    self.isMultiEditing = ko.observable(false).extend({ persist: 'historyIsMultiEditing' });
+    self.multiEditItems = ko.observableArray([]);

    // Download history info
    self.downloadedToday = ko.observable();
@@ -40,7 +46,7 @@ function HistoryListModel(parent) {
        var newItems = [];
        $.each(data.slots, function(index, slot) {
            var existingItem = ko.utils.arrayFirst(self.historyItems(), function(i) {
-                return i.historyStatus.nzo_id() == slot.nzo_id;
+                return i.historyStatus.nzo_id() === slot.nzo_id;
            });
            // Set index in the results
            slot.index = index
@@ -56,7 +62,7 @@ function HistoryListModel(parent) {
        });

        // Remove all items
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
            // Replace it, so only 1 Knockout DOM-update!
            self.historyItems(newItems);
            newItems = [];
@@ -65,7 +71,7 @@ function HistoryListModel(parent) {
            $.each(itemIds, function() {
                var id = this.toString();
                self.historyItems.remove(ko.utils.arrayFirst(self.historyItems(), function(i) {
-                    return i.historyStatus.nzo_id() == id;
+                    return i.historyStatus.nzo_id() === id;
                }));
            });
        }
@@ -79,7 +85,7 @@ function HistoryListModel(parent) {
            if(self.parent.queue.multiEditItems().length > 0) {
                $.each(newItems, function() {
                    var currentItem = this;
-                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id == currentItem.nzo_id; })
+                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id === currentItem.id; })
                })
            }
        }
@@ -93,6 +99,7 @@ function HistoryListModel(parent) {
            History information
        ***/
        self.totalItems(data.noofslots);
+        self.ppItems(data.ppslots)
        self.downloadedToday(data.day_size);
        self.downloadedWeek(data.week_size);
        self.downloadedMonth(data.month_size);
@@ -110,8 +117,31 @@ function HistoryListModel(parent) {
                value: newValue
            })
        }
+        // Update pagination and counters
+        self.parent.refresh(true)
    });

+    self.triggerRemoveDownload = function(items) {
+        // Show and fill modal
+        self.deleteItems.removeAll()
+
+        // Single or multiple items?
+        if(items.length) {
+            ko.utils.arrayPushAll(self.deleteItems, items)
+        } else {
+            self.deleteItems.push(items)
+        }
+
+        // Show modal or delete right away
+        if(self.parent.confirmDeleteHistory()) {
+            // Open modal if desired
+            $('#modal-delete-history-job').modal("show")
+        } else {
+            // Otherwise just submit right away
+            $('#modal-delete-history-job form').submit()
+        }
+    }
+
    // Retry a job
    self.retryJob = function(form) {
        // Adding a extra retry file happens through this special function
@@ -120,7 +150,6 @@ function HistoryListModel(parent) {
        data.append("nzbfile", $(form.nzbFile)[0].files[0]);
        data.append("value", $('#modal-retry-job input[name="retry_job_id"]').val());
        data.append("password", $('#retry_job_password').val());
-        data.append("apikey", apiKey);

        // Add
        $.ajax({
@@ -139,30 +168,30 @@ function HistoryListModel(parent) {
        form.reset()
    }

-    // Searching in history (rate-limited in decleration)
+    // Searching in history (rate-limited in declaration)
    self.searchTerm.subscribe(function() {
-        // Make sure we refresh
-        self.lastUpdate = 0
-        self.parent.refresh();
        // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
+            // This forces a refresh
            self.pagination.moveToPage(1);
+        } else {
+            // Make sure we refresh
+            self.parent.refresh(true);
        }
    })

    // Clear searchterm
    self.clearSearchTerm = function(data, event) {
        // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'click' || (event.keyCode && event.keyCode === 27)) {
            // Set the loader so it doesn't flicker and then switch
            self.isLoading(true)
            self.searchTerm('');
-            self.parent.refresh()
        }
        // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'click' && self.searchTerm() === '') {
            $(event.target).parents('.search-box').find('input[type="text"]').focus()
-            return;
+            return false;
        }
        // Need to return true to allow typing
        return true;
@@ -170,10 +199,17 @@ function HistoryListModel(parent) {

    // Toggle showing failed
    self.toggleShowFailed = function(data, event) {
-        // Set the loader so it doesn't flicker and then switch
-        self.isLoading(true)
        self.showFailed(!self.showFailed())
-        // Forde hide tooltip so it doesn't linger
+        // Force hide tooltip so it doesn't linger
+        $('#history-options a').tooltip('hide')
+        // Force refresh
+        self.parent.refresh(true)
+    }
+
+    // Toggle showing archive
+    self.toggleShowArchive = function(data, event) {
+        self.showArchive(!self.showArchive())
+        // Force hide tooltip so it doesn't linger
        $('#history-options a').tooltip('hide')
        // Force refresh
        self.parent.refresh(true)
@@ -195,36 +231,34 @@ function HistoryListModel(parent) {

    // Empty history options
    self.emptyHistory = function(data, event) {
-        // Make sure no flickering
-        self.isLoading(true)
-
        // What event?
        var whatToRemove = $(event.target).data('action');
+        var skipArchive = $('#modal-purge-history input[type="checkbox"]').prop("checked")
        var del_files, value;

        // Purge failed
-        if(whatToRemove == 'history-purge-failed') {
+        if(whatToRemove === 'history-purge-failed') {
            del_files = 0;
            value = 'failed';
        }
        // Also remove files
-        if(whatToRemove == 'history-purgeremove-failed') {
+        if(whatToRemove === 'history-purgeremove-failed') {
            del_files = 1;
            value = 'failed';
        }
        // Remove completed
-        if(whatToRemove == 'history-purge-completed') {
+        if(whatToRemove === 'history-purge-completed') {
            del_files = 0;
            value = 'completed';
        }
        // Remove the ones on this page
-        if(whatToRemove == 'history-purge-page') {
+        if(whatToRemove === 'history-purge-page') {
            // List all the ID's
            var strIDs = '';
            $.each(self.historyItems(), function(index) {
                // Only append when it's a download that can be deleted
                if(!this.processingDownload() && !this.processingWaiting()) {
-                    strIDs = strIDs + this.nzo_id + ',';
+                    strIDs = strIDs + this.id + ',';
                }
            })
            // Send the command
@@ -232,6 +266,7 @@ function HistoryListModel(parent) {
                mode: 'history',
                name: 'delete',
                del_files: 1,
+                archive: (!skipArchive) * 1,
                value: strIDs
            }).then(function() {
                // Clear search, refresh and hide
@@ -246,13 +281,197 @@ function HistoryListModel(parent) {
        callAPI({
            mode: 'history',
            name: 'delete',
-            value: value,
-            del_files: del_files
+            del_files: del_files,
+            archive: (!skipArchive) * 1,
+            value: value
        }).then(function() {
            self.parent.refresh();
            $("#modal-purge-history").modal('hide');
        });
    };
+
+    // Show the input checkbox
+    self.showMultiEdit = function() {
+        self.isMultiEditing(!self.isMultiEditing())
+        self.multiEditItems.removeAll();
+        $('.history-table input[name="multiedit"], #multiedit-checkall-history').prop({'checked': false, 'indeterminate': false})
+    }
+
+    // Add to the list
+    self.addMultiEdit = function(item, event) {
+        // Is it a shift-click?
+        if(event.shiftKey) {
+            checkShiftRange('.history-table input[name="multiedit"]');
+        }
+
+        // Add or remove from the list?
+        if(event.currentTarget.checked) {
+            // Add item
+            self.multiEditItems.push(item);
+        } else {
+            // Go over them all to know which one to remove
+            self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+        }
+
+        // Update check-all buton state
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Check all
+    self.checkAllJobs = function(item, event) {
+        // Get which ones we care about
+        var allChecks = $('.history-table input[name="multiedit"]').filter(':not(:disabled):visible');
+
+        // We need to re-evaltuate the state of this check-all
+        // Otherwise the 'inderterminate' will be overwritten by the click event!
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+
+        // Now we can check what happend
+        // For when some are checked, or all are checked (but not partly)
+        if(event.target.indeterminate || (event.target.checked && !event.target.indeterminate)) {
+            var allActive = allChecks.filter(":checked")
+            // First remove the from the list
+            if(allActive.length == self.multiEditItems().length) {
+                // Just remove all
+                self.multiEditItems.removeAll();
+                // Remove the check
+                allActive.prop('checked', false)
+            } else {
+                // Remove them seperate
+                allActive.each(function() {
+                    // Go over them all to know which one to remove
+                    var item = ko.dataFor(this)
+                    self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+                    // Remove the check of this one
+                    this.checked = false;
+                })
+            }
+        } else {
+            // None are checked, so check and add them all
+            allChecks.prop('checked', true)
+            allChecks.each(function() { self.multiEditItems.push(ko.dataFor(this)) })
+            event.target.checked = true
+        }
+        // Set state of all the check-all's
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Remove downloads from history
+    self.removeDownloads = function(form) {
+        // Hide modal and show notification
+        $('#modal-delete-history-job').modal("hide")
+        showNotification('.main-notification-box-removing')
+
+        var strIDsPP = '';
+        var strIDsHistory = '';
+        $.each(self.deleteItems(), function(index) {
+            // Split in jobs that need post-processing aborted, and jobs that need to be deleted
+            if(this.processingDownload() === 2) {
+                strIDsPP = strIDsPP + this.id + ',';
+                // These items should not be listed in the deletedItems later on
+                // as active post-processing aren't removed from the history output
+                self.deleteItems.remove(this)
+            } else {
+                strIDsHistory = strIDsHistory + this.id + ',';
+            }
+        })
+
+        // Trigger post-processing aborting
+        if(strIDsPP !== "") {
+            callAPI({
+                mode: 'cancel_pp',
+                value: strIDsPP
+            }).then(function(response) {
+                // Only hide and refresh
+                self.parent.refresh();
+                hideNotification()
+            });
+        }
+        if(strIDsHistory !== "") {
+            var skipArchive = $('#modal-delete-history-job input[type="checkbox"]').prop("checked")
+
+            // Permanently delete if we are on the Archive page
+            if(self.showArchive()) skipArchive = true
+
+            callAPI({
+                mode: 'history',
+                name: 'delete',
+                del_files: 1,
+                archive: (!skipArchive) * 1,
+                value: strIDsHistory
+            }).then(function(response) {
+                self.historyItems.removeAll(self.deleteItems());
+                self.multiEditItems.removeAll(self.deleteItems())
+                self.parent.refresh();
+                hideNotification()
+            });
+        }
+    };
+
+    // Delete all selected
+    self.doMultiDelete = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Trigger modal
+        self.triggerRemoveDownload(self.multiEditItems())
+    }
+
+    // Mark jobs as completed
+    self.markAsCompleted = function(items) {
+        // Confirm
+        if(!confirm(glitterTranslate.markComplete)) {
+            return
+        }
+        // Single or multiple items?
+        var strIDs = '';
+        if(items.length) {
+            $.each(items, function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
+        } else {
+            strIDs = items.id
+        }
+
+        // Send the API call
+        callAPI({
+            mode: 'history',
+            name: 'mark_as_completed',
+            value: strIDs
+        }).then(function(response) {
+            // Force refresh to update the UI
+            self.parent.refresh(true);
+        });
+    }
+
+    // Mark all selected as completed
+    self.doMultiMarkCompleted = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Mark them
+        self.markAsCompleted(self.multiEditItems());
+    }
+
+    // Focus on the confirm button
+    $('#modal-delete-history-job').on("shown.bs.modal", function() {
+        $('#modal-delete-history-job .btn[type="submit"]').focus()
+    })
+
+    // On change of page we need to check all those that were in the list!
+    self.historyItems.subscribe(function() {
+        // We need to wait until the unit is actually finished rendering
+        setTimeout(function() {
+            $.each(self.multiEditItems(), function(index) {
+                $('#multiedit_' + this.id).prop('checked', true);
+            })
+
+            // Update check-all buton state
+            setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        }, 100)
+    }, null, "arrayChange")
 }

 /**
@@ -266,7 +485,7 @@ function HistoryModel(parent, data) {
    // If we update the full set every time it uses lot of CPU
    // The Status/Actionline/scriptline/completed we do update every time
    // When clicked on the more-info button we load the rest again
-    self.nzo_id = data.nzo_id;
+    self.id = data.nzo_id;
    self.index = data.index;
    self.updateAllHistory = false;
    self.hasDropdown = ko.observable(false);
@@ -303,14 +522,14 @@ function HistoryModel(parent, data) {

    // Waiting?
    self.processingWaiting = ko.pureComputed(function() {
-        return(self.status() == 'Queued')
+        return(self.status() === 'Queued')
    })

    // Processing or done?
    self.processingDownload = ko.pureComputed(function() {
        var status = self.status();
        // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
+        if (status === 'Extracting' || status === 'Verifying' || status === 'Repairing' || status === 'Running') {
            return 2
        }
        // These cannot be cancelled
@@ -344,7 +563,7 @@ function HistoryModel(parent, data) {
                    try {
                        // Extract the Download section
                        var downloadLog = ko.utils.arrayFirst(self.historyStatus.stage_log(), function(item) {
-                            return item.name() == 'Download'
+                            return item.name() === 'Download'
                        });
                        // Extract the speed
                        return downloadLog.actions()[0].match(/(\S*\s\S+)(?=<br\/>)/)[0]
@@ -353,7 +572,7 @@ function HistoryModel(parent, data) {
                return;
            case 'category':
                // Exception for *
-                if(self.historyStatus.category() == "*")
+                if(self.historyStatus.category() === "*")
                    return glitterTranslate.defaultText
                return self.historyStatus.category();
            case 'size':
@@ -367,6 +586,11 @@ function HistoryModel(parent, data) {
        return displayDateTime(self.completed(), parent.parent.dateFormat(), 'X')
    });

+    // Format time added
+    self.timeAdded = ko.pureComputed(function() {
+        return displayDateTime(self.historyStatus.time_added(), parent.parent.dateFormat(), 'X')
+    });
+
    // Subscribe to retryEvent so we can load the password
    self.canRetry.subscribe(function() {
        self.updateAllHistory = true;
@@ -375,13 +599,18 @@ function HistoryModel(parent, data) {
    // Re-try button
    self.retry = function() {
        // Set JOB-id
-        $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
+        $('#modal-retry-job input[name="retry_job_id"]').val(self.id)
        // Set password
        $('#retry_job_password').val(self.historyStatus.password())
        // Open modal
        $('#modal-retry-job').modal("show")
    };

+    // Mark as completed button
+    self.markAsCompleted = function() {
+        parent.markAsCompleted(self);
+    };
+
    // Update information only on click
    self.updateAllHistoryInfo = function(data, event) {
        // Show
@@ -408,144 +637,13 @@ function HistoryModel(parent, data) {
                $(this).hide()
            } else {
               // Info in modal
-                $('#history-script-log .modal-body').load($(this).attr('href'), function(result) {
-                    // Set title and then remove it
-                    $('#history-script-log .modal-title').text($(this).find("h3").text())
-                    $(this).find("h3, title").remove()
-                    $('#history-script-log').modal('show');
+                $('#history-script-log .modal-body pre').load($(this).attr('href'), function(result) {
+                    var modal = $('#history-script-log');
+                    modal.find('.modal-title').text(self.historyStatus.name());
+                    modal.modal('show');
                });
            }
            return false;
        })
    }
-
-    // Delete button
-    self.deleteSlot = function(item, event) {
-        // Confirm?
-        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.deleteMsg + ":\n" + item.historyStatus.name() + "\n\n" + glitterTranslate.removeDow1)) {
-            // Are we still processing and it can be stopped?
-            if(item.processingDownload() == 2) {
-                callAPI({
-                    mode: 'cancel_pp',
-                    value: self.nzo_id
-                })
-                // All we can do is wait
-            } else {
-                // Delete the item
-                callAPI({
-                    mode: 'history',
-                    name: 'delete',
-                    del_files: 1,
-                    value: self.nzo_id
-                }).then(function(response) {
-                    if(response.status) {
-                        // Make sure no flickering (if there are more items left) and then remove
-                        self.parent.isLoading(self.parent.totalItems() > 1)
-                        self.parent.historyItems.remove(self);
-                        self.parent.parent.refresh();
-                    }
-                });
-            }
-
-        }
-    };
-
-    // User voting
-    self.setUserVote = function(item, event) {
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: 'vote',
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User rating
-    self.setUserRating = function(item, event) {
-        // Audio or video
-        var changeWhat = 'audio';
-        if($(event.target).attr('name') == 'ratings-video') {
-            changeWhat = 'video';
-        }
-
-        // Only on user-event, not the auto-fired ones
-        if(!event.originalEvent) return;
-
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: changeWhat,
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User comment
-    self.setUserReport = function(form) {
-        // What are we reporting?
-        var userReport = $(form).find('input[name="rating_flag"]:checked').val();
-        var userDetail = '';
-
-        // Anything selected?
-        if(!userReport) {
-            alert(glitterTranslate.noSelect)
-            return;
-        }
-
-        // Extra info?
-        if(userReport == 'comment') userDetail = $(form).find('input[name="ratings-report-comment"]').val();
-        if(userReport == 'other') userDetail = $(form).find('input[name="ratings-report-other"]').val();
-
-        // Exception for servers
-        if(userReport == 'expired') {
-            // Which server?
-            userDetail = $(form).find('select[name="ratings-report-expired-server"]').val();
-
-            // All?
-            if(userDetail == "") {
-                // Loop over all servers
-                $.each(parent.parent.servers, function(index, server) {
-                    // Set timeout because simultanious requests don't work (yet)
-                    setTimeout(function() {
-                        submitUserReport(server.name)
-                    }, index * 1500)
-                })
-
-            } else {
-                // Just the one server
-                submitUserReport(userDetail)
-            }
-        } else {
-            submitUserReport(userDetail)
-        }
-
-        // After all, close it
-        form.reset();
-        $(form).parent().parent().dropdown('toggle');
-        alert(glitterTranslate.sendThanks)
-
-        function submitUserReport(theDetail) {
-            // Send note
-            callAPI({
-                mode: 'queue',
-                name: 'rating',
-                type: 'flag',
-                setting: userReport,
-                detail: theDetail,
-                value: self.nzo_id
-            })
-        }
-        return false
-    }
-}
+}
@@ -1,56 +0,0 @@
-/******
-
-        Glitter V1
-        By Safihre (2015) - safihre@sabnzbd.org
-
-        Code extended from Shiny-template
-        Code examples used from Knockstrap-template
-
-        The setup is hierarchical, 1 main ViewModel that contains:
-        - ViewModel
-            - QueueListModel
-                - paginationModel
-                - QueueModel (item 1)
-                - QueueModel (item 2)
-                - ...
-                - QueueModel (item n+1)
-            - HistoryListModel
-                - paginationModel
-                - HistoryModel (item 1)
-                - HistoryModel (item 2)
-                - ...
-                - HistoryModel (item n+1)
-            - Fileslisting
-                - FileslistingModel (file 1)
-                - FileslistingModel (file 2)
-                - ...
-                - FileslistingModel (file n+1)
-
-        ViewModel also contains all the code executed on document ready and
-        functions responsible for the status information, adding NZB, etc.
-        The QueueModel/HistoryModel's get added to the list-models when
-        jobs are added or on switching of pages (using paginationModel).
-        Once added only the properties that changed during a refresh
-        get updated. In the history all the detailed information is only
-        updated when created and when the user clicks on a detail.
-        The Fileslisting is only populated and updated when it is opened
-        for one of the QueueModel's.
-
-******/
-
-#include raw $webdir + "/static/javascripts/glitter.basic.js"#
-
-/**
-    GLITTER CODE
-**/
-\$(function() {
-    'use strict';
-
-    #include raw $webdir + "/static/javascripts/glitter.main.js"#
-    #include raw $webdir + "/static/javascripts/glitter.queue.js"#
-    #include raw $webdir + "/static/javascripts/glitter.history.js"#
-    #include raw $webdir + "/static/javascripts/glitter.filelist.pagination.js"#
-
-    // GO!!!
-    ko.applyBindings(new ViewModel(), document.getElementById("sabnzbd"));
-});
@@ -6,8 +6,6 @@ function QueueListModel(parent) {
    var self = this;
    self.parent = parent;
    self.dragging = false;
-    self.rawCatList = [];
-    self.rawScriptList = [];

    // Because SABNZB returns the name
    // But when you want to set Priority you need the number..
@@ -34,12 +32,13 @@ function QueueListModel(parent) {
    // External var's
    self.queueItems = ko.observableArray([]);
    self.totalItems = ko.observable(0);
+    self.deleteItems = ko.observableArray([]);
    self.isMultiEditing = ko.observable(false).extend({ persist: 'queueIsMultiEditing' });
    self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
    self.multiEditItems = ko.observableArray([]);
    self.categoriesList = ko.observableArray([]);
    self.scriptsList = ko.observableArray([]);
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
    self.paginationLimit = ko.observable(20).extend({ persist: 'queuePaginationLimit' });
    self.pagination = new paginationModel(self);

@@ -66,31 +65,6 @@ function QueueListModel(parent) {
            return i.id;
        });

-        // Did the category-list change?
-        // Otherwise KO will send updates to all <select> for every refresh()
-        if(self.rawCatList != data.categories.toString()) {
-            // Reformat categories
-            self.categoriesList($.map(data.categories, function(cat) {
-                // Default?
-                if(cat == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
-                return { catValue: cat, catText: cat };
-            }))
-            // Update
-            self.rawCatList = data.categories.toString();
-        }
-
-        // Did the script-list change?
-        if(self.rawScriptList != data.scripts.toString()) {
-            // Reformat script-list
-            self.scriptsList($.map(data.scripts, function(script) {
-                // Default?
-                if(script == 'None') return glitterTranslate.noneText;
-                return script;
-            }))
-            // Update
-            self.rawScriptList = data.scripts.toString();
-        }
-
        // Set limit
        self.totalItems(data.noofslots);

@@ -101,7 +75,7 @@ function QueueListModel(parent) {
        $.each(data.slots, function() {
            var item = this;
            var existingItem = ko.utils.arrayFirst(self.queueItems(), function(i) {
-                return i.id == item.nzo_id;
+                return i.id === item.nzo_id;
            });

            if(existingItem) {
@@ -114,7 +88,7 @@ function QueueListModel(parent) {
        });

        // Remove all items if there's any
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
            // Replace it, so only 1 Knockout DOM-update!
            self.queueItems(newItems);
            newItems = [];
@@ -123,7 +97,7 @@ function QueueListModel(parent) {
            $.each(itemIds, function() {
                var id = this.toString();
                self.queueItems.remove(ko.utils.arrayFirst(self.queueItems(), function(i) {
-                    return i.id == id;
+                    return i.id === id;
                }));
            });
        }
@@ -174,6 +148,27 @@ function QueueListModel(parent) {

    }

+    self.triggerRemoveDownload = function(items) {
+        // Show and fill modal
+        self.deleteItems.removeAll()
+
+        // Single or multiple items?
+        if(items.length) {
+            ko.utils.arrayPushAll(self.deleteItems, items)
+        } else {
+            self.deleteItems.push(items)
+        }
+
+        // Show modal or delete right away
+        if(self.parent.confirmDeleteQueue()) {
+            // Open modal if desired
+            $('#modal-delete-queue-job').modal("show")
+        } else {
+            // Otherwise just submit right away
+            $('#modal-delete-queue-job form').submit()
+        }
+    }
+
    // Save pagination state
    self.paginationLimit.subscribe(function(newValue) {
        // Save in config if global
@@ -185,6 +180,8 @@ function QueueListModel(parent) {
                value: newValue
            })
        }
+        // Update pagination and counters
+        self.parent.refresh(true)
    });

    // Do we show search box. So it doesn't dissapear when nothing is found
@@ -194,26 +191,27 @@ function QueueListModel(parent) {

    // Searching in queue (rate-limited in decleration)
    self.searchTerm.subscribe(function() {
-        // Refresh now
-        self.parent.refresh();
        // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
+            // This forces a refresh
            self.pagination.moveToPage(1);
+        } else {
+            // Refresh now
+            self.parent.refresh();
        }
    })

    // Clear searchterm
    self.clearSearchTerm = function(data, event) {
        // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'click' || (event.keyCode && event.keyCode === 27)) {
            self.isLoading(true)
            self.searchTerm('');
-            self.parent.refresh()
        }
        // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'click' && self.searchTerm() === '') {
            $(event.target).parents('.search-box').find('input[type="text"]').focus()
-            return;
+            return false;
        }
        // Need to return true to allow typing
        return true;
@@ -226,6 +224,14 @@ function QueueListModel(parent) {
        // What action?
        var sort, dir;
        switch($(event.currentTarget).data('action')) {
+            case 'sortRemainingAsc':
+                sort = 'remaining';
+                dir = 'asc';
+                break;
+            case 'sortRemainingBytesAsc':
+                sort = 'remaining_bytes';
+                dir = 'asc';
+                break;
            case 'sortAgeAsc':
                sort = 'avg_age';
                dir = 'desc';
@@ -274,7 +280,7 @@ function QueueListModel(parent) {
        // Reset form and remove all checked ones
        $form[0].reset();
        self.multiEditItems.removeAll();
-        $('.delete input[name="multiedit"], #multiedit-checkall').prop({'checked': false, 'indeterminate': false})
+        $('.queue-table input[name="multiedit"], #multiedit-checkall-queue').prop({'checked': false, 'indeterminate': false})

        // Is the multi-edit in view?
        if(($form.offset().top + $form.outerHeight(true)) > ($(window).scrollTop()+$(window).height())) {
@@ -304,7 +310,7 @@ function QueueListModel(parent) {
        }

        // Update check-all buton state
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
        return true;
    }

@@ -315,7 +321,7 @@ function QueueListModel(parent) {

        // We need to re-evaltuate the state of this check-all
        // Otherwise the 'inderterminate' will be overwritten by the click event!
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')

        // Now we can check what happend
        // For when some are checked, or all are checked (but not partly)
@@ -347,7 +353,7 @@ function QueueListModel(parent) {
            self.doMultiEditUpdate()
        }
        // Set state of all the check-all's
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
        return true;
    }

@@ -364,92 +370,160 @@ function QueueListModel(parent) {
        var newStatus = $('.multioperations-selector input[name="multiedit-status"]:checked').val()

        // List all the ID's
-        var  strIDs = '';
+        var strIDs = '';
        $.each(self.multiEditItems(), function(index) {
            strIDs = strIDs + this.id + ',';
        })

+        // All non-category updates need to only happen after a category update
+        function nonCatUpdates() {
+            if(newScript !== '') {
+                callAPI({
+                    mode: 'change_script',
+                    value: strIDs,
+                    value2: newScript
+                })
+            }
+            if(newPrior !== '') {
+                callAPI({
+                    mode: 'queue',
+                    name: 'priority',
+                    value: strIDs,
+                    value2: newPrior
+                })
+            }
+            if(newProc !== '') {
+                callAPI({
+                    mode: 'change_opts',
+                    value: strIDs,
+                    value2: newProc
+                })
+            }
+            if(newStatus) {
+                callAPI({
+                    mode: 'queue',
+                    name: newStatus,
+                    value: strIDs
+                })
+            }
+
+            // Wat a little and do the refresh
+            // Only if anything changed!
+            if(newStatus || newProc !== '' || newPrior !== '' || newScript !== '' || newCat !== '') {
+                setTimeout(parent.refresh, 100)
+            }
+        }
+
        // What is changed?
-        if(newCat != '') {
+        if(newCat !== '') {
            callAPI({
                mode: 'change_cat',
                value: strIDs,
                value2: newCat
-            })
-        }
-        if(newScript != '') {
-            callAPI({
-                mode: 'change_script',
-                value: strIDs,
-                value2: newScript
-            })
-        }
-        if(newPrior != '') {
-            callAPI({
-                mode: 'queue',
-                name: 'priority',
-                value: strIDs,
-                value2: newPrior
-            })
-        }
-        if(newProc != '') {
-            callAPI({
-                mode: 'change_opts',
-                value: strIDs,
-                value2: newProc
-            })
-        }
-        if(newStatus) {
-            callAPI({
-                mode: 'queue',
-                name: newStatus,
-                value: strIDs
-            })
+            }).then(nonCatUpdates)
+        } else {
+            nonCatUpdates()
        }

-        // Wat a little and do the refresh
-        // Only if anything changed!
-        if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
-            setTimeout(parent.refresh, 100)
-        }
    }

-    // Selete all selected
+    // Handle mousedown to capture state before change
+    self.handleMultiEditStatusMouseDown = function(item, event) {
+        var clickedValue = $(event.currentTarget).find("input").val();
+
+        // If this radio was already selected (same value as previous), clear it
+        if ($('.multioperations-selector input[name="multiedit-status"]:checked').val() === clickedValue) {
+            // Clear all radio buttons in this group after the click finished
+            // Hacky, but it works
+            setTimeout(function () {
+                $('.multioperations-selector input[name="multiedit-status"]').prop('checked', false);
+            }, 200)
+        }
+        return true;
+    }
+
+    // Remove downloads from queue
+    self.removeDownloads = function(form) {
+        // Hide modal and show notification
+        $('#modal-delete-queue-job').modal("hide")
+        showNotification('.main-notification-box-removing')
+
+        var strIDs = '';
+        $.each(self.deleteItems(), function(index) {
+            strIDs = strIDs + this.id + ',';
+        })
+
+        callAPI({
+            mode: 'queue',
+            name: 'delete',
+            del_files: 1,
+            value: strIDs
+        }).then(function(response) {
+            self.queueItems.removeAll(self.deleteItems());
+            self.multiEditItems.removeAll(self.deleteItems())
+            self.parent.refresh();
+            hideNotification()
+        });
+    };
+
+    // Delete all selected
    self.doMultiDelete = function() {
        // Anything selected?
        if(self.multiEditItems().length < 1) return;

-        // Need confirm
-        if(!self.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDown)) {
-            // List all the ID's
-            var strIDs = '';
-            $.each(self.multiEditItems(), function(index) {
-                strIDs = strIDs + this.id + ',';
-            })
-
-            // Show notification
-            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
-
-            // Remove
-            callAPI({
-                mode: 'queue',
-                name: 'delete',
-                del_files: 1,
-                value: strIDs
-            }).then(function(response) {
-                if(response.status) {
-                    // Make sure the queue doesnt flicker and then fade-out
-                    self.isLoading(true)
-                    self.parent.refresh()
-                    // Empty it
-                    self.multiEditItems.removeAll();
-                    // Hide notification
-                    hideNotification()
-                }
-            })
-        }
+        // Trigger modal
+        self.triggerRemoveDownload(self.multiEditItems())
    }

+    // Move all selected to top
+    self.doMultiMoveToTop = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Move each item to the top, starting from the last one in the sorted list
+        var arrayList = self.multiEditItems()
+        var movePromises = [];
+        for(var i = arrayList.length - 1; i >= 0; i--) {
+            movePromises.push(callAPI({
+                mode: "switch",
+                value: arrayList[i].id,
+                value2: 0
+            }));
+        }
+
+        // Wait for all moves to complete then refresh
+        Promise.all(movePromises).then(function() {
+            self.parent.refresh();
+        });
+    }
+
+    // Move all selected to bottom
+    self.doMultiMoveToBottom = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Move each item to the bottom, starting from the first one in the sorted list
+        var arrayList = self.multiEditItems()
+        var movePromises = [];
+        for(var i = 0; i < arrayList.length; i++) {
+            movePromises.push(callAPI({
+                mode: "switch",
+                value: arrayList[i].id,
+                value2: self.totalItems() - 1
+            }));
+        }
+
+        // Wait for all moves to complete then refresh
+        Promise.all(movePromises).then(function() {
+            self.parent.refresh();
+        });
+    }
+
+    // Focus on the confirm button
+    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
+        $('#modal-delete-queue-job .btn[type="submit"]').focus()
+    })
+
    // On change of page we need to check all those that were in the list!
    self.queueItems.subscribe(function() {
        // We need to wait until the unit is actually finished rendering
@@ -459,7 +533,7 @@ function QueueListModel(parent) {
            })

            // Update check-all buton state
-            setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+            setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
        }, 100)
    }, null, "arrayChange")
 }
@@ -479,8 +553,8 @@ function QueueModel(parent, data) {
    self.index = ko.observable(data.index);
    self.status = ko.observable(data.status);
    self.labels = ko.observableArray(data.labels);
-    self.isGrabbing = ko.observable(data.status == 'Grabbing' || data.avg_age == '-')
-    self.isFetchingBlocks = data.status == 'Fetching' || data.priority == 'Repair' // No need to update
+    self.isGrabbing = ko.observable(data.status === 'Grabbing' || !parseFloat(data.mb)) // mb===0 catches paused URL-grab jobs (status 'Paused'), needed to block show-files
+    self.isFetchingBlocks = data.status === 'Fetching' || data.priority === 'Repair' // No need to update
    self.totalMB = ko.observable(parseFloat(data.mb));
    self.remainingMB = ko.observable(parseFloat(data.mbleft))
    self.missingMB = ko.observable(parseFloat(data.mbmissing))
@@ -491,7 +565,7 @@ function QueueModel(parent, data) {
    self.priority = ko.observable(parent.priorityName[data.priority]);
    self.script = ko.observable(data.script);
    self.unpackopts = ko.observable(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-    self.pausedStatus = ko.observable(data.status == 'Paused');
+    self.pausedStatus = ko.observable(data.status === 'Paused');
    self.timeLeft = ko.observable(data.timeleft);

    // Initially empty
@@ -502,7 +576,7 @@ function QueueModel(parent, data) {
    // Color of the progress bar
    self.progressColor = ko.computed(function() {
        // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
            return '#58A9FA'
        }
        // Check for missing data, the value is arbitrary! (2%)
@@ -510,7 +584,7 @@ function QueueModel(parent, data) {
            return '#F8A34E'
        }
        // Set to grey, only when not Force download
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
            return '#B7B7B7'
        }
        // Nothing
@@ -519,6 +593,9 @@ function QueueModel(parent, data) {

    // MB's
    self.progressText = ko.pureComputed(function() {
+        if(self.isGrabbing()) {
+            return glitterTranslate.fetchingURL
+        }
        return (self.totalMB() - self.remainingMB()).toFixed(0) + " MB / " + (self.totalMB() * 1).toFixed(0) + " MB";
    })

@@ -531,23 +608,22 @@ function QueueModel(parent, data) {
        return self.name()
    })
    self.missingText = ko.pureComputed(function() {
-        // Check for missing data, the value is arbitrary! (1%)
-        if(self.missingMB()/self.totalMB() > 0.01) {
+        // Check for missing data, can show 0 if article-size is smaller than 500K, but we accept that
+        if(self.missingMB()) {
            return self.missingMB().toFixed(0) + ' MB ' + glitterTranslate.misingArt
        }
-        return;
    })
    self.statusText = ko.computed(function() {
        // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
            return glitterTranslate.checking
        }
        // Grabbing
-        if(self.status() == 'Grabbing') {
+        if(self.status() === 'Grabbing') {
            return glitterTranslate.fetch
        }
        // Pausing status
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
            return glitterTranslate.paused;
        }
        // Just the time
@@ -557,7 +633,7 @@ function QueueModel(parent, data) {
    // Icon to better show force-priority
    self.queueIcon = ko.computed(function() {
        // Force comes first
-        if(self.priority() == 2) {
+        if(self.priority() === 2) {
            return 'glyphicon-forward'
        }
        if(self.pausedStatus()) {
@@ -571,17 +647,17 @@ function QueueModel(parent, data) {
        switch(param) {
            case 'category':
                // Exception for *
-                if(self.category() == "*")
+                if(self.category() === "*")
                    return glitterTranslate.defaultText
                return self.category();
            case 'priority':
                // Onload-exception
-                if(self.priority() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value == self.priority()}).name;
+                if(self.priority() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value === self.priority()}).name;
            case 'processing':
                // Onload-exception
-                if(self.unpackopts() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value == self.unpackopts()}).name;
+                if(self.unpackopts() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value === self.unpackopts()}).name;
            case 'scripts':
                return self.script();
            case 'age':
@@ -597,7 +673,7 @@ function QueueModel(parent, data) {
        self.password(data.password);
        self.index(data.index);
        self.status(data.status)
-        self.isGrabbing(data.status == 'Grabbing' || data.avg_age == '-')
+        self.isGrabbing(data.status === 'Grabbing' || !parseFloat(data.mb))
        self.totalMB(parseFloat(data.mb));
        self.remainingMB(parseFloat(data.mbleft));
        self.missingMB(parseFloat(data.mbmissing))
@@ -608,12 +684,12 @@ function QueueModel(parent, data) {
        self.priority(parent.priorityName[data.priority]);
        self.script(data.script);
        self.unpackopts(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-        self.pausedStatus(data.status == 'Paused');
+        self.pausedStatus(data.status === 'Paused');
        self.timeLeft(data.timeleft);

        // Did the label-list change?
        // Otherwise KO will send updates to all texts during refresh()
-        if(self.rawLabels != data.labels.toString()) {
+        if(self.rawLabels !== data.labels.toString()) {
            // Update
            self.labels(data.labels);
            self.rawLabels = data.labels.toString();
@@ -638,9 +714,37 @@ function QueueModel(parent, data) {
        self.editingName(true)
        self.nameForEdit(self.name())

-        // Select
-        $(event.target).parents('.name').find('input').select()
-    }
+        // Select the input
+        const $input = $(event.target).parents('.name').find('input');
+        $input.select();
+
+        // Add Tab/Shift+Tab navigation
+        $input.off('keydown.tabnav').on('keydown.tabnav', function (e) {
+            if (e.key === 'Tab') {
+                e.preventDefault();
+
+                // Find all rename inputs that are currently visible
+                const inputs = $('.queue-table input[type="text"]');
+                const currentIndex = inputs.index(this);
+                let nextIndex = e.shiftKey ? currentIndex - 1 : currentIndex + 1;
+
+                // Wrap around
+                if (nextIndex >= inputs.length) nextIndex = 0;
+                if (nextIndex < 0) nextIndex = inputs.length - 1;
+
+                // Simulate clicking Rename on the next row
+                const $nextRow = inputs.eq(nextIndex).closest('tr');
+                $nextRow.find('.hover-button[title="Rename"]').click();
+
+                // Delay focusing to wait for new input to appear
+                setTimeout(() => {
+                    const $nextInput = $('.queue-table input[type="text"]').eq(nextIndex);
+                    $nextInput.focus().select();
+                }, 50);
+            }
+        });
+    };
+

    // Catch the submit action
    self.editingNameSubmit = function() {
@@ -650,7 +754,7 @@ function QueueModel(parent, data) {
    // Do on change
    self.nameForEdit.subscribe(function(newName) {
        // Anything change or empty?
-        if(!newName || self.name() == newName) return;
+        if(!newName || self.name() === newName) return;

        // Rename would abort Direct Unpack, so ask if user is sure
        if(self.direct_unpack() && !confirm(glitterTranslate.renameAbort)) return;
@@ -682,41 +786,39 @@ function QueueModel(parent, data) {
    }

    // Change of settings
-    self.changeCat = function(item, event) {
+    self.changeCat = function() {
        callAPI({
            mode: 'change_cat',
-            value: item.id,
-            value2: item.category()
+            value: self.id,
+            value2: self.category()
        }).then(function() {
            // Hide all tooltips before we refresh
            $('.queue-item-settings li').filter('[data-tooltip="true"]').tooltip('hide')
            self.parent.parent.refresh()
        })
    }
-    self.changeScript = function(item) {
-        // Not on empty handlers
-        if(!item.script() || parent.scriptsList().length <= 1) return;
+    self.changeScript = function() {
        callAPI({
            mode: 'change_script',
-            value: item.id,
-            value2: item.script()
+            value: self.id,
+            value2: self.script()
        })
    }
-    self.changeProcessing = function(item) {
+    self.changeProcessing = function() {
        callAPI({
            mode: 'change_opts',
-            value: item.id,
-            value2: item.unpackopts()
+            value: self.id,
+            value2: self.unpackopts()
        })
    }
-    self.changePriority = function(item, event) {
+    self.changePriority = function() {
        // Not if we are fetching extra blocks for repair!
-        if(item.isFetchingBlocks) return
+        if(self.isFetchingBlocks) return
        callAPI({
            mode: 'queue',
            name: 'priority',
-            value: item.id,
-            value2: item.priority()
+            value: self.id,
+            value2: self.priority()
        }).then(function() {
            // Hide all tooltips before we refresh
            $('.queue-item-settings li').filter('[data-tooltip="true"]').tooltip('hide')
@@ -724,29 +826,5 @@ function QueueModel(parent, data) {
        })
    }

-    // Remove 1 download from queue
-    self.removeDownload = function(item, event) {
-        // Confirm and remove
-        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.deleteMsg + ":\n" + item.name() + "\n\n" + glitterTranslate.removeDow1)) {
-            var itemToDelete = this;

-            // Show notification
-            showNotification('.main-notification-box-removing')
-
-            callAPI({
-                mode: 'queue',
-                name: 'delete',
-                del_files: 1,
-                value: item.id
-            }).then(function(response) {
-                // Make sure no flickering (if there are more items left) and then remove
-                self.parent.isLoading(self.parent.totalItems() > 1)
-                parent.queueItems.remove(itemToDelete);
-                parent.multiEditItems.remove(function(inList) { return inList.id == itemToDelete.id; })
-                self.parent.parent.refresh();
-                // Hide notifcation
-                hideNotification()
-            });
-        }
-    };
 }
@@ -0,0 +1,12 @@
+/*
+ * jQuery Hotkeys Plugin
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Based upon the plugin by Tzury Bar Yochay:
+ * https://github.com/tzuryby/jquery.hotkeys
+ *
+ * Original idea by:
+ * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+ */
+!function(c){function e(e){var o,f;"string"==typeof e.data&&(e.data={keys:e.data}),e.data&&e.data.keys&&"string"==typeof e.data.keys&&(o=e.handler,f=e.data.keys.toLowerCase().split(" "),e.handler=function(a){if(this===a.target||!(/textarea|select/i.test(a.target.nodeName)||c.hotkeys.options.filterTextInputs&&-1<c.inArray(a.target.type,c.hotkeys.textAcceptingInputTypes))){var s="keypress"!==a.type&&c.hotkeys.specialKeys[a.which],e=String.fromCharCode(a.which).toLowerCase(),r="",t={};c.each(["alt","ctrl","shift"],function(e,t){a[t+"Key"]&&s!==t&&(r+=t+"+")}),a.metaKey&&!a.ctrlKey&&"meta"!==s&&(r+="meta+"),a.metaKey&&"meta"!==s&&-1<r.indexOf("alt+ctrl+shift+")&&(r=r.replace("alt+ctrl+shift+","hyper+")),s?t[r+s]=!0:(t[r+e]=!0,t[r+c.hotkeys.shiftNums[e]]=!0,"shift+"===r&&(t[c.hotkeys.shiftNums[e]]=!0));for(var i=0,n=f.length;i<n;i++)if(t[f[i]])return o.apply(this,arguments)}})}c.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",10:"return",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",59:";",61:"=",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},shiftNums:{"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":": ","'":'"',",":"<",".":">","/":"?","\\":"|"},textAcceptingInputTypes:["text","password","number","email","url","range","date","month","week","time","datetime","datetime-local","search","color","tel"],options:{filterTextInputs:!0}},c.each(["keydown","keyup","keypress"],function(){c.event.special[this]={add:e}})}(jQuery||this.jQuery||window.jQuery);
@@ -1,15 +1,3 @@
-ko.bindingHandlers.truncatedText = {
-    update: function(element, valueAccessor, allBindingsAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        if (!value) return
-        var length = ko.utils.unwrapObservable(allBindingsAccessor().length) || ko.bindingHandlers.truncatedText.defaultLength,
-            truncatedValue = value.length > length ? convertHTMLtoText(value.substring(0, Math.min(value.length, length))) + "&hellip;" : convertHTMLtoText(value);
-        ko.bindingHandlers.html.update(element, function() {
-            return truncatedValue;
-        });
-    },
-    defaultLength: 15
-};
 ko.bindingHandlers.truncatedTextCenter = {
    update: function(element, valueAccessor, allBindingsAccessor) {
        var value = ko.utils.unwrapObservable(valueAccessor())
@@ -33,10 +21,8 @@ ko.bindingHandlers.longText = {
        // Input is an array
        var value = ko.utils.unwrapObservable(valueAccessor())

-        // Convert HTML entities for all but the Script (because of the (more)-link)
-        if(allBindingsAccessor.get('longTextType') != "Script") {
-            value = value.map(convertHTMLtoText)
-        }
+        // Escape HTML in the source lines (the markup below is added afterwards)
+        value = value.map(convertHTMLtoText)

        // Any <br>'s?
        var outputText = '';
@@ -0,0 +1,317 @@
+/*!
+ * search-search-query-parser.js
+ * Copyright(c) 2014-2019
+ * MIT Licensed
+ *
+ * Modified for SABnzbd use!
+ * Adapted to use without NPM.
+ */
+
+function search_query_parse(string, options) {
+    // Set a default options object when none is provided
+    if (!options) {
+        options = {offsets: true};
+    } else {
+        // If options offsets was't passed, set it to true
+        options.offsets = (typeof options.offsets === 'undefined' ? true : options.offsets)
+    }
+
+    if (!string) {
+        string = '';
+    }
+
+    // When no keywords or ranges set, treat as a simple string
+    else if (!options.keywords && !options.ranges && !options.tokenize) {
+        return string;
+    }
+    // Otherwise parse the advanced query syntax
+    else {
+        // Our object to store the query object
+        var query = {text: []};
+        // When offsets is true, create their array
+        if (options.offsets) {
+            query.offsets = [];
+        }
+        var exclusion = {};
+        var terms = [];
+        // Get a list of search terms respecting single and double quotes
+        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|\S+|\S+:\S+/g;
+        /*
+        Removed exclusion matching for SABnzbd, original regex:
+        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|(-?"(?:[^"\\]|\\.)*")|(-?'(?:[^'\\]|\\.)*')|\S+|\S+:\S+/g;
+        See: https://github.com/sabnzbd/sabnzbd/issues/2342
+         */
+        var match;
+        while ((match = regex.exec(string)) !== null) {
+            var term = match[0];
+            var sepIndex = term.indexOf(':');
+            if (sepIndex !== -1) {
+                var split = term.split(':'),
+                    key = term.slice(0, sepIndex),
+                    val = term.slice(sepIndex + 1);
+                // Strip surrounding quotes
+                val = val.replace(/^\"|\"$|^\'|\'$/g, '');
+                // Strip backslashes respecting escapes
+                val = (val + '').replace(/\\(.?)/g, function (s, n1) {
+                    switch (n1) {
+                        case '\\':
+                            return '\\';
+                        case '0':
+                            return '\u0000';
+                        case '':
+                            return '';
+                        default:
+                            return n1;
+                    }
+                });
+                terms.push({
+                    keyword: key,
+                    value: val,
+                    offsetStart: match.index,
+                    offsetEnd: match.index + term.length
+                });
+            } else {
+                var isExcludedTerm = false;
+                /*
+                    Removed for SABnzbd
+                    See: https://github.com/sabnzbd/sabnzbd/issues/2342
+
+                if (term[0] === '-') {
+                    isExcludedTerm = true;
+                    term = term.slice(1);
+                }
+                */
+
+                // Strip surrounding quotes
+                term = term.replace(/^\"|\"$|^\'|\'$/g, '');
+                // Strip backslashes respecting escapes
+                term = (term + '').replace(/\\(.?)/g, function (s, n1) {
+                    switch (n1) {
+                        case '\\':
+                            return '\\';
+                        case '0':
+                            return '\u0000';
+                        case '':
+                            return '';
+                        default:
+                            return n1;
+                    }
+                });
+
+                if (isExcludedTerm) {
+                    if (exclusion['text']) {
+                        if (exclusion['text'] instanceof Array) {
+                            exclusion['text'].push(term);
+                        } else {
+                            exclusion['text'] = [exclusion['text']];
+                            exclusion['text'].push(term);
+                        }
+                    } else {
+                        // First time seeing an excluded text term
+                        exclusion['text'] = term;
+                    }
+                } else {
+                    terms.push({
+                        text: term,
+                        offsetStart: match.index,
+                        offsetEnd: match.index + term.length
+                    });
+                }
+            }
+        }
+        // Reverse to ensure proper order when pop()'ing.
+        terms.reverse();
+        // For each search term
+        var term;
+        while (term = terms.pop()) {
+            // When just a simple term
+            if (term.text) {
+                // We add it as pure text
+                query.text.push(term.text);
+                // When offsets is true, push a new offset
+                if (options.offsets) {
+                    query.offsets.push(term);
+                }
+            }
+            // We got an advanced search syntax
+            else {
+                var key = term.keyword;
+                // Check if the key is a registered keyword
+                options.keywords = options.keywords || [];
+                var isKeyword = false;
+                var isExclusion = false;
+                if (!/^-/.test(key)) {
+                    isKeyword = !(-1 === options.keywords.indexOf(key));
+                } else if (key[0] === '-') {
+                    var _key = key.slice(1);
+                    isKeyword = !(-1 === options.keywords.indexOf(_key))
+                    if (isKeyword) {
+                        key = _key;
+                        isExclusion = true;
+                    }
+                }
+
+                // Check if the key is a registered range
+                options.ranges = options.ranges || [];
+                var isRange = !(-1 === options.ranges.indexOf(key));
+                // When the key matches a keyword
+                if (isKeyword) {
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push({
+                            keyword: key,
+                            value: term.value,
+                            offsetStart: isExclusion ? term.offsetStart + 1 : term.offsetStart,
+                            offsetEnd: term.offsetEnd
+                        });
+                    }
+
+                    var value = term.value;
+                    // When value is a thing
+                    if (value.length) {
+                        // Get an array of values when several are there
+                        var values = value.split(',');
+                        if (isExclusion) {
+                            if (exclusion[key]) {
+                                // ...many times...
+                                if (exclusion[key] instanceof Array) {
+                                    // ...and got several values this time...
+                                    if (values.length > 1) {
+                                        // ... concatenate both arrays.
+                                        exclusion[key] = exclusion[key].concat(values);
+                                    } else {
+                                        // ... append the current single value.
+                                        exclusion[key].push(value);
+                                    }
+                                }
+                                // We saw that keyword only once before
+                                else {
+                                    // Put both the current value and the new
+                                    // value in an array
+                                    exclusion[key] = [exclusion[key]];
+                                    exclusion[key].push(value);
+                                }
+                            }
+                            // First time we see that keyword
+                            else {
+                                // ...and got several values this time...
+                                if (values.length > 1) {
+                                    // ...add all values seen.
+                                    exclusion[key] = values;
+                                }
+                                // Got only a single value this time
+                                else {
+                                    // Record its value as a string
+                                    if (options.alwaysArray) {
+                                        // ...but we always return an array if option alwaysArray is true
+                                        exclusion[key] = [value];
+                                    } else {
+                                        // Record its value as a string
+                                        exclusion[key] = value;
+                                    }
+                                }
+                            }
+                        } else {
+                            // If we already have seen that keyword...
+                            if (query[key]) {
+                                // ...many times...
+                                if (query[key] instanceof Array) {
+                                    // ...and got several values this time...
+                                    if (values.length > 1) {
+                                        // ... concatenate both arrays.
+                                        query[key] = query[key].concat(values);
+                                    } else {
+                                        // ... append the current single value.
+                                        query[key].push(value);
+                                    }
+                                }
+                                // We saw that keyword only once before
+                                else {
+                                    // Put both the current value and the new
+                                    // value in an array
+                                    query[key] = [query[key]];
+                                    query[key].push(value);
+                                }
+                            }
+                            // First time we see that keyword
+                            else {
+                                // ...and got several values this time...
+                                if (values.length > 1) {
+                                    // ...add all values seen.
+                                    query[key] = values;
+                                }
+                                // Got only a single value this time
+                                else {
+                                    if (options.alwaysArray) {
+                                        // ...but we always return an array if option alwaysArray is true
+                                        query[key] = [value];
+                                    } else {
+                                        // Record its value as a string
+                                        query[key] = value;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // The key allows a range
+                else if (isRange) {
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push(term);
+                    }
+
+                    var value = term.value;
+                    // Range are separated with a dash
+                    var rangeValues = value.split('-');
+                    // When both end of the range are specified
+                    // keyword:XXXX-YYYY
+                    query[key] = {};
+                    if (2 === rangeValues.length) {
+                        query[key].from = rangeValues[0];
+                        query[key].to = rangeValues[1];
+                    }
+                        // When pairs of ranges are specified
+                    // keyword:XXXX-YYYY,AAAA-BBBB
+                    else if (!rangeValues.length % 2) {
+                    }
+                        // When only getting a single value,
+                    // or an odd number of values
+                    else {
+                        query[key].from = value;
+                    }
+                } else {
+                    // We add it as pure text
+                    var text = term.keyword + ':' + term.value;
+                    query.text.push(text);
+
+                    // When offsets is true, push a new offset
+                    if (options.offsets) {
+                        query.offsets.push({
+                            text: text,
+                            offsetStart: term.offsetStart,
+                            offsetEnd: term.offsetEnd
+                        });
+                    }
+                }
+            }
+        }
+
+        // Concatenate all text terms if any
+        if (query.text.length) {
+            if (!options.tokenize) {
+                query.text = query.text.join(' ').trim();
+            }
+        }
+        // Just remove the attribute text when it's empty
+        else {
+            delete query.text;
+        }
+
+        // Return forged query object
+        query.exclude = exclusion;
+        return query;
+    }
+
+}
+
@@ -1 +1 @@
-@import url('Night.css') screen and (prefers-color-scheme: dark);
+/* Placeholder — themes live in glitter.css; this file only populates the scheme dropdown */
@@ -1,280 +1 @@
-body,
-.modal-backdrop {
-    background-color: black;
-    color: #EBEBEB
-}
-
-nav {
-    background-color: #444444 !important;
-    border: 0 !important;
-    border-bottom: 1px solid black !important;
-}
-
-nav .btn {
-    background-color: #E4E4E4;
-    border-color: #5D5D5D !important;
-}
-
-@media (max-width: 767px) {
-    nav {
-        background-color: black !important;
-    }
-}
-
-a, a:active, a:hover, a:focus,
-.hover-button.glyphicon-play,
-.hover-button.glyphicon-stop,
-.dropdown-menu>li>a,
-legend,
-#modal-options legend label,
-#modal-options legend a,
-#modal-item-files .item-files-table .progress small,
-#modal-options .options-switch label,
-#modal-options #options-orphans .process-all-orphaned,
-.text-muted {
-    color: #EBEBEB;
-}
-
-.dropdown-menu>li>a:hover,
-.dropdown-menu>li>a:focus,
-.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,
-.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,
-#feedback-slider {
-    background-color: #555555;
-    color: white !important;
-}
-
-.main-restarting,
-.main-filedrop,
-.nav-tabs>li>a {
-    color: white !important;
-}
-
-.hover-button,
-.fileControls a:hover {
-    opacity: 0.7;
-}
-
-.form-control[disabled] {
-    opacity: 0.65;
-}
-
-.progress {
-    background-color: #DADADA;
-}
-
-.main-notification-box {
-    background-color: #727272;
-    border-color: #252525 !important;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-}
-
-.container,
-.modal-body,
-.modal-footer {
-    background-color: #727272;
-}
-
-.dropdown-menu,
-.navbar-collapse.in .dropdown-menu {
-    background-color: #666;
-}
-
-.navbar-collapse.in .dropdown-menu {
-    border: none;
-}
-
-.max-speed-input-clear,
-.max-speed-input-clear:hover,
-.nav-tabs>li>a:hover,
-.fileControls a {
-    color: black;
-}
-
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:focus,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li>a:hover {
-    background-color: #ddd;
-    color: #555 !important;
-    box-shadow: 0px -1px 1px 1px rgba(0,0,0,0.15);
-}
-
-.processing-download > div {
-    background-color: #EBEBEB;
-}
-
-.table-striped>tbody>tr:nth-child(odd),
-.table>tbody>tr:nth-child(odd),
-.multioperations-selector,
-.pagination li.active span,
-.pagination li span:hover,
-.dropdown-menu .divider,
-.history-queue-swicher .badge {
-    background-color: #444444;
-    color: #EBEBEB;
-}
-
-table,
-.table-striped>tbody>tr:nth-child(even),
-.table>tbody>tr:nth-child(even),
-.table th,
-.pagination li span,
-.pagination>.disabled>span,
-.pagination>.disabled>span:hover,
-.search-box input,
-input,
-input.form-control,
-.input-group-addon,
-select.form-control,
-.main-content .btn-default,
-.modal-body .btn-default,
-.modal-footer .btn-default,
-.btn-default.disabled:hover,
-.btn-default.disabled:active,
-.btn-default.disabled:focus,
-.form-control[disabled],
-#modal-options .options-function-box .input-group-addon {
-    background-color: #555555;
-    color: #EBEBEB;
-}
-
-/* Needed to force the text-color */
-.table-striped>tbody>tr:nth-child(odd)>td,
-.table>tbody>tr:nth-child(odd)>td,
-.table-striped>tbody>tr:nth-child(even)>td,
-.table>tbody>tr:nth-child(even)>td {
-    color: #EBEBEB;
-}
-
-/* Hovering the queue and the history */
-.table>tbody>tr:hover {
-    background-color: #666;
-}
-
-.table,
-tr td,
-tbody>tr>td:last-child,
-tbody>tr>td:first-child,
-tbody>tr:last-child td,
-.table-messages .table-messages-remove,
-.multioperations-selector,
-.pagination li span,
-.pagination li a,
-.search-box input,
-input,
-input.form-control,
-.input-group-addon,
-.search-box input:focus,
-.search-box input:valid,
-select.form-control,
-#modal-options .table-server-connections th,
-.main-content .btn-default,
-.modal-body .btn-default,
-.modal-footer .btn-default,
-.queue .table-active-sorting {
-    border-color: #252525 !important;
-}
-
-
-.history-failed-download td.status,
-.retry-buttontext,
-.retry-button, .retry-button-inactive,
-.history-options-show-failed,
-.queue-error-info,
-.options-bad-status,
-.history-failed-download:hover .retry-button .glyphicon:before,
-.retry-button:hover .glyphicon:before {
-    color: #F95151 !important;
-}
-
-.ui-sortable-helper td {
-    background-color: #555555 !important;
-}
-
-tbody .caret {
-    border-top-color: #EBEBEB !important;
-}
-
-.info-container,
-#modal-options .options-status-box small,
-#modal-options #options-status small,
-#modal-options .tab-content h4 {
-    color: #D6D6D6;
-}
-
-td.name .name-icons span,
-.navbar-nav .open .dropdown-menu>li>a,
-.dropdown-header,
-#modal-help small,
-.hover-button.glyphicon-forward,
-pre {
-    color: #EBEBEB !important;
-    opacity: 1 !important;
-}
-
-legend,
-hr {
-    border-color: #C6C6C6 !important;
-}
-
-.ui-slider .ui-slider-handle {
-    background-color: #969696;
-    border-color: #969696
-}
-
-#modal-help table td,
-#modal-help table {
-    background-color: transparent;
-}
-
-#modal-item-files .item-files-table td {
-    border-bottom: none !important;
-}
-
-#modal-item-files .item-files-table {
-    border-bottom: 1px solid black;
-}
-
-.history-queue-swicher .nav-tabs>li>a,
-.history-queue-swicher .nav-tabs>li.active>a  {
-    border-bottom: none;
-    margin-bottom: 1px;
-}
-
-.queue-item .dropdown-menu:after,
-.history-item .dropdown-menu:after,
-.info-container-box-sorting .dropdown-menu:after {
-    border-bottom-color: #666;
-}
-
-.container-compact .progress,
-.container-compact .queue .progress-bar {
-    box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 1);
-}
-
-.modal-content {
-    border-color: #727272;
-    border-top: none;
-}
-
-.form-control:focus,
-input[type="submit"]:focus,
-button:focus {
-    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
-    outline: initial;
-}
-
-/* Placeholders - Will not work if grouped! */
-::-webkit-input-placeholder {
-   color: #EBEBEB !important;
-}
-
-::-moz-placeholder {
-   color: #EBEBEB !important;
-   opacity: 1 !important;
-}
-
-:-ms-input-placeholder {
-   color: #EBEBEB !important;
-}
+/* Placeholder — themes live in glitter.css; this file only populates the scheme dropdown */
@@ -7,6 +7,10 @@
    padding-right: 8px;
 }

+.container-full-width .container {
+    width: 100%;
+}
+
 .main-navbar {
    margin-top: 0;
    padding: 0;
@@ -18,7 +22,8 @@

 .main-content {
    border: 0;
-    margin-bottom: 0 !important;
+    margin: 0;
+    padding: 0;
 }

 .main-menu-link .icon-bar:first-child {
@@ -70,6 +75,10 @@ h2 {
    QUEUE & HISTORY
 **/

+.history-queue-swicher {
+    margin-bottom: 0;
+}
+
 .info-container {
    margin-top: 0px;
    margin-bottom: 10px;
@@ -91,13 +100,6 @@ h2 {
    white-space: pre;
 }

-.info-container .info-container-box-sorting {
-    position: absolute;
-    right: 10px;
-    top: 0px;
-    font-size: 1em;
-}
-
 .queue-table .table-header-progress {
    width: 0%;
 }
@@ -124,7 +126,7 @@ h2 {
 }

 .queue-table .progress {
-    margin: 0px 8px;
+    margin: 0px 15px;
 }

 .queue-table td.name .row-wrap-text,
@@ -147,6 +149,9 @@ tr.queue-item>td:first-child>a {

 .queue-table td.name .name-options {
    display: inline-block;
+    opacity: 1;
+    pointer-events: auto;
+    position: static;
 }

 .queue-table td.name .name-options small {
@@ -163,7 +168,7 @@ tr.queue-item>td:first-child>a {
 }

 .multioperations-selector .add-nzb-inputbox-small {
-    width: 72px;
+    width: 115px;
 }

 .multioperations-selector .add-nzb-inputbox-clear {
@@ -180,14 +185,6 @@ tr.queue-item>td:first-child>a {
    min-width: 0px;
 }

-.history-table .history-ratings {
-    display: none;
-}
-
-.name-has-ratings .row-wrap-text {
-    max-width: calc(100% - 1px) !important;
-}
-
 .history-table .delete .dropdown-menu {
    width: 100%;
    left: 0;
@@ -278,4 +275,4 @@ tr.queue-item>td:first-child>a {
 #modal-item-files .form-group {
    clear: left;
    margin-bottom: 5px;
-}
+}
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2009 The SABnzbd-Team (sabnzbd.org)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -1,13 +1,19 @@
 <!DOCTYPE html>
-<html lang="$active_lang">
+<html lang="$active_lang" data-color-scheme="$color_scheme">
    <head>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <title>$T('wizard-quickstart')</title>
-        <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version"/>
-        <link rel="stylesheet" type="text/css" href="static/style.css?v=$version"/>
-        <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
-        <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
-        <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
+        <link rel="stylesheet" type="text/css" href="$url('staticcfg/bootstrap/css/bootstrap.min.css', v=$cache_buster)"/>
+        <link rel="stylesheet" type="text/css" href="$url('wizard/static/style.css', v=$cache_buster)"/>
+        <link rel="shortcut icon" href="$url('staticcfg/ico/favicon.ico', v=$cache_buster)" />
+        <script type="text/javascript" src="$url('staticcfg/js/jquery-3.7.1.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript" src="$url('staticcfg/bootstrap/js/bootstrap.min.js', v=$cache_buster)"></script>
+        <script type="text/javascript">
+            var csrfToken = "$csrf_token";
+            $.ajaxSetup({
+                headers: { "X-SABnzbd-CSRF": csrfToken }
+            });
+        </script>
    </head>
    <body>
        <div id="logo">
@@ -1,5 +1,6 @@
 <!--#include $webdir + "/inc_top.tmpl"#-->
-<form action="./one" method="post">
+<form action="$url('wizard/one')" method="post">
+<input type="hidden" name="csrf_token" value="$csrf_token" />
    <div class="container">
        <div id="inner">
            <div id="content" class="bigger">
@@ -26,16 +27,18 @@
            </div>
            <hr />
            <div class="row">
-                <div class="col-xs-4 text-center">
-                    <a class="btn btn-danger" href="../shutdown/?apikey=$apikey&amp;pid=$pid"><span class="glyphicon glyphicon-remove"></span> $T('wizard-exit')</a>
+                <div class="col-md-4 text-center">
+                    <button class="btn btn-danger" type="submit" form="shutdown-form"><span class="glyphicon glyphicon-remove"></span> $T('wizard-exit')</button>
                </div>
-                <div class="col-xs-4 text-center">
+                <div class="col-md-4 text-center">
+                    <a class="btn btn-default" href="$url('config/general#config_backup_file')"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</a>
                </div>
-                <div class="col-xs-4 text-center">
+                <div class="col-md-4 text-center">
                    <button class="btn btn-default">$T('wizard-start') <span class="glyphicon glyphicon-chevron-right"></span></button>
                </div>
            </div>
        </div>
    </div>
 </form>
+<form id="shutdown-form" method="post" action="$url('shutdown')"><input type="hidden" name="csrf_token" value="$csrf_token" /></form>
 <!--#include $webdir + "/inc_bottom.tmpl"#-->
@@ -1,5 +1,6 @@
 <!--#include $webdir + "/inc_top.tmpl"#-->
-<form action="./two" method="post" autocomplete="off">
+<form action="$url('wizard/two')" method="post" autocomplete="off">
+<input type="hidden" name="csrf_token" value="$csrf_token" />
    <div class="container">
        <div id="inner">
            <div id="content" class="bigger">
@@ -7,7 +8,9 @@
                <h1>$T('wizard-quickstart')</h1>
                <hr />
                <script type="text/javascript">
+                    var txtTestServer = "$T('wizard-server-text')";
                    var txtChecking = "$T('srv-testing')";
+                    var txtTestRequired = "$T('wizard-test-server-required')";
                    <!--#include raw $webdir + "/static/javascript/checkserver.js"#-->
                </script>
                <h3>$T('wizard-server')</h3>
@@ -15,12 +18,14 @@

                <br /><br />

+                <input type="hidden" name="server" value="$server" />
+
                <div class="row">
                    <div class="col-md-7 form-horizontal">
                        <div class="form-group">
                            <label for="host" class="col-sm-4 control-label">$T('srv-host')</label>
                            <div class="col-sm-8">
-                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" />
+                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" required />
                            </div>
                        </div>
                        <div class="form-group">
@@ -46,7 +51,7 @@
                        <div class="form-group">
                            <div class="col-sm-4"></div>
                            <div class="col-sm-8">
-                                <a href="#" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
+                                <a href="#" class="wizard-advanced-settings" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
                                    <span class="glyphicon glyphicon-cog"></span> $T('button-advanced')
                                </a>
                            </div>
@@ -55,32 +60,40 @@
                            <div class="form-group">
                                <label for="port" class="col-sm-4 control-label">$T('srv-port')</label>
                                <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '119' #-->" />
+                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" min="0" max="65535" required />
                                </div>
                            </div>
                            <div class="form-group">
                                <label for="connections" class="col-sm-4 control-label">$T('srv-connections')</label>
                                <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
+                                    <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '16'#-->" min="1" max="500" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" required />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="pipelining_requests" class="col-sm-4 control-label">$T('srv-pipelining_requests')</label>
+                                <div class="col-sm-8">
+                                    <input type="number" class="form-control" name="pipelining_requests" id="pipelining_requests" value="$pipelining_requests" min="1" max="20" required />
                                </div>
                            </div>
                            <div class="form-group">
                                <label for="ssl_verify" class="col-sm-4 control-label">$T('opt-ssl_verify')</label>
                                <div class="col-sm-8">
-                                    <select name="ssl_verify" id="ssl_verify" class="form-control" <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#-->>
-                                        <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
-                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                                    <select name="ssl_verify" id="ssl_verify" class="form-control">
+                                        <option value="3" <!--#if $ssl_verify == 3 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                        <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-medium')</option>
+                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-minimal')</option>
                                        <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                                    </select>
+                                    <span class="desc">$T('explain-ssl_verify').replace('-', '<br/>-')</span>
                                </div>
                            </div>
                        </div>
                        <div class="row">
                            <div class="col-sm-4">
-                                <button id="serverTest" class="btn btn-default"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
+                                <button id="serverTest" class="btn btn-default" data-toggle="tooltip" data-placement="left" aria-busy="false"><span class="glyphicon glyphicon-sort" aria-hidden="true"></span> $T('wizard-button-testServer')</button>
                            </div>
                            <div class="col-sm-8">
-                                <div id="serverResponse" class="well well-sm">$T('wizard-server-text')</div>
+                                <div id="serverResponse" class="well well-sm" role="status" aria-live="polite" aria-atomic="true">$T('wizard-server-text')</div>
                            </div>
                        </div>

@@ -90,12 +103,12 @@
                        <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$active_lang"></iframe>
                    </div>
                </div>
-                <input type="hidden" name="apikey" value="$apikey" />
+                <input type="hidden" name="enable" value="1">
            </div>
            <hr />
            <div class="row">
                <div class="col-xs-4 text-center">
-                    <a class="btn btn-default" href="./index"><span class="glyphicon glyphicon-chevron-left"></span> $T('wizard-previous')</a>
+                    <a class="btn btn-default" href="$url('wizard')"><span class="glyphicon glyphicon-chevron-left"></span> $T('wizard-previous')</a>
                </div>
                <div class="col-xs-4 text-center">
                </div>
@@ -1,9 +1,31 @@
+// Variable to track server test results
+var serverTestSuccessful = false;
+
+function resetTestResult() {
+    serverTestSuccessful = false;
+    $('#serverResponse').html(txtTestServer);
+    checkRequired();
+}
+
+function setTestResult(success) {
+    serverTestSuccessful = success;
+    checkRequired();
+}
+
 function checkRequired() {
-    if ($("#host").val() && $("#connections").val()) {
+    // Check if form is valid using HTML5 validation and if server test passed
+    if ($("form").get(0).checkValidity() && serverTestSuccessful) {
        $("#next-button").removeClass('disabled')
+        $("#next-button").removeAttr('data-toggle')
+        $("#next-button").removeAttr('title')
+        $("#next-button").tooltip('destroy')
        return true;
    } else {
        $("#next-button").addClass('disabled')
+        $("#next-button").attr('data-toggle', 'tooltip')
+        $("#next-button").attr('data-placement', 'left')
+        $("#next-button").attr('title', txtTestRequired)
+        $("#next-button").tooltip()
        return false;
    }
 }
@@ -12,67 +34,61 @@ $(document).ready(function() {
    // Add tooltips
    $('[data-toggle="tooltip"]').tooltip()

-    // On form-submit
+    // On server test button click
    $("#serverTest").click(function() {
+        // Check HTML5 form validation before testing server
+        if (!$("form").get(0).reportValidity()) {
+            return false;
+        }
+        
+        $('#serverTest').attr('aria-busy', 'true');
        $('#serverResponse').html(txtChecking);
-        $.getJSON(
-            "../api?mode=config&name=test_server&output=json",
-            $("form").serialize(),
-            function(result) {
+        $.ajax({
+            type: 'POST',
+            url: "../api?mode=config&name=test_server&output=json",
+            data: $("form").serialize(),
+            success: function(result) {
                if (result.value.result) {
-                    r = '<span class="success"><span class="glyphicon glyphicon-ok"></span> ' + result.value.message + '</span>';
+                    r = '<span class="success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> ' + result.value.message + '</span>';
+                    setTestResult(true);
                } else {
-                    r = '<span class="failed"><span class="glyphicon glyphicon-minus-sign"></span> ' + result.value.message + '</span>';
+                    r = '<span class="failed"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ' + result.value.message + '</span>';
+                    setTestResult(false);
                }
                r = r.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="failed" target="_blank">https://sabnzbd.org/certificate-errors</a>')
                $('#serverResponse').html(r);
+                $('#serverTest').attr('aria-busy', 'false');
            }
-        );
+        });
        return false;
    });

-    $("#port, #connections").bind('keyup blur', function() {
-        if (this.value > 0) {
-            $(this).removeClass("incorrect");
-            $(this).addClass("correct");
-        } else {
-            $(this).removeClass("correct");
-            $(this).addClass("incorrect");
-        }
-        checkRequired()
-    });
-
-    $("#host, #username, #password").bind('keyup blur', function() {
-        if (this.value) {
-            $(this).removeClass("incorrect");
-            $(this).addClass("correct");
-        } else {
-            $(this).removeClass("correct");
-            $(this).addClass("incorrect");
-        }
-        checkRequired();
+    // Reset test result when any form field changes
+    $("#host, #username, #password, #port, #connections, #ssl_verify").bind('input change', function() {
+        resetTestResult();
    });

    $('#ssl').click(function() {
        if(this.checked) {
            // Enabled SSL change port when not already a custom port
-            if($('#port').val() == '119') {
+            if($('#port').val() === '119') {
                $('#port').val('563')
            }
        } else {
            // Remove SSL port
-            if($('#port').val() == '563') {
+            if($('#port').val() === '563') {
                $('#port').val('119')
            }
        }
+        resetTestResult();
    })

    checkRequired()

    $('form').submit(function(event) {
-        // Double check
-        if(!checkRequired()) {
+        // Check if server test passed (HTML5 validation is automatic)
+        if(!serverTestSuccessful) {
            event.preventDefault();
        }
    })
-});
+});
@@ -1,16 +1,50 @@
+:root {
+    /* Border radius scale */
+    --radius-sm: 4px;   /* small elements: progress bars */
+    --radius-md: 6px;   /* search bar, multi-edit toolbar, file controls */
+    --radius-lg: 8px;   /* cards, modals, notification box */
+
+    /* Follow the OS by default (Auto); forced by data-color-scheme below */
+    color-scheme: light dark;
+
+    /* Color palette — light-dark(light value, dark value) */
+    --clr-page-bg:       light-dark(#E4E4E4, black);
+    --clr-surface:       light-dark(#FFFFFF, #303030);
+    --clr-surface-alt:   light-dark(#F5F5F5, #444444);
+    --clr-surface-hover: light-dark(#E4E4E4, #666666);
+    --clr-border:        light-dark(rgba(0, 0, 0, 0.2), #555555);
+    --clr-text:          light-dark(#000000, #EBEBEB);
+    --clr-text-muted:    light-dark(#777777, #c7c7c7);
+    --clr-link:          light-dark(#555555, #63a7e1);
+    --clr-input-bg:      light-dark(#FFFFFF, #555555);
+    --clr-input-border:  light-dark(#cccccc, #252525);
+    --clr-toggle-active:   #f9ca33;
+    --clr-toggle-inactive: light-dark(#aaaaaa, #666666);
+}
+
+/* The server renders the configured scheme into this attribute; empty/unknown = Auto */
+html[data-color-scheme="light" i] {
+    color-scheme: light;
+}
+
+html[data-color-scheme="night" i] {
+    color-scheme: dark;
+}
+
 body {
-    background-color: #E4E4E4;
+    background-color: var(--clr-page-bg);
+    color: var(--clr-text);
    text-align: center;
 }
 .container {
    max-width: 1000px;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    background-color: #fff;
    text-align: left;
 }
 #inner {
-    background-color: #fff;
    padding: 4px 32px 20px 32px;
+    border: 1px solid var(--clr-border);
+    border-radius: var(--radius-lg);
+    background-color: var(--clr-surface);
 }
 #content {
    min-height: 550px;
@@ -33,7 +67,7 @@ body {
    float: left;
 }
 .language:hover {
-    background-color: #E4E4E4;
+    background-color: var(--clr-surface-hover);
 }
 .float {
    float: left;
@@ -51,7 +85,7 @@ body {
    padding: 12px;
    margin-top: 1px;
    margin-bottom: 15px;
-    background-color: #f5f5f5;
+    background-color: var(--clr-surface-alt);
 }
 .quoteBlock a,
 a[target="_blank"] {
@@ -62,10 +96,10 @@ a[target="_blank"] {
    color: #00cc22;
 }
 .failed {
-    color: red !important;
+    color: light-dark(red, #ff3333) !important;
 }
 #rightGreyText {
-    color: #ccc;
+    color: light-dark(#cccccc, #c7c7c7);
    width: 100%;
    text-align: right;
    padding-top: 3px;
@@ -80,6 +114,39 @@ label {
 .input-checkbox {
    padding-top: 7px !important;
 }
+/* Toggle switch */
+input[type="checkbox"] {
+    appearance: none;
+    -webkit-appearance: none;
+    display: inline-block;
+    vertical-align: middle;
+    margin: 0;
+    width: 36px;
+    height: 20px;
+    background-color: var(--clr-toggle-inactive);
+    background-image:
+        radial-gradient(circle at 10px 10px, #ffffff 6.5px, rgba(255,255,255,0) 7px),
+        radial-gradient(circle at 11px 11px, rgba(0,0,0,0.30) 6.5px, transparent 9.5px);
+    background-size: 20px 20px;
+    background-repeat: no-repeat;
+    background-position: 0px center;
+    border-radius: 10px;
+    border: none;
+    cursor: pointer;
+    transition: background-color 0.2s, background-position 0.15s;
+}
+input[type="checkbox"]:checked {
+    background-color: var(--clr-toggle-active);
+    background-position: 16px center;
+    background-image:
+        radial-gradient(circle at 10px 10px, #ffffff 6.5px, rgba(255,255,255,0) 7px),
+        radial-gradient(circle at 10.5px 10.5px, rgba(0,0,0,0.30) 6.5px, transparent 9.5px);
+}
+input[type="checkbox"]:focus-visible {
+    outline: 2px solid var(--clr-toggle-active);
+    outline-offset: 2px;
+    border-radius: 10px;
+}
 .input-checkbox input+.help-block {
    display: none;
 }
@@ -88,49 +155,25 @@ label {
    float: right;
    margin: 0;
 }
+.desc {
+    font-size: 12px;
+    font-style: italic;
+}
 .align-right {
    text-align: right;
 }
 .align-center {
    text-align: center;
 }
-.unselected,
-.selected {
-    display: inline-block;
-}
-.unselected {
-    padding: 6px 10px 6px 10px;
-    border: 1px solid #636363;
-    margin-left: 8px;
-    margin-right: 8px;
-    color: #636363;
-}
-.selected {
-    padding: 6px 10px 6px 10px;
-    color: white;
-    background-color: #636363;
-    border: 1px solid #636363;
-    margin-left: 8px;
-    margin-right: 8px;
-}
 .bigger {
    font-size: 14px;
 }
 .bigger input {
    font-size: 16px;
 }
-.required-star {
-    color: red;
-}
 .full-width {
    width: 100%;
 }
-.correct {
-    border: 2px solid #00cc22;
-}
-.incorrect {
-    border: 2px solid red;
-}
 .hidden {
    display: none !important;
 }
@@ -146,20 +189,12 @@ label {
 .input-group-bw {
    width: 150px;
 }
-.disabled-text {
-    text-decoration: line-through;
-    color: #ccc;
-}
 #serverResponse {
    padding: 6px 10px;
 }
 #host-tip {
    margin-bottom: 5px;
 }
-.error-text {
-    display: inline;
-    color: red;
-}
 #bandwidth {
    display: inline-block;
 }
@@ -168,24 +203,110 @@ label {
    Bootstrap overwrites
 ***/

-* {
-    border-radius: 0 !important;
-}
-#content a,
-#content a:hover,
-#content a:active,
-#content a:visited,
+
+a,
+a:hover,
+a:active,
+a:visited,
 #serverResponse {
-    color: #555;
+    color: var(--clr-link);
 }
 .btn {
-    box-shadow: 1px 1px 1px rgba(0, 0, 0, .1) !important;
    min-width: 150px;
+    box-shadow: 1px 0px 1px light-dark(rgba(0,0,0,.1), rgba(255,255,255,.1));
+}
+
+.btn-default,
+input[type="text"],
+input[type="number"],
+input[type="email"],
+input[type="password"],
+input[type="url"],
+select,
+textarea {
+    background-color: var(--clr-input-bg);
+    color: var(--clr-text);
+    border-color: var(--clr-input-border);
+}
+
+::placeholder {
+    color: var(--clr-text) !important;
+    opacity: 0.5;
 }
 .btn .glyphicon,
 a .glyphicon {
    top: 2px;
 }
 small {
-    color: #777;
+    color: var(--clr-text-muted);
+}
+
+/***
+    Dark-mode structural rules
+    Colors live in the light-dark() tokens above; these are the rules that cannot
+    be expressed as a color value. The two blocks below MUST stay identical:
+    the first applies when Night is forced, the second when the OS is dark and Light is not forced.
+***/
+html[data-color-scheme="night" i] {
+    .language:hover,
+    .quoteBlock,
+    .server-disabled,
+    #serverResponse {
+        background-color: var(--clr-surface-alt) !important;
+        color: var(--clr-text) !important;
+    }
+
+    .quoteBlock a,
+    .help-block,
+    a.wizard-advanced-settings {
+        color: var(--clr-text);
+    }
+
+    #inner {
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+    }
+
+    /* Focus / active border */
+    .btn-default:focus,
+    .form-control:focus,
+    input:focus,
+    textarea:focus,
+    select:focus {
+        border-color: #707070 !important;
+        outline: initial !important;
+        box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+    }
+}
+
+@media (prefers-color-scheme: dark) {
+    html:not([data-color-scheme="light" i]) {
+        .language:hover,
+        .quoteBlock,
+        .server-disabled,
+        #serverResponse {
+            background-color: var(--clr-surface-alt) !important;
+            color: var(--clr-text) !important;
+        }
+
+        .quoteBlock a,
+        .help-block,
+        a.wizard-advanced-settings {
+            color: var(--clr-text);
+        }
+
+        #inner {
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+        }
+
+        /* Focus / active border */
+        .btn-default:focus,
+        .form-control:focus,
+        input:focus,
+        textarea:focus,
+        select:focus {
+            border-color: #707070 !important;
+            outline: initial !important;
+            box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+        }
+    }
 }
@@ -12,8 +12,8 @@
            <p>$T('wizard-tip4')</p>

            <div class="quoteBlock">
-                <!--#for $url in $urls#-->
-                    <a href="$url">$url</a><br />
+                <!--#for $access_url in $urls#-->
+                    <a href="$access_url">$access_url</a><br />
                <!--#end for#-->
            </div>

@@ -22,24 +22,23 @@
            <p><strong>$T('opt-complete_dir')</strong></p>
            <div class="quoteBlock">
                $complete_dir
-                <a href="${access_url}/config/folders#complete_dir" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
+                <a href="$url('config/folders#complete_dir')" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
            </div>

            <p><strong>$T('opt-download_dir')</strong></p>
            <div class="quoteBlock">
                $download_dir
-                <a href="${access_url}/config/folders#complete_dir" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
+                <a href="$url('config/folders#complete_dir')" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
            </div>

            <hr/>
-            <p>$T('wizard-tip-wiki') <a target="_blank" href="$helpuri">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>
+            <p>$T('wizard-tip-wiki') <a target="_blank" href="https://sabnzbd.org/wiki/">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>

        </div>
        <hr />
        <div class="row">
            <div class="col-xs-12 text-center">
-                <input type="hidden" name="apikey" id="apikey" value="$apikey"/>
-                <a class="btn btn-success" href="$access_url">$T('wizard-goto') <span class="glyphicon glyphicon-chevron-right"></span></a>
+                <a class="btn btn-success" href="$url()">$T('wizard-goto') <span class="glyphicon glyphicon-chevron-right"></span></a>
            </div>
        </div>
    </div>
@@ -1,5 +1,5 @@
 Kronos.py is written by Irmen de Jong.
-Retreived from:
+Retrieved from:
 http://www.razorvine.net/download/kronos.py

 Quote from the module:
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2022-2026 by The SABnzbd-Team (sabnzbd.org) -->
+<component type="desktop-application">
+  <id>org.sabnzbd.sabnzbd</id>
+  <metadata_license>MIT</metadata_license>
+  <name>SABnzbd</name>
+  <summary>Free and easy binary newsreader</summary>
+  <summary xml:lang="fr">Lecteur de news binaire libre et facile à utiliser</summary>
+  <summary xml:lang="tr">Özgür ve kullanımı kolay Usenet ikili okuyucu</summary>
+  <branding>
+    <color type="primary" scheme_preference="light">#e7e7e7</color>
+    <color type="primary" scheme_preference="dark">#444444</color>
+  </branding>
+  <description>
+    <p>
+      SABnzbd is a free and Open Source web-based binary newsreader,
+      with support for the popular nzb file format. It greatly simplifies
+      the process of downloading from Usenet, thanks to a friendly
+      web-based user interface and advanced built-in post-processing
+      options including the ability to automatically verify, repair,
+      extract and clean up downloaded posts. It runs anywhere, comes in
+      over a dozen languages, and integrates with a host of tools, apps
+      and services that help automate the download process.
+    </p>
+    <p xml:lang="fr">
+      SABnzbd est un lecteur binaire de newsgroups libre et gratuit prenant
+      en charge le format nzb très répandu. Il simplifie grandement le processus
+      de téléchargement depuis Usenet grâce à une interface web conviviale
+      et à des options avancées de post-traitement intégrées qui comprennent
+      la capacité à vérifier, réparer, extraire et nettoyer automatiquement
+      les messages téléchargés. Il fonctionne partout, est fourni avec une
+      douzaine de traductions et s'intègre avec de nombreux outils, applications
+      et services qui aident à automatiser le processus de téléchargement.
+    </p>
+    <p xml:lang="tr">
+      SABnzbd, popüler nzb biçimini destekleyen özgür ve ücretsiz bir ikili
+      haber grupları okuyucusudur. Kullanıcı dostu Web tabanlı arayüzü ve
+      indirilen mesajları otomatik olarak doğrulama, tamir etme, çıkarma ve
+      temizleme kabiliyetine sahip gelişmiş yerleşik son işlem seçenekleri
+      sayesinde Usenet ağından indirmeyi büyük ölçüde kolaylaştırır. Her yerde
+      çalışabilir, bir düzineden fazla dil desteği sunar ve indirme sürecini
+      otomatik hâle getirmeye yardımcı olan birçok araç, uygulama ve hizmet ile
+      birlikte çalışabilir.
+    </p>
+  </description>
+  <keywords>
+    <keyword>usenet</keyword>
+    <keyword>nzb</keyword>
+    <keyword>download</keyword>
+    <keyword>newsreader</keyword>
+    <keyword>binary</keyword>
+    <keyword xml:lang="fr">usenet</keyword>
+    <keyword xml:lang="fr">nzb</keyword>
+    <keyword xml:lang="fr">téléchargement</keyword>
+    <keyword xml:lang="fr">binaires</keyword>
+    <keyword xml:lang="tr">usenet</keyword>
+    <keyword xml:lang="tr">nzb</keyword>
+    <keyword xml:lang="tr">indirme</keyword>
+  </keywords>
+  <categories>
+    <category>Network</category>
+    <category>FileTransfer</category>
+  </categories>
+  <url type="homepage">https://sabnzbd.org</url>
+  <url type="bugtracker">https://github.com/sabnzbd/sabnzbd/issues</url>
+  <url type="vcs-browser">https://github.com/sabnzbd/sabnzbd</url>
+  <url type="contribute">https://github.com/sabnzbd/sabnzbd</url>
+  <url type="translate">https://sabnzbd.org/wiki/translate</url>
+  <url type="donation">https://sabnzbd.org/donate</url>
+  <url type="help">https://sabnzbd.org/wiki/</url>
+  <url type="faq">https://sabnzbd.org/wiki/faq</url>
+  <url type="contact">https://sabnzbd.org/live-chat.html</url>
+  <releases>
+    <release version="5.1.0" date="2026-08-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.1.0</url>
+    </release>
+    <release version="5.0.4" date="2026-06-11" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.0.4</url>
+    </release>
+    <release version="5.0.3" date="2026-05-15" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.0.3</url>
+    </release>
+    <release version="5.0.2" date="2026-05-14" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.0.2</url>
+    </release>
+    <release version="5.0.1" date="2026-05-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.0.1</url>
+    </release>
+    <release version="5.0.0" date="2026-05-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/5.0.0</url>
+    </release>
+    <release version="4.5.5" date="2025-10-24" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.5</url>
+    </release>
+    <release version="4.5.4" date="2025-10-22" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.4</url>
+    </release>
+    <release version="4.5.3" date="2025-08-25" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.3</url>
+    </release>
+    <release version="4.5.2" date="2025-07-09" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.2</url>
+    </release>
+    <release version="4.5.1" date="2025-04-11" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.1</url>
+    </release>
+    <release version="4.5.0" date="2025-04-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.5.0</url>
+    </release>
+    <release version="4.4.1" date="2024-12-23" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.4.1</url>
+    </release>
+    <release version="4.4.0" date="2024-12-09" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.4.0</url>
+    </release>
+    <release version="4.3.3" date="2024-08-01" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.3</url>
+    </release>
+    <release version="4.3.2" date="2024-05-30" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.2</url>
+    </release>
+    <release version="4.3.1" date="2024-05-03" type="stable">
+      <url type="details">https://github.com/sabnzbd/sabnzbd/releases/tag/4.3.1</url>
+    </release>
+  </releases>
+  <launchable type="desktop-id">sabnzbd.desktop</launchable>
+  <provides>
+    <mediatype>application/x-nzb</mediatype>
+    <mediatype>application/x-compressed-nzb</mediatype>
+  </provides>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+  <recommends>
+    <display_length compare="ge">640</display_length>
+    <internet>always</internet>
+  </recommends>
+  <project_license>GPL-2.0-or-later</project_license>
+  <developer id="org.sabnzbd">
+    <name>The SABnzbd-Team</name>
+  </developer>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://sabnzbd.org/images/landing/screenshots/interface.png</image>
+      <caption>Intuitive interface</caption>
+      <caption xml:lang="fr">Interface intuitive</caption>
+      <caption xml:lang="tr">Sezgisel arayüz</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/night-mode.png</image>
+      <caption>Also comes in Night-mode</caption>
+      <caption xml:lang="fr">Fourni également avec le mode nuit</caption>
+      <caption xml:lang="tr">Gece kipi ile de sunulur</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/add-nzb.png</image>
+      <caption>Add NZB's or use drag-and-drop!</caption>
+      <caption xml:lang="fr">Ajoutez des fichiers NZB ou utilisez le glisser - déposer !</caption>
+      <caption xml:lang="tr">NZB dosyaları ekleyin veya kaydır - bırak kullanın!</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/phone-interface.png</image>
+      <caption>Scales to any screen size</caption>
+      <caption xml:lang="fr">S'adapte à toutes les tailles d'écran</caption>
+      <caption xml:lang="tr">Her ekran boyutuna uyum sağlar</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/history-details.png</image>
+      <caption>Easy overview of all history details</caption>
+      <caption xml:lang="fr">Vue d'ensemble aisée de tous les détails de l'historique</caption>
+      <caption xml:lang="tr">Tarihçenin tüm ayrıntıları için kolay genel bakış</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/phone-extra.png</image>
+      <caption>Every option, on every screen size</caption>
+      <caption xml:lang="fr">Toutes les options, quelle que soit la taille d'écran</caption>
+      <caption xml:lang="tr">Ekran boyutu ne olursa olsun, tüm seçenekler elinizin altında</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/file-lists.png</image>
+      <caption>Manage a job's individual files</caption>
+      <caption xml:lang="fr">Gérez les fichiers individuels d'une tâche</caption>
+      <caption xml:lang="tr">Herhangi bir görevin dosyalarını tek tek yönetin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-speedlimit.png</image>
+      <caption>Easy speed limiting</caption>
+      <caption xml:lang="fr">Limitation facile du débit</caption>
+      <caption xml:lang="tr">Kolay hız sınırlaması</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-options.png</image>
+      <caption>Quickly change settings</caption>
+      <caption xml:lang="fr">Changement rapide des réglages</caption>
+      <caption xml:lang="tr">Ayarları hızlıca değiştirin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/dashboard.png</image>
+      <caption>Easy system check</caption>
+      <caption xml:lang="fr">Vérification facile du système</caption>
+      <caption xml:lang="tr">Sistemi kolayca kontrol edin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/connections-overview.png</image>
+      <caption>See active connections</caption>
+      <caption xml:lang="fr">Voyez les connexions actives</caption>
+      <caption xml:lang="tr">Etkin bağlantıları görüntüleyin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/skin-settings.png</image>
+      <caption>Customize the interface</caption>
+      <caption xml:lang="fr">Personnalisez l'interface</caption>
+      <caption xml:lang="tr">Arayüzü kişiselleştirin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/tabbed.png</image>
+      <caption>Tabbed-mode</caption>
+      <caption xml:lang="fr">Mode avec onglets</caption>
+      <caption xml:lang="tr">Sekmeli kip</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/set-custom-pause.png</image>
+      <caption>Specify any pause duration</caption>
+      <caption xml:lang="fr">Spécifiez une durée de pause quelconque</caption>
+      <caption xml:lang="tr">Herhangi bir duraklama süresi belirtin</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/config.png</image>
+      <caption>Easy configuration</caption>
+      <caption xml:lang="fr">Configuration facile</caption>
+      <caption xml:lang="tr">Kolay yapılandırma</caption>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1"/>
+</component>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-compressed-nzb">
+    <sub-class-of type="application/x-nzb"/>
+    <comment>NewzBin Usenet index (compressed)</comment>
+    <glob pattern="*.nzb.gz"/>
+    <glob pattern="*.nzb.bz2"/>
+  </mime-type>
+</mime-info>