Update text files for 3.5.0RC2

2025-12-30 11:09:22 -05:00 · 2022-01-13 14:48:30 +01:00
326 changed files with 26872 additions and 31484 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,43 +0,0 @@
-# `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
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,31 +0,0 @@
-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:
-  - 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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +0,0 @@
-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.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,10 +0,0 @@
-name: Feature request
-description: What new feature would you like to have added to SABnzbd?
-labels:
-  - Feature request
-body:
-  - type: textarea
-    attributes:
-      label: Description
-    validations:
-      required: true
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,41 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":disableDependencyDashboard"
-  ],
-  "schedule": [
-    "before 8am on Monday"
-  ],
-  "pip_requirements": {
-    "fileMatch": [
-      "requirements.txt",
-      "tests/requirements.txt",
-      "builder/requirements.txt",
-      "builder/release-requirements.txt"
-    ]
-  },
-  "ignorePaths": [],
-  "ignoreDeps": [
-    "jaraco.text",
-    "jaraco.context",
-    "jaraco.collections",
-    "sabctools",
-    "paho-mqtt",
-    "werkzeug",
-    "pyinstaller"
-  ],
-  "packageRules": [
-    {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "groupName": "all dependencies",
-      "groupSlug": "all",
-      "separateMajorMinor": false,
-      "automerge": true
-    }
-  ],
-  "automergeStrategy": "squash",
-  "platformAutomerge": true
-}
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -0,0 +1,23 @@
+# 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
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -0,0 +1,22 @@
+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=py37
+            --check
+            --diff
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -2,169 +2,149 @@ name: Build binaries and source distribution

 on: [push, pull_request]

-# Setting PYTHONNODEBUGRANGES reduces binary size
-env:
-  PYTHONNODEBUGRANGES: 1
-
 jobs:
  build_windows:
    name: Build Windows binary
    runs-on: windows-latest
-    timeout-minutes: 30
+    env:
+      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.12 (64bit)
-      uses: actions/setup-python@v5
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.10 (64bit)
+      uses: actions/setup-python@v2
      with:
-        python-version: "3.12"
+        python-version: "3.10"
        architecture: "x64"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
    - name: Install Python dependencies (64bit)
-      # Without dependencies to make sure everything is covered in the requirements.txt
      run: |
        python --version
-        python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
-        pip install --upgrade -r builder/requirements.txt --no-dependencies
+        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@v4
+      uses: actions/upload-artifact@v2
      with:
        path: "*-win64-bin.zip"
-        name: Windows standalone binary (64bit)
+        name: Windows Windows standalone binary (64bit)
    - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v4
+      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@v5
+      uses: actions/setup-python@v2
      with:
        python-version: "3.8"
        architecture: "x86"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
    - name: Install Python dependencies (32bit and legacy)
-      # We do not care about the extra dependencies for the legacy build
      run: |
        python --version
-        python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
-        pip install --upgrade -r builder/requirements.txt --no-dependencies
+        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)
      run: python builder/package.py binary
    - name: Upload Windows standalone binary (32bit and legacy)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        path: "*-win32-bin.zip"
-        name: Windows standalone binary (32bit and legacy)
+        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

  build_macos:
    name: Build macOS binary
-    runs-on: macos-14
-    timeout-minutes: 30
+    runs-on: macos-11
    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.12.6"
-      MACOSX_DEPLOYMENT_TARGET: "10.13"
+      PYTHON_VERSION: "3.10.1"
+      MACOSX_DEPLOYMENT_TARGET: "10.9"
      # We need to force compile for universal2 support
-      CFLAGS: -arch x86_64 -arch arm64
-      ARCHFLAGS: -arch x86_64 -arch arm64
+      CFLAGS: -arch arm64 -arch x86_64
    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.12
-      # Only use this for the caching of pip packages!
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.12"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
+    - uses: actions/checkout@v2
    - name: Cache Python download
      id: cache-python-download
-      uses: actions/cache@v4
+      uses: actions/cache@v2
      with:
        path: ~/python.pkg
-        key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
-    - name: Get Python from python.org
+        key: macOS-Python-${{ env.PYTHON_VERSION }}
+    - name: Get Python
      if: steps.cache-python-download.outputs.cache-hit != 'true'
      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
+      # We have to manually install a few packages:
+      # 1.  cffi will pick up the single-arch libffi from Homebrew, while Apple provides universal2-version
+      #     of libffi with XCode. So we forcefully have to remove the Homebrew one.
+      # 2.  Because building cryptography is hard, and we cannot force pip to fetch universal2 version we
+      #     first install the x86 version (and it's dependencies) and then manually fetch the universal2 build
+      #     https://github.com/pyca/cryptography/issues/5918
+      # 3.  We need to build the PyInstaller bootloader from sources:
+      #     https://github.com/pyinstaller/pyinstaller/issues/6235
      run: |
        python3 --version
        pip3 install --upgrade pip wheel
-        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML,charset_normalizer --no-dependencies
-        pip3 install --upgrade -r builder/requirements.txt --no-dependencies
+        
+        brew uninstall libffi --ignore-dependencies
+        ARCHFLAGS="-arch x86_64 -arch arm64" pip3 install --upgrade cffi --no-binary cffi
+        pip3 install --upgrade -r requirements.txt --no-binary sabyenc3
+        
+        pip3 uninstall cryptography -y
+        pip3 download cryptography --platform macosx_10_10_universal2 --only-binary :all: --no-deps --dest .
+        pip3 install cryptography --no-cache-dir --no-index --find-links .
+        
+        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller
    - name: Import macOS codesign certificates
-      # 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: |
-        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@v4
+      uses: apple-actions/import-codesign-certs@v1
+      if: env.SIGNING_AUTH
      with:
-        path: "*-src.tar.gz"
-        name: Source distribution
+        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
    - 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
        python3 builder/make_dmg.py
    - name: Upload macOS binary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      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

-  release:
-    name: Publish Release
+  release_snap:
+    name: Release Snap
    runs-on: ubuntu-latest
-    needs: [build_windows, build_macos]
    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    env:
+      SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v2
        with:
          python-version: "3.x"
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist
-      - name: Move all artifacts to main folder
-        run: find dist -type f -exec mv {} . \;
-      - name: Prepare official release
-        env:
-          AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
-          REDDIT_TOKEN: ${{ secrets.REDDIT_TOKEN }}
-        run: |
-          pip3 install -r builder/release-requirements.txt
-          python3 builder/release.py
      - name: Release latest available Snap
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
        run: |
          sudo snap install snapcraft --classic
+          echo "${SNAP_TOKEN}" | snapcraft login --with -
          python3 snap/local/release_snap.py
--- a/.github/workflows/integration_testing.yml
+++ b/.github/workflows/integration_testing.yml
@@ -3,69 +3,39 @@ name: CI Tests
 on: [push, pull_request]

 jobs:
-  black:
-    name: Black Code Formatter
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Black Code Formatter
-        uses: lgeiger/black-action@master
-        with:
-          args: >
-            SABnzbd.py
-            sabnzbd
-            scripts
-            tools
-            builder
-            builder/SABnzbd.spec
-            tests
-            --line-length=120
-            --target-version=py38
-            --check
-            --diff
-
  test:
    name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
    runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
+    timeout-minutes: 15
    strategy:
      fail-fast: false
      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-        python-architecture: ["x64"]
-        name: ["Linux"]
-        os: [ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-20.04]
        include:
          - name: macOS
            os: macos-latest
-            python-version: "3.13"
-            python-architecture: "x64"
+            python-version: "3.10"
          - name: Windows
            os: windows-latest
-            python-version: "3.13"
-            python-architecture: "x64"
-          - name: Windows (32bit)
-            os: windows-latest
-            python-version: "3.8"
-            python-architecture: "x86"
+            python-version: "3.10"

    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }} ${{ matrix.python-architecture }}
-      uses: actions/setup-python@v5
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
      with:
        python-version: ${{ matrix.python-version }}
-        architecture:  ${{ matrix.python-architecture }}
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
    - name: Install system dependencies
      if: runner.os == 'Linux'
-      run: sudo apt-get install unrar 7zip par2
+      run: sudo apt-get install unrar p7zip-full par2
    - name: Install Python dependencies
      run: |
        python --version
-        python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
+        pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt
        pip install --upgrade -r tests/requirements.txt
    - name: Test SABnzbd
      run: pytest -s
+
+
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,33 +0,0 @@
-name: "Close and lock old issues"
-on:
-  schedule:
-    - cron: "30 1 * * *"
-  workflow_dispatch:
-
-jobs:
-  stale:
-    name: "Close stale issues"
-    if: github.repository_owner == 'sabnzbd'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        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.
-          exempt-issue-labels: "Feature request, Work in progress, Bug"
-
-  lock:
-    name: "Lock old issues"
-    if: github.repository_owner == 'sabnzbd'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          log-output: true
-          issue-inactive-days: 60
-          pr-inactive-days: 60
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -7,37 +7,33 @@ on:

 jobs:
  translations:
-    name: Update translatable texts
    runs-on: ubuntu-latest
    env:
      TX_TOKEN: ${{ secrets.TX_TOKEN }}
    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
      - name: Generate translatable texts
        run: |
          python3 tools/extract_pot.py
+      - name: Install Transifex client
+        if: env.TX_TOKEN
+        # 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
-        # Add --translation to the push command in order to update Transifex using local translation edits
-        # However, this prevents modifying existing translations in Transifex as they will be overwritten by the push!
        run: |
-          curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
-          ./tx push --source 
-          ./tx pull --all --force
+          tx push --source --parallel
+          tx pull --all --force --parallel
      - 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@v5.0.1
+        uses: stefanzweifel/git-auto-commit-action@v4.5.1
        if: env.TX_TOKEN
        with:
-          commit_message: |
-            Update translatable texts
-            [skip ci]
+          commit_message: Update translatable texts
          commit_user_name: SABnzbd Automation
          commit_user_email: bugs@sabnzbd.org
          commit_author: SABnzbd Automation <bugs@sabnzbd.org>
-          file_pattern: "po/*.pot po/*.po"
-          push_options: --force
--- a/.tx/config
+++ b/.tx/config
@@ -1,21 +1,21 @@
 [main]
 host = https://www.transifex.com

-[o:sabnzbd:p:sabnzbd-translations:r:po-main-sabnzbd-pot--develop]
+[sabnzbd-translations.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

-[o:sabnzbd:p:sabnzbd-translations:r:po-email-sabemail-pot--develop]
+[sabnzbd-translations.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

-[o:sabnzbd:p:sabnzbd-translations:r:po-nsis-sabnsis-pot--develop]
+[sabnzbd-translations.po-nsis-sabnsis-pot--develop]
 file_filter = po/nsis/<lang>.po
 minimum_perc = 0
 source_file = po/nsis/SABnsis.pot
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,7 +1,7 @@

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

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

 Active team:
    Safihre
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -4,7 +4,7 @@
 0) LICENSE
 -------------------------------------------------------------------------------

-(c) Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+(c) Copyright 2007-2022 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
@@ -52,10 +52,10 @@ 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.8 and above is supported.
+Only Python 3.7 and above is supported.

 On Linux systems you need to install:
-    par2 unrar python3-setuptools python3-pip
+    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):
--- a/ISSUES.txt
+++ b/ISSUES.txt
@@ -16,7 +16,7 @@
      no_penalties = 1
  See: https://sabnzbd.org/wiki/configuration/3.4/special

- Some third-party utilities try to probe SABnzbd API in such a way that you will
+- 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.
@@ -48,3 +48,8 @@
  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.
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-(c) Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+(c) Copyright 2007-2022 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
--- a/10
+++ b/10
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: SABnzbd
+Version: 3.5.0RC2
+Summary: SABnzbd-3.5.0RC2
+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
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 SABnzbd - The automated Usenet download tool
 ============================================

-[![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)
+![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)
+

 SABnzbd is an Open Source Binary Newsreader written in Python.

@@ -16,7 +18,7 @@ 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.8 and above, often called `python3`)
+- `python` (Python 3.7 and above, often called `python3`)
 - Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt -U`
 - `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)
--- a/README.mkd
+++ b/README.mkd
@@ -1,33 +1,53 @@
-Release Notes - SABnzbd 4.4.0 Alpha 2
+Release Notes - SABnzbd 3.5.0 Release Candidate 2
 =========================================================

-This is the first test release of SABnzbd 4.4.0.
+## Changes and bugfixes since 3.5.0 Release Candidate 1
+- `Defobfuscate final filenames` is skipped for DVD's and Blu-ray's.
+- HTML characters in configuration fields were shown incorrectly. 
+- Global interface settings would not always be applied correctly.

-## New features since 4.3.0
+## Changes since 3.4.2
+- Removed Python 3.6 support.
+- SOCKS5 proxy support for all outgoing connections.
+- Restored support for UUencoded jobs.
+- `Required` server option: in case of connection failures, the queue
+  will be paused for a few minutes instead of skipping the server.
+- Added Special option to preserve paused state after a restart.
+- Show an estimated time-left indicator for repair and unpacking. 
+- Require TLS version 1.2 or higher for SSL news server connections.
+- Setting custom ciphers forces the maximum TLS version to 1.2.
+- Print low-level Windows status error on `IOError`.
+- Reduced memory usage during and after parsing `.nzb` files.
+- Handle multiple passwords stored in NZB-file.
+- macOS/Linux: `Permissions` are only applied if any are set.
+- macOS/Windows: updated to Python 3.10.1.
+- macOS: run native on M1 systems. However, included tools 
+  (`par2`, `unrar` and `7za`) still require Rosetta emulation.
+- Snap: updated to `core20` base and restore 7zip support.

-* Subtitle files will be deobfuscated if required.
-* macOS: Dropped support for macOS 10.12 and below.
-
-## Bug fixes since 4.3.0
-
-* Toggling of Servers could result in jobs being stuck at 99%.
-* Config restart would always determine redirect URL instead of using current.
+## Bugfixes since 3.4.2
+- Email notification setting was not shown correctly.
+- Improvements and fixes for `Defobfuscate final filenames`.
+- `Post-Process Only Verified Jobs` would not always work as intended.
+- Correctly detect too little disk space when unpacking 7zip's.
+- Improvements to handling of repair by MultiPar and par2cmdline.
+- On Retry the number of downloaded bytes could exceed the total bytes.
+- `unrar` logging of Direct Unpack was not logged if it was aborted.
+- Windows: `portable.cmd` was not included in the release.

 ## Upgrade notices
-
-* You can directly upgrade from version 3.0.0 and newer.
-* Upgrading from older versions will require performing a `Queue repair`.
-* Downgrading from version 4.2.0 or newer to 3.7.2 or older will require
-  performing a `Queue repair` due to changes in the internal data format.
+- 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 `ISSUES.txt` or https://sabnzbd.org/wiki/introduction/known-issues
+- Read the file "ISSUES.txt"

 ## 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.
+  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-2024 by The SABnzbd-Team (sabnzbd.org)
+  (c) Copyright 2007-2022 by "The SABnzbd-team" \<team@sabnzbd.org\>
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 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
@@ -17,10 +17,8 @@

 import sys

-# Trick to show a better message on older Python
-# releases that don't support walrus operator
-if Python_38_is_required_to_run_SABnzbd := sys.hexversion < 0x03080000:
-    print("Sorry, requires Python 3.8 or above")
+if sys.hexversion < 0x03070000:
+    print("Sorry, requires Python 3.7 or above")
    print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
    sys.exit(1)

@@ -42,12 +40,10 @@ import gc
 from typing import List, Dict, Any

 try:
-    import sabctools
    import Cheetah
    import feedparser
    import configobj
    import cherrypy
-    import cheroot.errors
    import portend
    import cryptography
    import chardet
@@ -65,10 +61,10 @@ import sabnzbd
 import sabnzbd.lang
 import sabnzbd.interface
 from sabnzbd.constants import (
-    DEF_NETWORKING_TIMEOUT,
+    DEF_TIMEOUT,
    DEF_LOG_ERRFILE,
    DEF_MAIN_TMPL,
-    DEF_STD_WEB_DIR,
+    DEF_STDINTF,
    DEF_WORKDIR,
    DEF_INTERFACES,
    DEF_LANGUAGE,
@@ -78,12 +74,12 @@ from sabnzbd.constants import (
    MAX_WARNINGS,
    RSS_FILE_NAME,
    DEF_LOG_FILE,
-    DEF_STD_CONFIG,
+    DEF_STDCONFIG,
    DEF_LOG_CHERRY,
-    CONFIG_BACKUP_HTTPS,
 )
 import sabnzbd.newsunpack
 from sabnzbd.misc import (
+    check_latest_version,
    exit_sab,
    split_host,
    create_https_certificates,
@@ -104,7 +100,8 @@ import sabnzbd.config as config
 import sabnzbd.cfg
 import sabnzbd.notifier as notifier
 import sabnzbd.zconfig
-from sabnzbd.getipaddress import local_ipv4
+from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
+from sabnzbd.utils.getperformance import getpystone, getcpu
 import sabnzbd.utils.ssdp as ssdp

 try:
@@ -170,8 +167,7 @@ class GUIHandler(logging.Handler):
        # This prevents endless looping if the notification service itself throws an error/warning
        # We don't check based on message content, because if it includes a timestamp it's not unique
        if not any(
-            stored_warning["origin"] == warning["origin"]
-            and stored_warning["time"] + DEF_NETWORKING_TIMEOUT > time.time()
+            stored_warning["origin"] == warning["origin"] and stored_warning["time"] + DEF_TIMEOUT > time.time()
            for stored_warning in self.store
        ):
            if record.levelno == logging.WARNING:
@@ -244,7 +240,7 @@ def print_version():
            """
 %s-%s

-(C) Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+Copyright (C) 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
 SABnzbd comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions. It is licensed under the
@@ -298,14 +294,14 @@ def daemonize():
        os.dup2(f.fileno(), sys.stderr.fileno())


-def abort_and_show_error(browserhost, web_port, err=""):
+def abort_and_show_error(browserhost, cherryport, err=""):
    """Abort program because of CherryPy troubles"""
    logging.error(T("Failed to start web-interface") + " : " + str(err))
    if not sabnzbd.DAEMON:
        if "49" in err:
-            panic_host(browserhost, web_port)
+            panic_host(browserhost, cherryport)
        else:
-            panic_port(browserhost, web_port)
+            panic_port(browserhost, cherryport)
    sabnzbd.halt()
    exit_sab(2)

@@ -330,7 +326,7 @@ def identify_web_template(key, defweb, wdir):

    if not os.path.exists(full_main):
        helpful_warning(T("Cannot find web template: %s, trying standard template"), full_main)
-        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STD_WEB_DIR)
+        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STDINTF)
        full_main = real_path(full_dir, DEF_MAIN_TMPL)
        if not os.path.exists(full_main):
            logging.exception("Cannot find standard template: %s", full_dir)
@@ -401,14 +397,16 @@ def get_user_profile_paths():
        sabnzbd.DIR_HOME = long_path(sabnzbd.DIR_HOME)
        return

-    elif sabnzbd.MACOS:
-        if home := os.environ.get("HOME"):
+    elif sabnzbd.DARWIN:
+        home = os.environ.get("HOME")
+        if home:
            sabnzbd.DIR_LCLDATA = "%s/Library/Application Support/SABnzbd" % home
            sabnzbd.DIR_HOME = home
            return
    else:
        # Unix/Linux
-        if home := os.environ.get("HOME"):
+        home = os.environ.get("HOME")
+        if home:
            sabnzbd.DIR_LCLDATA = "%s/.%s" % (home, DEF_WORKDIR)
            sabnzbd.DIR_HOME = home
            return
@@ -420,27 +418,24 @@ def get_user_profile_paths():

 def print_modules():
    """Log all detected optional or external modules"""
-    if sabnzbd.decoder.SABCTOOLS_ENABLED:
-        # Yes, we have SABCTools, and it's the correct version, so it's enabled
-        logging.info("SABCTools module (v%s)... found!", sabnzbd.decoder.SABCTOOLS_VERSION)
-        logging.info("SABCTools module is using SIMD set: %s", sabnzbd.decoder.SABCTOOLS_SIMD)
-        logging.info("SABCTools module is linked to OpenSSL: %s", sabnzbd.decoder.SABCTOOLS_OPENSSL_LINKED)
-
-        # Check if we managed to link, warning for now
-        # It won't work on OpenSSL < 1.1.1 anyway, so we skip the check there
-        if not sabnzbd.decoder.SABCTOOLS_OPENSSL_LINKED and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
-            logging.warning(
-                "Could not link to OpenSSL library, please report here: "
-                "https://github.com/sabnzbd/sabnzbd/issues/2421"
-            )
+    if sabnzbd.decoder.SABYENC_ENABLED:
+        # Yes, we have SABYenc, and it's the correct version, so it's enabled
+        logging.info("SABYenc module (v%s)... found!", sabnzbd.decoder.SABYENC_VERSION)
    else:
-        # Wrong SABCTools version, if it was fully missing it would fail to start due to check at the very top
-        logging.error(
-            T("SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"),
-            sabnzbd.decoder.SABCTOOLS_VERSION,
-            sabnzbd.constants.SABCTOOLS_VERSION_REQUIRED,
-        )
-
+        # Something wrong with SABYenc, so let's determine and print what:
+        if sabnzbd.decoder.SABYENC_VERSION:
+            # We have a VERSION, thus a SABYenc module, but it's not the correct version
+            logging.error(
+                T("SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"),
+                sabnzbd.decoder.SABYENC_VERSION,
+                sabnzbd.constants.SABYENC_VERSION_REQUIRED,
+            )
+        else:
+            # No SABYenc module at all
+            logging.error(
+                T("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"),
+                sabnzbd.constants.SABYENC_VERSION_REQUIRED,
+            )
        # Do not allow downloading
        sabnzbd.NO_DOWNLOADING = True

@@ -448,8 +443,7 @@ def print_modules():

    if sabnzbd.WIN32 and sabnzbd.newsunpack.MULTIPAR_COMMAND:
        logging.info("MultiPar binary... found (%s)", sabnzbd.newsunpack.MULTIPAR_COMMAND)
-
-    if sabnzbd.newsunpack.PAR2_COMMAND:
+    elif sabnzbd.newsunpack.PAR2_COMMAND:
        logging.info("par2 binary... found (%s)", sabnzbd.newsunpack.PAR2_COMMAND)
    else:
        logging.error(T("par2 binary... NOT found!"))
@@ -464,19 +458,25 @@ def print_modules():
            have_str = "%.2f" % (float(sabnzbd.newsunpack.RAR_VERSION) / 100)
            want_str = "%.2f" % (float(sabnzbd.constants.REC_RAR_VERSION) / 100)
            helpful_warning(T("Your UNRAR version is %s, we recommend version %s or higher.<br />"), have_str, want_str)
-        elif not (sabnzbd.WIN32 or sabnzbd.MACOS):
+        elif not (sabnzbd.WIN32 or sabnzbd.DARWIN):
            logging.info("UNRAR binary version %.2f", (float(sabnzbd.newsunpack.RAR_VERSION) / 100))
    else:
        logging.error(T("unrar binary... NOT found"))
        # Do not allow downloading
        sabnzbd.NO_DOWNLOADING = True

+    # If available, we prefer 7zip over unzip
    if sabnzbd.newsunpack.SEVENZIP_COMMAND:
        logging.info("7za binary... found (%s)", sabnzbd.newsunpack.SEVENZIP_COMMAND)
-        if not (sabnzbd.WIN32 or sabnzbd.MACOS):
+        if not (sabnzbd.WIN32 or sabnzbd.DARWIN):
            logging.info("7za binary version %s", sabnzbd.newsunpack.SEVENZIP_VERSION)
    else:
-        logging.warning(T("7za binary... NOT found!"))
+        logging.info(T("7za binary... NOT found!"))
+
+        if sabnzbd.newsunpack.ZIP_COMMAND:
+            logging.info("unzip binary... found (%s)", sabnzbd.newsunpack.ZIP_COMMAND)
+        else:
+            logging.info(T("unzip binary... NOT found!"))

    if not sabnzbd.WIN32:
        if sabnzbd.newsunpack.NICE_COMMAND:
@@ -531,19 +531,19 @@ def check_resolve(host):
    return True


-def get_webhost(web_host, web_port, https_port):
+def get_webhost(cherryhost, cherryport, https_port):
    """Determine the webhost address and port,
    return (host, port, browserhost)
    """
-    if web_host == "0.0.0.0" and not check_resolve("127.0.0.1"):
-        web_host = ""
-    elif web_host == "::" and not check_resolve("::1"):
-        web_host = ""
+    if cherryhost == "0.0.0.0" and not check_resolve("127.0.0.1"):
+        cherryhost = ""
+    elif cherryhost == "::" and not check_resolve("::1"):
+        cherryhost = ""

-    if web_host is None:
-        web_host = sabnzbd.cfg.web_host()
+    if cherryhost is None:
+        cherryhost = sabnzbd.cfg.cherryhost()
    else:
-        sabnzbd.cfg.web_host.set(web_host)
+        sabnzbd.cfg.cherryhost.set(cherryhost)

    # Get IP address, but discard APIPA/IPV6
    # If only APIPA's or IPV6 are found, fall back to localhost
@@ -555,10 +555,10 @@ def get_webhost(web_host, web_port, https_port):
        # Hostname does not resolve
        try:
            # Valid user defined name?
-            info = socket.getaddrinfo(web_host, None)
+            info = socket.getaddrinfo(cherryhost, None)
        except socket.error:
-            if not is_localhost(web_host):
-                web_host = "0.0.0.0"
+            if not is_localhost(cherryhost):
+                cherryhost = "0.0.0.0"
            try:
                info = socket.getaddrinfo(localhost, None)
            except socket.error:
@@ -575,75 +575,79 @@ def get_webhost(web_host, web_port, https_port):
            hostip = ip

    # A blank host will use the local ip address
-    if web_host == "":
+    if cherryhost == "":
        if ipv6 and ipv4:
            # To protect Firefox users, use numeric IP
-            web_host = hostip
+            cherryhost = hostip
            browserhost = hostip
        else:
-            web_host = socket.gethostname()
-            browserhost = web_host
+            cherryhost = socket.gethostname()
+            browserhost = cherryhost

    # 0.0.0.0 will listen on all ipv4 interfaces (no ipv6 addresses)
-    elif web_host == "0.0.0.0":
+    elif cherryhost == "0.0.0.0":
        # Just take the gamble for this
-        web_host = "0.0.0.0"
+        cherryhost = "0.0.0.0"
        browserhost = localhost

    # :: will listen on all ipv6 interfaces (no ipv4 addresses)
-    elif web_host in ("::", "[::]"):
-        web_host = web_host.strip("[").strip("]")
+    elif cherryhost in ("::", "[::]"):
+        cherryhost = cherryhost.strip("[").strip("]")
        # Assume '::1' == 'localhost'
        browserhost = localhost

    # IPV6 address
-    elif "[" in web_host or ":" in web_host:
-        browserhost = web_host
+    elif "[" in cherryhost or ":" in cherryhost:
+        browserhost = cherryhost

    # IPV6 numeric address
-    elif web_host.replace(".", "").isdigit():
+    elif cherryhost.replace(".", "").isdigit():
        # IPV4 numerical
-        browserhost = web_host
+        browserhost = cherryhost

-    elif web_host == localhost:
-        web_host = localhost
+    elif cherryhost == localhost:
+        cherryhost = localhost
        browserhost = localhost

    else:
        # If on APIPA, use numerical IP, to help FireFoxers
        if ipv6 and ipv4:
-            web_host = hostip
-        browserhost = web_host
+            cherryhost = hostip
+        browserhost = cherryhost

        # Some systems don't like brackets in numerical ipv6
-        if sabnzbd.MACOS:
-            web_host = web_host.strip("[]")
+        if sabnzbd.DARWIN:
+            cherryhost = cherryhost.strip("[]")
        else:
            try:
-                socket.getaddrinfo(web_host, None)
+                socket.getaddrinfo(cherryhost, None)
            except socket.error:
-                web_host = web_host.strip("[]")
+                cherryhost = cherryhost.strip("[]")

-    if ipv6 and ipv4 and web_host == "" and sabnzbd.WIN32:
+    if ipv6 and ipv4 and not is_localhost(browserhost):
+        sabnzbd.AMBI_LOCALHOST = True
+        logging.info("IPV6 has priority on this system, potential Firefox issue")
+
+    if ipv6 and ipv4 and cherryhost == "" and sabnzbd.WIN32:
        helpful_warning(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))

-    if web_host == "localhost" and not sabnzbd.WIN32 and not sabnzbd.MACOS:
+    if cherryhost == "localhost" and not sabnzbd.WIN32 and not sabnzbd.DARWIN:
        # On the Ubuntu family, localhost leads to problems for CherryPy
        ips = ip_extract()
        if "127.0.0.1" in ips and "::1" in ips:
-            web_host = "127.0.0.1"
+            cherryhost = "127.0.0.1"
            if ips[0] != "127.0.0.1":
                browserhost = "127.0.0.1"

    # This is to please Chrome on macOS
-    if web_host == "localhost" and sabnzbd.MACOS:
-        web_host = "127.0.0.1"
+    if cherryhost == "localhost" and sabnzbd.DARWIN:
+        cherryhost = "127.0.0.1"
        browserhost = "localhost"

-    if web_port is None:
-        web_port = sabnzbd.cfg.web_port.get_int()
+    if cherryport is None:
+        cherryport = sabnzbd.cfg.cherryport.get_int()
    else:
-        sabnzbd.cfg.web_port.set(str(web_port))
+        sabnzbd.cfg.cherryport.set(str(cherryport))

    if https_port is None:
        https_port = sabnzbd.cfg.https_port.get_int()
@@ -652,12 +656,12 @@ def get_webhost(web_host, web_port, https_port):
        # if the https port was specified, assume they want HTTPS enabling also
        sabnzbd.cfg.enable_https.set(True)

-    if web_port == https_port and sabnzbd.cfg.enable_https():
+    if cherryport == https_port and sabnzbd.cfg.enable_https():
        sabnzbd.cfg.enable_https.set(False)
        # Should have a translated message, but that's not available yet
        logging.error(T("HTTP and HTTPS ports cannot be the same"))

-    return web_host, web_port, browserhost, https_port
+    return cherryhost, cherryport, browserhost, https_port


 def attach_server(host, port, cert=None, key=None, chain=None):
@@ -752,9 +756,26 @@ def commandline_handler():
    serv_opts = [os.path.normpath(os.path.abspath(sys.argv[0]))]
    upload_nzbs = []

+    # macOS binary: get rid of the weird -psn_0_123456 parameter
+    for arg in sys.argv:
+        if arg.startswith("-psn_"):
+            sys.argv.remove(arg)
+            break
+
+    # Ugly hack to remove the extra "SABnzbd*" parameter the Windows binary
+    # gets when it's restarted
+    if len(sys.argv) > 1 and "sabnzbd" in sys.argv[1].lower() and not sys.argv[1].startswith("-"):
+        slice_start = 2
+    else:
+        slice_start = 1
+
+    # Prepend options from env-variable to options
+    info = os.environ.get("SABnzbd", "").split()
+    info.extend(sys.argv[slice_start:])
+
    try:
        opts, args = getopt.getopt(
-            sys.argv[1:],
+            info,
            "phdvncwl:s:f:t:b:2:",
            [
                "pause",
@@ -837,13 +858,13 @@ def main():

    autobrowser = None
    autorestarted = False
-    sabnzbd.MY_FULLNAME = __file__
+    sabnzbd.MY_FULLNAME = sys.argv[0]
    sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
    fork = False
    pause = False
    inifile = None
-    web_host = None
-    web_port = None
+    cherryhost = None
+    cherryport = None
    https_port = None
    cherrypylogging = None
    clean_up = False
@@ -881,11 +902,14 @@ def main():
        elif opt in ("-t", "--templates"):
            web_dir = arg
        elif opt in ("-s", "--server"):
-            (web_host, web_port) = split_host(arg)
+            (cherryhost, cherryport) = split_host(arg)
        elif opt in ("-n", "--nobrowser"):
            autobrowser = False
        elif opt in ("-b", "--browser"):
-            autobrowser = sabnzbd.misc.bool_conv(arg)
+            try:
+                autobrowser = bool(int(arg))
+            except ValueError:
+                autobrowser = True
        elif opt == "--autorestarted":
            autorestarted = True
        elif opt in ("-c", "--clean"):
@@ -902,7 +926,6 @@ def main():
                exit_sab(1)
        elif opt == "--console":
            console_logging = True
-            sabnzbd.RESTART_ARGS.append(opt)
        elif opt in ("-v", "--version"):
            print_version()
            exit_sab(0)
@@ -947,7 +970,7 @@ def main():
    org_dir = os.getcwd()

    # Need console logging if requested, for SABnzbd.py and SABnzbd-console.exe
-    console_logging = console_logging or sys.executable.endswith("console.exe") or not hasattr(sys, "frozen")
+    console_logging = console_logging or sabnzbd.MY_NAME.lower().find("-console") > 0 or not hasattr(sys, "frozen")
    console_logging = console_logging and not sabnzbd.DAEMON

    LOGLEVELS = (logging.FATAL, logging.WARNING, logging.INFO, logging.DEBUG)
@@ -1004,24 +1027,24 @@ def main():
        sabnzbd.cfg.ipv6_hosting.set(ipv6_hosting)

    # Determine web host address
-    web_host, web_port, browserhost, https_port = get_webhost(web_host, web_port, https_port)
+    cherryhost, cherryport, browserhost, https_port = get_webhost(cherryhost, cherryport, https_port)
    enable_https = sabnzbd.cfg.enable_https()

    # When this is a daemon, just check and bail out if port in use
    if sabnzbd.DAEMON:
        if enable_https and https_port:
            try:
-                portend.free(web_host, https_port, timeout=0.05)
+                portend.free(cherryhost, https_port, timeout=0.05)
            except IOError:
-                abort_and_show_error(browserhost, web_port)
+                abort_and_show_error(browserhost, cherryport)
            except:
-                abort_and_show_error(browserhost, web_port, "49")
+                abort_and_show_error(browserhost, cherryport, "49")
        try:
-            portend.free(web_host, web_port, timeout=0.05)
+            portend.free(cherryhost, cherryport, timeout=0.05)
        except IOError:
-            abort_and_show_error(browserhost, web_port)
+            abort_and_show_error(browserhost, cherryport)
        except:
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")

    # Windows instance is reachable through registry
    url = None
@@ -1032,7 +1055,7 @@ def main():

    # SSL
    if enable_https:
-        port = https_port or web_port
+        port = https_port or cherryport
        try:
            portend.free(browserhost, port, timeout=0.05)
        except IOError as error:
@@ -1044,7 +1067,7 @@ def main():
                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
                    # Bail out if we have fixed our ports after first start-up
                    if sabnzbd.cfg.fixed_ports():
-                        abort_and_show_error(browserhost, web_port)
+                        abort_and_show_error(browserhost, cherryport)
                    # Find free port to bind
                    newport = find_free_port(browserhost, port)
                    if newport > 0:
@@ -1054,34 +1077,34 @@ def main():
                            sabnzbd.cfg.https_port.set(newport)
                        else:
                            # In case HTTPS == HTTP port
-                            web_port = newport
-                            sabnzbd.cfg.web_port.set(newport)
+                            cherryport = newport
+                            sabnzbd.cfg.cherryport.set(newport)
        except:
            # Something else wrong, probably badly specified host
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")

    # NonSSL check if there's no HTTPS or we only use 1 port
    if not (enable_https and not https_port):
        try:
-            portend.free(browserhost, web_port, timeout=0.05)
+            portend.free(browserhost, cherryport, timeout=0.05)
        except IOError as error:
            if str(error) == "Port not bound.":
                pass
            else:
                if not url:
-                    url = "http://%s:%s%s/api?" % (browserhost, web_port, sabnzbd.cfg.url_base())
+                    url = "http://%s:%s%s/api?" % (browserhost, cherryport, sabnzbd.cfg.url_base())
                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
                    # Bail out if we have fixed our ports after first start-up
                    if sabnzbd.cfg.fixed_ports():
-                        abort_and_show_error(browserhost, web_port)
+                        abort_and_show_error(browserhost, cherryport)
                    # Find free port to bind
-                    port = find_free_port(browserhost, web_port)
+                    port = find_free_port(browserhost, cherryport)
                    if port > 0:
-                        sabnzbd.cfg.web_port.set(port)
-                        web_port = port
+                        sabnzbd.cfg.cherryport.set(port)
+                        cherryport = port
        except:
            # Something else wrong, probably badly specified host
-            abort_and_show_error(browserhost, web_port, "49")
+            abort_and_show_error(browserhost, cherryport, "49")

    # We found a port, now we never check again
    sabnzbd.cfg.fixed_ports.set(True)
@@ -1093,7 +1116,8 @@ def main():
        sys.exit(1)

    if clean_up:
-        for x in globber_full(logdir):
+        xlist = globber_full(logdir)
+        for x in xlist:
            if RSS_FILE_NAME not in x:
                try:
                    os.remove(x)
@@ -1131,7 +1155,7 @@ def main():
        daemonize()
    else:
        if console_logging:
-            console = logging.StreamHandler(stream=sys.stdout)
+            console = logging.StreamHandler()
            console.setLevel(LOGLEVELS[logging_level + 1])
            console.setFormatter(logging.Formatter(logformat))
            logger.addHandler(console)
@@ -1167,8 +1191,8 @@ def main():
    # Find encoding; relevant for external processing activities
    logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)

-    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly advised:
-    if not sabnzbd.WIN32 and not sabnzbd.MACOS and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
+    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
+    if not sabnzbd.WIN32 and not sabnzbd.DARWIN and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
        helpful_warning(
            T(
                "SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads."
@@ -1183,9 +1207,6 @@ def main():
            sabnzbd.ORG_UMASK,
        )

-    # Log JSON module in case of problems
-    logging.debug("JSON-module = %s %s", sabnzbd.api.json.__name__, sabnzbd.api.json.__version__)
-
    # SSL Information
    logging.info("SSL version = %s", ssl.OPENSSL_VERSION)

@@ -1203,13 +1224,22 @@ def main():
            logging.warning(T("Could not load additional certificates from certifi package"))
            logging.info("Traceback: ", exc_info=True)

-    # List the number of certificates available (can take up to 1.5 seconds)
+    # Extra startup info
    if sabnzbd.cfg.log_level() > 1:
+        # List the number of certificates available (can take up to 1.5 seconds)
        logging.debug("Available certificates = %s", repr(ssl.create_default_context().cert_store_stats()))

+        # List networking
+        logging.debug("Local IPv4 address = %s", localipv4())
+        logging.debug("Public IPv4 address = %s", publicipv4())
+        logging.debug("IPv6 address = %s", ipv6())
+
+        # Measure and log system performance measured by pystone and - if possible - CPU model
+        logging.debug("CPU Pystone available performance = %s", getpystone())
+        logging.debug("CPU model = %s", getcpu())
+
    logging.info("Using INI file %s", inifile)

-    # Store auto-browser setting from command line
    if autobrowser is not None:
        sabnzbd.cfg.autobrowser.set(autobrowser)

@@ -1217,15 +1247,15 @@ def main():

    os.chdir(sabnzbd.DIR_PROG)

-    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STD_WEB_DIR, fix_webname(web_dir))
-    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STD_CONFIG, "")
+    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STDINTF, fix_webname(web_dir))
+    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STDCONFIG, "")
    sabnzbd.WIZARD_DIR = os.path.join(sabnzbd.DIR_INTERFACES, "wizard")

    sabnzbd.WEB_COLOR = check_template_scheme(sabnzbd.cfg.web_color(), sabnzbd.WEB_DIR)
    sabnzbd.cfg.web_color.set(sabnzbd.WEB_COLOR)

    # Handle the several tray icons
-    if sabnzbd.cfg.tray_icon() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
+    if sabnzbd.cfg.win_menu() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
        if sabnzbd.WIN32:
            sabnzbd.WINTRAY = sabnzbd.sabtray.SABTrayThread()
        elif sabnzbd.LINUX_POWER and os.environ.get("DISPLAY"):
@@ -1236,7 +1266,7 @@ def main():
                from gi.repository import Gtk
                import sabnzbd.sabtraylinux

-                sabnzbd.sabtraylinux.StatusIcon()
+                sabnzbd.LINUXTRAY = sabnzbd.sabtraylinux.StatusIcon()
            except:
                logging.info("python3-gi not found, no SysTray.")

@@ -1275,29 +1305,29 @@ def main():
    # Starting of the webserver
    # Determine if this system has multiple definitions for 'localhost'
    hosts = all_localhosts()
-    multilocal = len(hosts) > 1 and web_host in ("localhost", "0.0.0.0")
+    multilocal = len(hosts) > 1 and cherryhost in ("localhost", "0.0.0.0")

    # For 0.0.0.0 CherryPy will always pick IPv4, so make sure the secondary localhost is IPv6
-    if multilocal and web_host == "0.0.0.0" and hosts[1] == "127.0.0.1":
+    if multilocal and cherryhost == "0.0.0.0" and hosts[1] == "127.0.0.1":
        hosts[1] = "::1"

    # The Windows binary requires numeric localhost as primary address
-    if web_host == "localhost":
-        web_host = hosts[0]
+    if cherryhost == "localhost":
+        cherryhost = hosts[0]

    if enable_https:
        if https_port:
            # Extra HTTP port for primary localhost
-            attach_server(web_host, web_port)
+            attach_server(cherryhost, cherryport)
            if multilocal:
                # Extra HTTP port for secondary localhost
-                attach_server(hosts[1], web_port)
+                attach_server(hosts[1], cherryport)
                # Extra HTTPS port for secondary localhost
                attach_server(hosts[1], https_port, https_cert, https_key, https_chain)
-            web_port = https_port
+            cherryport = https_port
        elif multilocal:
            # Extra HTTPS port for secondary localhost
-            attach_server(hosts[1], web_port, https_cert, https_key, https_chain)
+            attach_server(hosts[1], cherryport, https_cert, https_key, https_chain)

        cherrypy.config.update(
            {
@@ -1309,7 +1339,7 @@ def main():
        )
    elif multilocal:
        # Extra HTTP port for secondary localhost
-        attach_server(hosts[1], web_port)
+        attach_server(hosts[1], cherryport)

    if no_login:
        sabnzbd.cfg.username.set("")
@@ -1332,9 +1362,10 @@ def main():
    cherrypy.config.update(
        {
            "server.environment": "production",
-            "server.socket_host": web_host,
-            "server.socket_port": web_port,
+            "server.socket_host": cherryhost,
+            "server.socket_port": cherryport,
            "server.shutdown_timeout": 0,
+            "log.screen": False,
            "engine.autoreload.on": False,
            "tools.encode.on": True,
            "tools.gzip.on": True,
@@ -1345,19 +1376,14 @@ def main():
        }
    )

-    # Catch shutdown errors that can break cherrypy/cheroot
-    # See https://github.com/cherrypy/cheroot/issues/710
-    try:
-        cheroot.errors.acceptable_sock_shutdown_exceptions += (OSError,)
-    except AttributeError:
-        pass
-
    # Do we want CherryPy Logging? Cannot be done via the config
-    cherrypy.log.screen = False
-    cherrypy.log.access_log.propagate = False
    if cherrypylogging:
        sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)
+        cherrypy.log.screen = True
+        cherrypy.log.access_log.propagate = True
        cherrypy.log.access_file = str(sabnzbd.WEBLOGFILE)
+    else:
+        cherrypy.log.access_log.propagate = False

    # Force mimetypes (OS might overwrite them)
    forced_mime_types = {"css": "text/css", "js": "application/javascript"}
@@ -1401,7 +1427,7 @@ def main():

    # Set authentication for CherryPy
    sabnzbd.interface.set_auth(cherrypy.config)
-    logging.info("Starting web-interface on %s:%s", web_host, web_port)
+    logging.info("Starting web-interface on %s:%s", cherryhost, cherryport)

    sabnzbd.cfg.log_level.callback(guard_loglevel)

@@ -1411,26 +1437,26 @@ def main():
        # Since the webserver is started by cherrypy in a separate thread, we can't really catch any
        # start-up errors. This try/except only catches very few errors, the rest is only shown in the console.
        logging.error(T("Failed to start web-interface: "), exc_info=True)
-        abort_and_show_error(browserhost, web_port)
-
-    # Create a record of the active cert/key/chain files, for use with config.create_config_backup()
-    if enable_https:
-        for setting in CONFIG_BACKUP_HTTPS.values():
-            if full_path := getattr(sabnzbd.cfg, setting).get_path():
-                sabnzbd.CONFIG_BACKUP_HTTPS_OK.append(full_path)
-
-    # Set URL for browser
-    if enable_https:
-        sabnzbd.BROWSER_URL = "https://%s:%s%s" % (browserhost, web_port, sabnzbd.cfg.url_base())
-    else:
-        sabnzbd.BROWSER_URL = "http://%s:%s%s" % (browserhost, web_port, sabnzbd.cfg.url_base())
+        abort_and_show_error(browserhost, cherryport)

    if sabnzbd.WIN32:
-        # Write URL for uploads and version check directly to registry
-        set_connection_info(f"{sabnzbd.BROWSER_URL}/api?apikey={sabnzbd.cfg.api_key()}")
+        if enable_https:
+            mode = "s"
+        else:
+            mode = ""
+        api_url = "http%s://%s:%s%s/api?apikey=%s" % (
+            mode,
+            browserhost,
+            cherryport,
+            sabnzbd.cfg.url_base(),
+            sabnzbd.cfg.api_key(),
+        )
+
+        # Write URL directly to registry
+        set_connection_info(api_url)

    if pid_path or pid_file:
-        sabnzbd.pid_file(pid_path, pid_file, web_port)
+        sabnzbd.pid_file(pid_path, pid_file, cherryport)

    # Stop here in case of fatal errors
    if sabnzbd.NO_DOWNLOADING:
@@ -1452,20 +1478,29 @@ def main():
        for upload_nzb in upload_nzbs:
            sabnzbd.nzbparser.add_nzbfile(upload_nzb)

+    # Set URL for browser
+    if enable_https:
+        browser_url = "https://%s:%s%s" % (browserhost, cherryport, sabnzbd.cfg.url_base())
+    else:
+        browser_url = "http://%s:%s%s" % (browserhost, cherryport, sabnzbd.cfg.url_base())
+    sabnzbd.BROWSER_URL = browser_url
+
    if not autorestarted:
-        launch_a_browser(sabnzbd.BROWSER_URL)
+        launch_a_browser(browser_url)
        notifier.send_notification("SABnzbd", T("SABnzbd %s started") % sabnzbd.__version__, "startup")
+        # Now's the time to check for a new version
+        check_latest_version()
    autorestarted = False

    # Start SSDP and Bonjour if SABnzbd isn't listening on localhost only
-    if sabnzbd.cfg.enable_broadcast() and not is_localhost(web_host):
+    if sabnzbd.cfg.enable_broadcast() and not is_localhost(cherryhost):
        # Try to find a LAN IP address for SSDP/Bonjour
-        if is_lan_addr(web_host):
+        if is_lan_addr(cherryhost):
            # A specific listening address was configured, use that
-            external_host = web_host
+            external_host = cherryhost
        else:
            # Fall back to the IPv4 address of the LAN interface
-            external_host = local_ipv4()
+            external_host = localipv4()
        logging.debug("Using %s as host address for Bonjour and SSDP", external_host)

        # Only broadcast to local network addresses. If local ranges have been defined, further
@@ -1476,13 +1511,13 @@ def main():
            (not sabnzbd.cfg.local_ranges()) or any(ip_in_subnet(external_host, r) for r in sabnzbd.cfg.local_ranges())
        ):
            # Start Bonjour and SSDP
-            sabnzbd.zconfig.set_bonjour(external_host, web_port)
+            sabnzbd.zconfig.set_bonjour(external_host, cherryport)

            # Set URL for browser for external hosts
            ssdp_url = "%s://%s:%s%s" % (
                ("https" if enable_https else "http"),
                external_host,
-                web_port,
+                cherryport,
                sabnzbd.cfg.url_base(),
            )
            ssdp.start_ssdp(
@@ -1547,16 +1582,13 @@ def main():
            sys.argv = sabnzbd.RESTART_ARGS
            os.chdir(org_dir)

-            # Restore backup
-            if sabnzbd.RESTORE_DATA:
-                config.restore_config_backup(sabnzbd.RESTORE_DATA)
-
            # Binaries require special restart
            if hasattr(sys, "frozen"):
-                if sabnzbd.MACOS:
+                if sabnzbd.DARWIN:
                    # On macOS restart of app instead of embedded python
+                    my_name = sabnzbd.MY_FULLNAME.replace("/Contents/MacOS/SABnzbd", "")
                    my_args = " ".join(sys.argv[1:])
-                    cmd = 'kill -9 %s && open "%s" --args %s' % (os.getpid(), sys.executable, my_args)
+                    cmd = 'kill -9 %s && open "%s" --args %s' % (os.getpid(), my_name, my_args)
                    logging.info("Launching: %s", cmd)
                    os.system(cmd)
                elif sabnzbd.WIN_SERVICE:
@@ -1573,20 +1605,15 @@ def main():
    # Send our final goodbyes!
    notifier.send_notification("SABnzbd", T("SABnzbd shutdown finished"), "startup")
    logging.info("Leaving SABnzbd")
+    sys.stderr.flush()
+    sys.stdout.flush()
    sabnzbd.pid_file()

-    try:
-        sys.stderr.flush()
-        sys.stdout.flush()
-    except AttributeError:
-        # Not supported on Windows binaries
-        pass
-
-    if hasattr(sys, "frozen") and sabnzbd.MACOS:
+    if hasattr(sys, "frozen") and sabnzbd.DARWIN:
        try:
            AppHelper.stopEventLoop()
        except:
-            # Failing AppHelper library!
+            # Failing AppHelper libary!
            os._exit(0)
    elif sabnzbd.WIN_SERVICE:
        # Do nothing, let service handle it
@@ -1720,7 +1747,7 @@ if __name__ == "__main__":
        if not handle_windows_service():
            main()

-    elif sabnzbd.MACOS and sabnzbd.FOUNDATION:
+    elif sabnzbd.DARWIN and sabnzbd.FOUNDATION:
        # macOS binary runner
        from threading import Thread
        from PyObjCTools import AppHelper
@@ -1740,10 +1767,10 @@ if __name__ == "__main__":

        # Initialize the menu
        shared_app = NSApplication.sharedApplication()
-        sabnzbd.MACOSTRAY = SABnzbdDelegate.alloc().init()
-        shared_app.setDelegate_(sabnzbd.MACOSTRAY)
+        sabnzbd_menu = SABnzbdDelegate.alloc().init()
+        shared_app.setDelegate_(sabnzbd_menu)
        # Build the menu
-        sabnzbd.MACOSTRAY.awakeFromNib()
+        sabnzbd_menu.awakeFromNib()
        # Run the main eventloop
        AppHelper.runEventLoop()
    else:
--- a/builder/SABnzbd.spec
+++ b/builder/SABnzbd.spec
@@ -1,28 +1,53 @@
 # -*- mode: python -*-
-import os
+import re
 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.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION, 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", "pkg_resources.extern"]
-extra_hiddenimports.extend(collect_submodules("apprise"))
+extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
 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(["objc", "PyObjCTools"])
+    extra_hiddenimports.extend(["pyobjc", "objc", "PyObjCTools"])
    # macOS folders
-    EXTRA_FOLDERS += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
+    extra_folders += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
    # Add NZB-icon file
    extra_pyinstaller_files.append(("builder/osx/image/nzbfile.icns", "."))
    # Version information is set differently on macOS
@@ -40,16 +65,20 @@ else:
    )

    # Windows
-    extra_hiddenimports.extend(["win32timezone", "winrt.windows.foundation.collections"])
-    EXTRA_FOLDERS += ["win/multipar/", "win/par2/", "win/unrar/", "win/7zip/"]
-    EXTRA_FILES += ["portable.cmd"]
+    extra_hiddenimports.append("win32timezone")
+    extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
+    extra_files += ["portable.cmd"]
+
+    # 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)

    # Detailed instructions are in the PyInstaller documentation
    # We don't include the alpha/beta/rc in the counters
    version_info = VSVersionInfo(
        ffi=FixedFileInfo(
-            filevers=RELEASE_VERSION_TUPLE,
-            prodvers=RELEASE_VERSION_TUPLE,
+            filevers=version_tuple,
+            prodvers=version_tuple,
            mask=0x3F,
            flags=0x0,
            OS=0x40004,
@@ -79,46 +108,36 @@ else:
    )

 # 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"))

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

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

-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/osx/entitlements.plist",
-    codesign_identity=codesign_identity,
 )

 coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.zipfiles, pyi_analysis.datas, name="SABnzbd")
@@ -132,9 +151,9 @@ if sys.platform == "win32":
        [],
        exclude_binaries=True,
        name="SABnzbd-console",
+        upx=True,
        append_pkg=False,
        icon="icons/sabnzbd.ico",
-        contents_directory=".",
        version=version_info,
    )

@@ -143,6 +162,7 @@ if sys.platform == "win32":
        pyi_analysis.binaries,
        pyi_analysis.zipfiles,
        pyi_analysis.datas,
+        upx=True,
        name="SABnzbd-console",
    )

@@ -165,14 +185,8 @@ if sys.platform == "darwin":
                "NSPersistentStoreTypeKey": "Binary",
            }
        ],
-        "LSMinimumSystemVersion": "10.13",
+        "LSMinimumSystemVersion": "10.9",
        "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
    }

-    app = BUNDLE(
-        coll,
-        name="SABnzbd.app",
-        icon="builder/osx/image/sabnzbdplus.icns",
-        bundle_identifier="org.sabnzbd.sabnzbd",
-        info_plist=info_plist,
-    )
+    app = BUNDLE(coll, name="SABnzbd.app", icon="builder/osx/image/sabnzbdplus.icns", info_plist=info_plist)
--- a/builder/constants.py
+++ b/builder/constants.py
@@ -1,72 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2024 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 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__
-
-# 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
-
-# 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)
-
-# 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"
-
-# Used in package.py and SABnzbd.spec
-EXTRA_FILES = [
-    RELEASE_README,
-    "README.txt",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-]
-EXTRA_FOLDERS = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
--- a/builder/make_dmg.py
+++ b/builder/make_dmg.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2024 by The SABnzbd-Team (sabnzbd.org)
+# 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
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 import os
-from constants import RELEASE_VERSION
+import pkginfo


 # We need to call dmgbuild from command-line, so here we can setup how
@@ -37,7 +37,7 @@ if __name__ == "__main__":

    # Extract version info and set DMG path
    # Create sub-folder to upload later
-    release = RELEASE_VERSION
+    release = pkginfo.Develop(".").version
    prod = "SABnzbd-" + release
    fileDmg = prod + "-osx.dmg"

--- a/builder/package.py
+++ b/builder/package.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2024 by The SABnzbd-Team (sabnzbd.org)
+# 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
@@ -20,36 +20,45 @@ import platform
 import re
 import sys
 import os
-import tempfile
 import time
 import shutil
 import subprocess
 import tarfile
-import urllib.request
-import urllib.error
-import configobj
-from typing import List
+import pkginfo
+import github

-from constants import (
-    RELEASE_VERSION,
-    RELEASE_VERSION_TUPLE,
-    VERSION_FILE,
-    RELEASE_README,
-    RELEASE_NAME,
-    RELEASE_BINARY_32,
-    RELEASE_BINARY_64,
-    RELEASE_INSTALLER,
-    ON_GITHUB_ACTIONS,
-    RELEASE_THIS,
-    RELEASE_SRC,
-    EXTRA_FILES,
-    EXTRA_FOLDERS,
-)
+
+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/",
+]


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


-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 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 run_external_command(command: List[str], print_output: bool = True):
+def run_external_command(command):
    """Wrapper to ease the use of calling external programs"""
    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    output, _ = process.communicate()
    ret = process.wait()
-    if (output and print_output) or ret != 0:
+    if output:
        print(output)
    if ret != 0:
        raise RuntimeError("Command returned non-zero exit code %s!" % ret)
@@ -110,68 +114,6 @@ def patch_version_file(release_name):
        ver.write(version_file)


-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:
-                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 + "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:
@@ -181,15 +123,32 @@ 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:
        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"
+
    # Patch release file
    patch_version_file(RELEASE_VERSION)

+    # 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", "")
+
    # Rename release notes file
    safe_remove("README.txt")
    shutil.copyfile(RELEASE_README, "README.txt")
@@ -208,7 +167,7 @@ if __name__ == "__main__":
    safe_remove(RELEASE_NAME)

    # Copy the specification
-    shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
+    shutil.copyfile("builder/%s" % SPEC_FILE, SPEC_FILE)

    if "binary" in sys.argv or "installer" in sys.argv:
        # Must be run on Windows
@@ -217,10 +176,8 @@ if __name__ == "__main__":

        # Check what architecture we are on
        RELEASE_BINARY = RELEASE_BINARY_32
-        BUILDING_64BIT = False
        if platform.architecture()[0] == "64bit":
            RELEASE_BINARY = RELEASE_BINARY_64
-            BUILDING_64BIT = True

        # Remove any leftovers
        safe_remove(RELEASE_BINARY)
@@ -232,20 +189,18 @@ if __name__ == "__main__":
        safe_remove("dist/SABnzbd-console")

        # Remove unwanted DLL's
-        shutil.rmtree("dist/SABnzbd/Pythonwin")
-        if BUILDING_64BIT:
-            # These are only present on 64bit (Python 3.9+)
-            delete_files_glob("dist/SABnzbd/api-ms-win*.dll", allow_no_matches=True)
-            delete_files_glob("dist/SABnzbd/ucrtbase.dll", allow_no_matches=True)
+        delete_files_glob("dist/SABnzbd/api-ms-win*.dll")
+        delete_files_glob("dist/SABnzbd/mfc140u.dll")
+        delete_files_glob("dist/SABnzbd/ucrtbase.dll")

-            # Remove 32bit external executables
-            delete_files_glob("dist/SABnzbd/win/par2/par2.exe")
-            delete_files_glob("dist/SABnzbd/win/multipar/par2j.exe")
-            delete_files_glob("dist/SABnzbd/win/unrar/UnRAR.exe")
+        # 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 not BUILDING_64BIT:
+            if RELEASE_BINARY != RELEASE_BINARY_64:
                raise RuntimeError("Installer should be created on 64bit Python")

            # Compile NSIS translations
@@ -254,27 +209,28 @@ if __name__ == "__main__":
            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_VERSIONKEY=%s" % ".".join(map(str, RELEASE_VERSION_TUPLE)),
                    "/DSAB_FILE=%s" % RELEASE_INSTALLER,
                    "NSIS_Installer.nsi.tmp",
                ]
            )

        # Rename the folder
-        shutil.copytree("dist/SABnzbd", RELEASE_NAME)
+        os.rename("dist/SABnzbd", RELEASE_NAME)

        # Create the archive
        run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, RELEASE_NAME])

-        # Test the release, as the very last step to not mess with any release code
-        test_sab_binary("dist/SABnzbd/SABnzbd.exe")
-
    if "app" in sys.argv:
        # Must be run on macOS
        if sys.platform != "darwin":
@@ -285,16 +241,28 @@ if __name__ == "__main__":
        notarization_user = os.environ.get("NOTARIZATION_USER")
        notarization_pass = os.environ.get("NOTARIZATION_PASS")

-        # We need to sign all the included binaries before packaging them
-        # Otherwise the signature of the main application becomes invalid
+        # Run PyInstaller and check output
+        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
+
+        # Make sure we created a fully universal2 release when releasing or during CI
+        if RELEASE_THIS or ON_GITHUB_ACTIONS:
+            for bin_to_check in glob.glob("dist/SABnzbd.app/Contents/MacOS/**/*.so", recursive=True):
+                print("Checking if binary is universal2: %s" % bin_to_check)
+                file_output = run_external_command(["file", bin_to_check])
+                # 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!")
+
+        # Only continue if we can sign
        if authority:
            files_to_sign = [
-                "osx/par2/par2-turbo",
-                "osx/par2/arm64/par2-turbo",
-                "osx/unrar/unrar",
-                "osx/unrar/arm64/unrar",
-                "osx/7zip/7zz",
+                "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",
            ]
+
            for file_to_sign in files_to_sign:
                print("Signing %s with hardended runtime" % file_to_sign)
                run_external_command(
@@ -307,55 +275,15 @@ if __name__ == "__main__":
                        "runtime",
                        "--entitlements",
                        "builder/osx/entitlements.plist",
+                        "-i",
+                        "org.sabnzbd.sabnzbd",
                        "-s",
                        authority,
                        file_to_sign,
                    ],
-                    print_output=False,
                )
                print("Signed %s!" % file_to_sign)

-        # Run PyInstaller and check output
-        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
-
-        # Make sure we created a fully universal2 release when releasing or during CI
-        if RELEASE_THIS or ON_GITHUB_ACTIONS:
-            for bin_to_check in glob.glob("dist/SABnzbd.app/Contents/MacOS/**/*.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!")
-
-        # 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)
-
            # Only notarize for real builds that we want to deploy
            if notarization_user and notarization_pass and RELEASE_THIS:
                # Prepare zip to upload to notarization service
@@ -368,24 +296,50 @@ if __name__ == "__main__":

                # Upload to Apple
                print("Sending zip to Apple notarization service")
-                upload_result = run_external_command(
+                upload_process = run_external_command(
                    [
                        "xcrun",
-                        "notarytool",
-                        "submit",
+                        "altool",
+                        "--notarize-app",
+                        "-t",
+                        "osx",
+                        "-f",
                        notarization_zip,
-                        "--apple-id",
+                        "--primary-bundle-id",
+                        "org.sabnzbd.sabnzbd",
+                        "-u",
                        notarization_user,
-                        "--team-id",
-                        authority,
-                        "--password",
+                        "-p",
                        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: accepted" not in upload_result.lower():
+                if "Status: success" not in check_status:
                    raise RuntimeError("Failed to notarize..")

                # Staple the notarization!
@@ -398,9 +352,6 @@ if __name__ == "__main__":
        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 "source" in sys.argv:
        # Prepare Source distribution package.
        # We assume the sources are freshly cloned from the repo
@@ -413,15 +364,15 @@ 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:
+        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
@@ -461,6 +412,163 @@ 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"])
--- a/builder/release-requirements.txt
+++ b/builder/release-requirements.txt
@@ -1,2 +0,0 @@
-PyGithub==2.4.0
-praw==7.7.1
--- a/builder/release.py
+++ b/builder/release.py
@@ -1,265 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2008-2024 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 hashlib
-import json
-import os
-import re
-import xml.etree.ElementTree as ET
-
-import github
-import praw
-
-from constants import (
-    RELEASE_VERSION,
-    PRERELEASE,
-    RELEASE_SRC,
-    RELEASE_BINARY_32,
-    RELEASE_BINARY_64,
-    RELEASE_INSTALLER,
-    RELEASE_MACOS,
-    RELEASE_README,
-    RELEASE_THIS,
-    RELEASE_TITLE,
-    APPDATA_FILE,
-)
-
-# Verify we have all 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 not os.path.exists(file_to_check):
-        raise RuntimeError("Not all release files are present!")
-print("All release files are present")
-
-# Verify that appdata file is updated
-if not PRERELEASE:
-    if not isinstance(ET.parse(APPDATA_FILE).find(f"./releases/release[@version='{RELEASE_VERSION}']"), ET.Element):
-        raise RuntimeError(f"Could not find {RELEASE_VERSION} in {APPDATA_FILE}")
-
-# Calculate hashes for Synology release
-with open(RELEASE_SRC, "rb") as inp_file:
-    source_data = inp_file.read()
-
-print("---- Synology spksrc digest hashes ---- ")
-print(RELEASE_SRC, "SHA1", hashlib.sha1(source_data).hexdigest())
-print(RELEASE_SRC, "SHA256", hashlib.sha256(source_data).hexdigest())
-print(RELEASE_SRC, "MD5", hashlib.md5(source_data).hexdigest())
-print("----")
-
-# 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()
-
-    # 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
-    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")
-        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")
-
-    # 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")
-
-        # Read the release notes
-        with open(RELEASE_README, "r") as readme_file:
-            readme_lines = readme_file.readlines()
-
-        # 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")
-
-else:
-    print("To push release to GitHub, first tag the commit.")
-    print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")
--- a/builder/requirements.txt
+++ b/builder/requirements.txt
@@ -1,27 +1,9 @@
 # Basic build requirements
-# Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-pyinstaller==5.13.2
-packaging==24.1
-pyinstaller-hooks-contrib==2024.8
-altgraph==0.17.4
-wrapt==1.16.0
-setuptools==75.1.0
+pyinstaller>=4.8
+setuptools
+pkginfo
+certifi
+pygithub

-# Required on 32bit Windows, exclude it based on Python-version
-importlib_metadata==8.5.0; python_version < '3.10'
-importlib_resources==6.4.5; python_version < '3.10'
-zipp==3.20.2; python_version < '3.10'
-
-# orjson does not support 32bit Windows, also exclude based on Python-version
-orjson==3.10.7; python_version > '3.8'
-
-# For the Windows build
-pefile==2024.8.26; sys_platform == 'win32'
-pywin32-ctypes==0.2.3; sys_platform == 'win32'
-
-# For the macOS build
-dmgbuild==1.6.2; sys_platform == 'darwin'
-mac-alias==2.2.2; sys_platform == 'darwin'
-macholib==1.16.3; sys_platform == 'darwin'
-ds-store==1.3.1; sys_platform == 'darwin'
-PyNaCl==1.5.0; sys_platform == 'darwin'
+# For the OSX build specific
+dmgbuild; sys_platform == 'darwin'
--- a/builder/win/NSIS_Installer.nsi
+++ b/builder/win/NSIS_Installer.nsi
@@ -1,6 +1,6 @@
 ; -*- coding: utf-8 -*-
 ;
-; Copyright 2008-2015 The SABnzbd-Team (sabnzbd.org)
+; Copyright 2008-2015 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
@@ -32,7 +32,7 @@ Unicode true

 ;------------------------------------------------------------------
 ;
-; Macro for removing existing and the current installation
+; Marco for removing existing and the current installation
 ; It shared by the installer and the uninstaller.
 ;
 !define RemovePrev "!insertmacro RemovePrev"
@@ -42,47 +42,13 @@ 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 "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}"
-
+  Name "${SAB_PRODUCT}"
  OutFile "${SAB_FILE}"
  InstallDir "$PROGRAMFILES\SABnzbd"

+
 ;------------------------------------------------------------------
 ; Some default compiler settings (uncomment and change at will):
  SetCompress auto ; (can be off or force)
@@ -90,7 +56,7 @@ Unicode true
  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 original date)
+  SetDateSave off ; (can be on to have files restored to their orginal date)
  WindowIcon on
  SpaceTexts none

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

+
 ;------------------------------------------------------------------
 ;Variables
  Var MUI_TEMP
@@ -175,7 +142,6 @@ 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"
@@ -203,64 +169,37 @@ Unicode true
 Section "SABnzbd" SecDummy

  SetOutPath "$INSTDIR"
-  SetShellVarContext all
-
-  DetailPrint $(MsgShutting)
-
-  ;------------------------------------------------------------------
-  ; Shutdown any running service
-
-  !insertmacro SERVICE "stop" "SABnzbd" ""
-
-  ;------------------------------------------------------------------
-  ; Terminate SABnzbd.exe
-  loop:
-    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
-    StrCmp $R0 0 0 endcheck
-    ${nsProcess::CloseProcess} "SABnzbd.exe" $R0
-    Sleep 500
-    Goto loop
-  endcheck:
-  ${nsProcess::Unload}

  ;------------------------------------------------------------------
  ; Make sure old versions are gone (reg-key already read in onInt)
  StrCmp $PREV_INST_DIR "" 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 to registry
+  ; Add firewall rules
+  liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+  liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+
+  ;------------------------------------------------------------------
+  ; Add to registery
  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"  40674
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  25674
  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"

@@ -309,7 +248,7 @@ Function .onInit
  ; 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 custom dir if he used one
+    ; We want to use the user's costom 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
@@ -318,23 +257,13 @@ 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
-      ; 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
+      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
@@ -346,6 +275,31 @@ 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
  ;
@@ -353,8 +307,7 @@ Function .onInit
  Pop $0 ;response
  ${If} $0 == true
    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgServChange) IDOK removeservices IDCANCEL exitinstall
-    exitinstall:
-      Abort
+    ; exitinstall already defined above
    removeservices:
        !insertmacro SERVICE "delete" "SABHelper" ""
        !insertmacro SERVICE "delete" "SABnzbd" ""
@@ -375,24 +328,32 @@ FunctionEnd
 UninstallText $(MsgUninstall)

 Section "un.$(MsgDelProgram)" Uninstall
-;make sure sabnzbd.exe isn't running..if so shut it down
-  DetailPrint $(MsgShutting)
+;make sure sabnzbd.exe isnt running..if so shut it down
  ${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"
-  ${RemovePrevShortcuts}

-  ; Remove firewall entries
-  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+  !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"

  ${unregisterExtension} ".nzb" "NZB File"
  ${RefreshShellIcons}
@@ -413,14 +374,14 @@ SectionEnd

  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"

+  LangString MsgCloseSab    ${LANG_ENGLISH} "Please close $\"SABnzbd.exe$\" first"
+
  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 MsgOnly64bit   ${LANG_ENGLISH} "The installer only supports 64-bit Windows, use the standalone version to run on 32-bit Windows."

  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 MsgUninstall   ${LANG_ENGLISH} "This will uninstall SABnzbd from your system"

  LangString MsgRunAtStart  ${LANG_ENGLISH} "Run at startup"
--- a/interfaces/Config/templates/_inc_footer_uc.tmpl
+++ b/interfaces/Config/templates/_inc_footer_uc.tmpl
@@ -12,13 +12,13 @@
                    <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('hiddenFolders')</span>
+                                <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</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>
--- a/interfaces/Config/templates/_inc_header_uc.tmpl
+++ b/interfaces/Config/templates/_inc_header_uc.tmpl
@@ -34,9 +34,6 @@
    <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" />
-    <!--#if $color_scheme not in ('Light', '') #-->
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/${color_scheme}.css?v=$version"/>
-    <!--#end if#-->

    <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />

@@ -70,7 +67,27 @@
    <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></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) {
@@ -92,7 +109,7 @@
                <span class="icon-bar"></span>
            </button>

-            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')" data-placement="bottom">
+            <a class="navbar-logo navbar-logo-small" href="${root}" title="$T('Home')">
                #include $webdir + "/staticcfg/images/logo-small.svg"#
            </a>
        </div>
@@ -164,7 +181,7 @@
                    </a>
                </li>
                <li>
-                    <a href="$help_uri" target="_blank">
+                    <a href="$helpuri$help_uri" target="_blank">
                        <span class="glyphicon glyphicon-question-sign"></span>
                        <strong>$T('menu-help')</strong>
                    </a>
--- a/interfaces/Config/templates/config.tmpl
+++ b/interfaces/Config/templates/config.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri = $confighelpuri + "configure"#-->
+<!--#set global $help_uri="configuration/3.5/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -25,31 +25,59 @@
                </tr>
                <tr>
                    <th scope="row">$T('pythonVersion'): </th>
-                    <td>$sys.version [$CODEPAGE]</td>
+                    <td>$sys.version[:120] [$CODEPAGE]</td>
                </tr>
                <tr>
                    <th scope="row">OpenSSL:</th>
-                    <td>$ssl_version</td>
-                </tr>
-                <!--#if not $windows and not $macos#-->
-                <tr>
-                    <th scope="row">Par2cmdline-turbo:</th>
                    <td>
-                        <!--#if $have_par2_turbo#-->
+                        $ssl_version
+                    </td>
+                </tr>
+                <!--#if not $certificate_validation#-->
+                <tr>
+                    <th scope="row"></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#-->
                        <span class="glyphicon glyphicon-ok"></span>
                        <!--#else#-->
-                        <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>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
+                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</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="https://sabnzbd.org/wiki/installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
                    </td>
                </tr>
                <!--#end if#-->
@@ -78,8 +106,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-live-chat') </th>
-                    <td><a href="https://sabnzbd.org/live-chat/" target="_blank">https://sabnzbd.org/live-chat/</a> (IRC &amp; Discord)</td>
+                    <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>
                </tr>
                <tr>
                    <th scope="row">$T('menu-issues') </th>
@@ -95,8 +123,8 @@
 </div>

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

--- a/interfaces/Config/templates/config_cat.tmpl
+++ b/interfaces/Config/templates/config_cat.tmpl
@@ -1,16 +1,15 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri = $confighelpuri + "categories"#-->
+<!--#set global $help_uri="configuration/3.5/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
    <div class="section">
-        <div class="padTable">
-            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+        <div class="padTable"> <a class="main-helplink" href="$helpuri$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="post" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
+                <form action="save" method="get" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
                    <table class="catTable">
                        <!--#if $cur == 0#-->
                        <tr>
@@ -105,29 +104,29 @@
 </div>
 <script type="text/javascript" src="${root}staticcfg/js/jquery-ui.min.js"></script>
 <script type="text/javascript">
-    jQuery(document).ready(function() {
-        jQuery('.delCat').click(function() {
-            var theForm = jQuery(this).closest("form");
+    \$(document).ready(function() {
+        \$('.delCat').click(function() {
+            var theForm = \$(this).closest("form");
            theForm.attr("action", "delete").submit();
        });

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

        // Make categories sortable
-        jQuery('.padTable').sortable({
+        \$('.padTable').sortable({
            items: '.sorting-row',
            containment: '.colmask',
            axis: 'y',
            update: function(event, ui) {
-                jQuery('.Categories form.sorting-row').each(function(index, elm) {
+                \$('.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 = {}
-                        jQuery(elm).extractFormDataTo(data);
-                        jQuery.ajax({
+                        \$(elm).extractFormDataTo(data);
+                        \$.ajax({
                            type: "GET",
                            url: window.location.pathname + 'save',
                            data: data,
--- a/interfaces/Config/templates/config_folders.tmpl
+++ b/interfaces/Config/templates/config_folders.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri = $confighelpuri + "folders"#-->
+<!--#set global $help_uri="configuration/3.5/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -14,7 +14,7 @@
    <input type="hidden" id="ajax" name="ajax" value="1" />
    <div class="section">
        <div class="col2">
-            <h3>$T('userFolders') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('userFolders') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <p>$T('explain-folderConfig')</p>
        </div><!-- /col2 -->
        <div class="col1">
@@ -35,8 +35,7 @@
                <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" />
-                    <a class="btn btn-default" href="${root}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>
+                    <span class="desc">$T('explain-complete_dir')</span>
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="complete_free">$T('opt-complete_free')</label>
@@ -48,7 +47,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 $windows#-->
+                <!--#if not $nt#-->
                <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" />
@@ -58,7 +57,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').replace(".nzb", $file_exts)</span>
+                    <span class="desc">$T('explain-dirscan_dir')</span>
                </div>
                <div class="field-pair advanced-settings">
                    <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
@@ -77,7 +76,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" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" />
                    <span class="desc">$T('explain-password_file')</span>
                </div>
                <div class="field-pair">
@@ -91,7 +90,7 @@
    </div><!-- /section -->
    <div class="section advanced-settings">
        <div class="col2">
-            <h3>$T('systemFolders') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            <p>$T('explain-folderConfig')</p>
        </div><!-- /col2 -->
        <div class="col1">
@@ -105,15 +104,9 @@
                    <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="${root}"><span class="glyphicon glyphicon-trash"></span> $T('purge_log_files')</a>
                    <span class="desc">$T('explain-log_dir')</span>
                </div>
                <div class="field-pair">
@@ -133,19 +126,7 @@
 <script type="text/javascript">
    jQuery(document).ready(function() {
        // Add autocomplete and file-browser
-        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
-
-        jQuery('#purge_log_files').click(function () {
-            if ( confirm("$T('confirm')") ) {
-                $.ajax({
-                    type: "POST",
-                    url: "../../api",
-                    data: {mode: 'config', name: 'purge_log_files', output: 'json', apikey: jQuery('#apikey').val()}
-                })
-            } else {
-                return false;
-            }
-        })
+        \$('.col1 input[name$="_dir"]').typeahead().fileBrowser();
    })
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->
--- a/interfaces/Config/templates/config_general.tmpl
+++ b/interfaces/Config/templates/config_general.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri = $confighelpuri + "general"#-->
+<!--#set global $help_uri="configuration/3.5/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -9,246 +9,220 @@
        </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="$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>
+    <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>
                    </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" 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-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>
-                        </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="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 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>
+    </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>
                        </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>
+                    <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 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" placeholder="socks5://username:password@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="$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 -->

-    <form action="uploadConfig" method="post" name="fullform" class="fullform" autocomplete="off" enctype="multipart/form-data">
-        <input type="hidden" name="apikey" value="$apikey" />
-        <input type="hidden" name="ajax" value="1" />
-        <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 -->

@@ -263,41 +237,41 @@
 </div>

 <script type="text/javascript">
-jQuery(document).ready(function(){
+\$(document).ready(function(){
    // Show the message about translating when it's non-English
    function hideOrShowTranslate() {
-        if(jQuery('#language').val() === 'en') {
-            jQuery('.alert-translate').hide()
+        if(\$('#language').val() == 'en') {
+            \$('.alert-translate').hide()
        } else {
-            jQuery('.alert-translate').show()
+            \$('.alert-translate').show()
        }
    }
-    jQuery('#language').on('change', function() {
+    \$('#language').on('change', function() {
        // Show message
        hideOrShowTranslate()
        // Re-load page on submit
-        jQuery('.fullform').submit(function() {
+        \$('.fullform').submit(function() {
            // Skip the fancy stuff, just submit
            this.submit()
        })
-        // No JSON response
-        jQuery('#ajax').val('')
+        // 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 = jQuery('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
    function checkSafety() {
-        if(jQuery('#host').val() !== 'localhost' && jQuery('#host').val() !== '127.0.0.1') {
+        if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
            // No limitation on local-network
-            if(jQuery('#inet_exposure').val() > 3) {
+            if(\$('#inet_exposure').val() > 3) {
                // And no username and password?
-                if(!jQuery('#${pid}_wu').val() || !jQuery('#${pid}_wp').val()) {
+                if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
                    // Add warning icon if not there already
-                    if(!jQuery('.host-warning').length) {
+                    if(!\$('.host-warning').length) {
                        safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
-                        jQuery('.host-warning').tooltip({'title': '$T('checkSafety')'})
+                        \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
                        safeCheck.addClass('host-warning-highlight')
                    }
                    return
@@ -305,60 +279,57 @@ jQuery(document).ready(function(){
            }
        }
        // Remove warnings
-        jQuery('.host-warning').remove()
+        \$('.host-warning').remove()
        safeCheck.removeClass('host-warning-highlight')
    }
    checkSafety()
    safeCheck.on('change', checkSafety)

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

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

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

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

-    jQuery('.generate_cert').click(function(e) {
+    \$('.generate_cert').click(function(e) {
        if(!confirm('$T('explain-new-cert')')) {
            return;
        }
@@ -367,7 +338,7 @@ jQuery(document).ready(function(){
        $.ajax({
            type: "POST",
            url: "../../api",
-            data: { mode: 'config', name: 'regenerate_certs', apikey: jQuery('#apikey').val() },
+            data: { mode: 'config', name: 'regenerate_certs', apikey: \$('#apikey').val() },
            success: function(msg) {
                do_restart()
            }
@@ -377,44 +348,30 @@ jQuery(document).ready(function(){
    })

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

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

    // Update the value
-    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())
+    \$('#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())
        } else {
-            jQuery('#bandwidth_max').val('')
+            \$('#bandwidth_max').val('')
        }
    })

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

--- a/interfaces/Config/templates/config_notify.tmpl
+++ b/interfaces/Config/templates/config_notify.tmpl
@@ -1,25 +1,23 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri = $confighelpuri + "notifications"#-->
+<!--#set global $help_uri="configuration/3.5/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">
                $T($notify_types[$type]).replace('/', ' / ')
            </label>
-            <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if $getVar($section_label + '_prio_' + $type) then 'checked="checked"' else ""#--> />
+            <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 $getVar($section_label + '_enable') then '' else 'style="display:none"'#-->>
+    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
        <hr>
        <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
+        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
            <!--#for $ct in $categories#-->
                <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
            <!--#end for#-->
@@ -35,10 +33,10 @@
    <input type="hidden" id="ajax" name="ajax" value="1" />
    <div class="section" id="email">
        <div class="col2">
-            <h3>$T('cmenu-email') <a href="$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('cmenu-email') <a href="$helpuri$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" size="$len($categories)">
+                <select name="email_cats" multiple="multiple" class="multiple_cats">
                    <!--#for $ct in $categories#-->
                        <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                    <!--#end for#-->
@@ -58,12 +56,12 @@
                </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 $email_full then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_full" id="email_full" value="1" <!--#if int($email_full) > 0 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 $email_rss then 'checked="checked"' else ""#--> />
+                    <input type="checkbox" name="email_rss" id="email_rss" value="1" <!--#if int($email_rss) > 0 then 'checked="checked"' else ""#--> />
                    <span class="desc">$T('explain-email_rss')</span>
                </div>
                <div class="field-pair">
@@ -107,12 +105,12 @@
            <h3>$T('section-NC')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if $ncenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ncenter_enable" id="ncenter_enable" value="1" <!--#if int($ncenter_enable) > 0 then 'checked="checked"' else ""#--> /></td>
                    <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                </tr>
            </table>
        </div>
-        <div class="col1" <!--#if $ncenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('ncenter')
                <div class="field-pair no-field-pair-bg">
@@ -126,19 +124,19 @@
       </div>
    </div>
    <!--#end if#-->
-    <!--#if $windows#-->
+    <!--#if $nt#-->
    <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 $acenter_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="acenter_enable" id="acenter_enable" value="1" <!--#if int($acenter_enable) > 0 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 $acenter_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('acenter')
                <div class="field-pair no-field-pair-bg">
@@ -155,16 +153,16 @@
    <!--#if $have_ntfosd#-->
    <div class="section">
        <div class="col2">
-            <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-OSD') <a href="$helpuri$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 $ntfosd_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 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 $ntfosd_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                $show_notify_checkboxes('ntfosd')
                <div class="field-pair no-field-pair-bg">
@@ -178,64 +176,19 @@
       </div>
    </div>
    <!--#end if#-->
-    <div class="section" id="apprise">
-        <div class="col2">
-            <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="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>
-            <em>$T('explain-apprise_enable')</em><br>
-            <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'). <br>$T('readwiki')</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" 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"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></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>
+            <h3>$T('section-NScript')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if $nscript_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 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="$help_uri#nscript" target="_blank">$T('readwiki')</a>
+            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
            $show_cat_box('nscript')
        </div>
-        <div class="col1" <!--#if $nscript_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
@@ -249,7 +202,7 @@
                <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('readwiki')</span>
+                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
                </div>
                $show_notify_checkboxes('nscript')
                <div class="field-pair no-field-pair-bg">
@@ -267,14 +220,14 @@
            <h3>$T('section-Prowl')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if $prowl_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="prowl_enable" id="prowl_enable" value="1" <!--#if int($prowl_enable) > 0 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 $prowl_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="prowl_apikey">$T('opt-prowl_apikey')</label>
@@ -313,14 +266,14 @@
            <h3>$T('section-Pushover')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if $pushover_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushover_enable" id="pushover_enable" value="1" <!--#if int($pushover_enable) > 0 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 $pushover_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="pushover_token">$T('opt-pushover_token')</label>
@@ -378,14 +331,14 @@
            <h3>$T('section-Pushbullet')</h3>
            <table>
                <tr>
-                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if $pushbullet_enable then 'checked="checked"' else ""#--> /></td>
+                    <td><input type="checkbox" name="pushbullet_enable" id="pushbullet_enable" value="1" <!--#if int($pushbullet_enable) > 0 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 $pushbullet_enable then '' else 'style="display:none"'#-->>
+        <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="pushbullet_apikey">$T('opt-pushbullet_apikey')</label>
@@ -414,24 +367,24 @@
 </div><!-- /colmask -->

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

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

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

        // Get the request
-        jQuery.ajax({
+        \$.ajax({
            type: "GET",
            url: "../../api",
            data: data
        }).then(function(data) {
            // Remove disabled and make the box
-            jQuery(buttonObj).removeAttr("disabled")
-            jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+            \$(buttonObj).removeAttr("disabled")
+            \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
            resultBox.removeClass('alert-success alert-danger').show()
            if(data.status) {
                resultBox.addClass('alert-success')
@@ -473,7 +426,7 @@ jQuery(document).ready(function(){
            }
        })
    }
-    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    \$('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
        testNotification(this)
    })
 });
--- a/interfaces/Config/templates/config_rss.tmpl
+++ b/interfaces/Config/templates/config_rss.tmpl
@@ -1,12 +1,12 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri = $confighelpuri + "rss"#-->
+<!--#set global $help_uri="configuration/3.5/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="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$helpuri$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" />
@@ -53,7 +53,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_html
+                                         $feed_item
                                    </a>
                                </td>
                                <td class="controls">
@@ -102,10 +102,10 @@
    </div>
    <!--#end if#-->
    <!--#if $active_feed#-->
-    <!--#set $feed = html.unescape($active_feed)#-->
+    <!--#set $feed = $active_feed#-->
    <div class="section rss-section">
        <div class="padTable">
-            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$helpuri$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;
                $active_feed
@@ -113,12 +113,12 @@
            <!--#if $error#-->
            <div class="alert alert-danger">
                <span class="glyphicon glyphicon-exclamation-sign"></span>
-                $error
+                <!--#echo html.escape($error)#-->
            </div>
            <!--#end if#-->
            <form action="upd_rss_feed" method="post">
                <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                <input type="hidden" name="uri" value="$rss[$feed]['uris']" />
                <table class="catTable">
                    <thead>
@@ -210,7 +210,7 @@
            <form action="upd_rss_filter" method="post">
                <input type="hidden" name="apikey" value="$apikey" />
                <input type="hidden" name="index" value="$rss[$feed]['filtercount']" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                <table class="catTable">
                    <tbody>
                        <tr>
@@ -286,7 +286,7 @@
                <form action="upd_rss_filter" method="post" autocomplete="off">
                    <input type="hidden" name="apikey" value="$apikey" />
                    <input type="hidden" name="index" value="$fnum" />
-                    <input type="hidden" name="feed" value="$active_feed" />
+                    <input type="hidden" name="feed" value="$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,8 +302,8 @@
                                        <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]=="&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=">" <!--#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="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>
                                    </select>
@@ -363,13 +363,13 @@
            <!--#end for#-->
            <form action="download_rss_feed" method="post">
                <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$active_feed" />
+                <input type="hidden" name="feed" value="$feed" />
                <div class="padding">
-                    <button type="button" class="btn btn-default testFeed" rel="$active_feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                    <button type="button" class="btn btn-default testFeed" rel="$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="$active_feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
+                      <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>
@@ -402,7 +402,7 @@
                    <tr class="infoTableSeperator">
                        <td>
                            <form action="download" method="get">
-                                <input type="hidden" value="$active_feed" name="feed" />
+                                <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']" />
@@ -446,7 +446,7 @@
                    <tr class="infoTableSeperator">
                        <td>
                            <form action="download" method="get">
-                                <input type="hidden" value="$active_feed" name="feed" />
+                                <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']" />
@@ -475,28 +475,24 @@
        <div class="tab-pane padTable" id="rss-tab-done">
            <!--#if $downloaded#-->
            <form action="clean_rss_jobs" method="post">
-                <input type="hidden" value="$active_feed" name="feed" />
+                <input type="hidden" value="$feed" name="feed" />
                <input type="hidden" name="apikey" value="$apikey" />
                <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>
@@ -551,43 +547,43 @@ function urlencode(str) {
    return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
 }

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

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

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

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

        // Fill the values
-        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)
+        \$('#feed_edit_name_label').text(whichFeed)
+        \$('#feed_edit_old_name').val(whichFeed)
+        \$('#feed_edit_new_name').val(whichFeed)
+        \$('#feed_edit_url').val(oldURI)

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

-    jQuery('.delFeed').click(function(e){
+    \$('.delFeed').click(function(e){
        e.preventDefault();
        if ( confirm("$T('confirm')") ) {
-            var whichFeed = jQuery(this).attr("rel");
-            jQuery.ajax({
+            var whichFeed = \$(this).attr("rel");
+            \$.ajax({
                type: "POST",
                url: "del_rss_feed",
                data: {feed: whichFeed, apikey: "$apikey" }
@@ -600,9 +596,9 @@ jQuery(document).ready(function(){
        }
    });

-    jQuery('.toggleFeedCheckbox').click(function(){
-        var whichFeed = jQuery(this).attr("rel");
-        jQuery.ajax({
+    \$('.toggleFeedCheckbox').click(function(){
+        var whichFeed = \$(this).attr("rel");
+        \$.ajax({
            type: "POST",
            url: "toggle_rss_feed",
            data: {feed: whichFeed, apikey: "$apikey" }
@@ -615,34 +611,34 @@ jQuery(document).ready(function(){
    });

    // Only the Accept filter needs all the options
-    jQuery('form[action="upd_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")
+    \$('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")
    })
    // Trigger on-load for all
-    jQuery('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
+    \$('.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!
-        jQuery(objButton).attr('disabled', true)
-        jQuery(objButton).find('span').remove()
-        jQuery(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
+        \$(objButton).attr('disabled', true)
+        \$(objButton).find('span').remove()
+        \$(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
    }

    // Enable sorting and set default
-    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-matched table').length) {
+        \$('#rss-tab-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-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-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-done table').length) {
-        jQuery('#rss-tab-done table').tablesort().data('tablesort').sort(jQuery('#rss-tab-done 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');
    }

-    jQuery('.testFeed').click(function(){
+    \$('.testFeed').click(function(){
        setActiveIcon(this)
-        var whichFeed = jQuery(this).attr("rel");
-        jQuery.ajax({
+        var whichFeed = \$(this).attr("rel");
+        \$.ajax({
            type: "POST",
            url: "test_rss_feed",
            data: {feed: whichFeed, apikey: "$apikey" }
@@ -654,34 +650,34 @@ jQuery(document).ready(function(){
        });
    });

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

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

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

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

--- a/interfaces/Config/templates/config_scheduling.tmpl
+++ b/interfaces/Config/templates/config_scheduling.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri = $confighelpuri + "scheduling"#-->
+<!--#set global $help_uri="configuration/3.5/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <%
@@ -15,7 +15,7 @@ else:
 <div class="colmask">
    <div class="section">
        <div class="col2">
-            <h3>$T('addSchedule') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addSchedule') <a href="$helpuri$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" />
@@ -112,32 +112,32 @@ else:
    </div><!-- /section -->
 </div><!-- /colmask -->
 <script type="text/javascript">
-    jQuery('#action').on('change', function() {
+    \$('#action').on('change', function() {
        // Set the action
-        jQuery('#arguments').val((jQuery(this).find('option:selected').data('action')))
+        \$('#arguments').val((\$(this).find('option:selected').data('action')))

        // Is it speedlimit?
-        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')
+        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')
        } else {
-            jQuery('#hidden_arguments').hide()
-            jQuery('#hidden_arguments input').attr('placeholder', '')
+            \$('#hidden_arguments').hide()
+            \$('#hidden_arguments input').attr('placeholder', '')
        }

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

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

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

-<script type="text/javascript">
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
    // 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>
@@ -28,7 +20,7 @@
        </label>

        <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('selectedDates')" data-placement="bottom">
+        <div class="chart-selector-container" title="$T('selectedDates')">
            <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')#-->"> -
@@ -37,7 +29,7 @@
    </div>
    <div class="section" id="addServerContent" style="display: none;">
        <div class="col2">
-            <h3>$T('addServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addServer') <a href="$helpuri$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();">
@@ -57,27 +49,27 @@
                        <label class="config" for="host">$T('srv-host')</label>
                        <input type="text" name="host" id="host" required />
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="563" min="0" max="65535" />
+                        <input type="number" name="port" id="port" size="8" value="119" min="0" />
                    </div>
                    <div class="field-pair">
                        <label class="config" for="ssl">$T('srv-ssl')</label>
-                        <input type="checkbox" name="ssl" id="ssl" value="1" checked />
+                        <input type="checkbox" name="ssl" id="ssl" value="1" />
                        <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}_000">$T('srv-username')</label>
-                        <input type="text" name="${pid}_000" id="${pid}_000" data-hide="username" />
+                        <label class="config" for="${pid}_00">$T('srv-username')</label>
+                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
                    </div>
                    <div class="field-pair">
-                        <label class="config" for="${pid}_001">$T('srv-password')</label>
-                        <input type="text" name="${pid}_001" id="${pid}_001" data-hide="password" />
+                        <label class="config" for="${pid}_01">$T('srv-password')</label>
+                        <input type="text" name="${pid}_01" id="${pid}_01" 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="500" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="1000" value="8" required />
                    </div>
                    <div class="field-pair">
                        <label class="config" for="priority">$T('srv-priority')</label>
@@ -91,9 +83,9 @@
                        <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 advanced-settings">
+                    <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
                        <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
-                        <select name="ssl_verify" id="ssl_verify">
+                        <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>
                            <option value="0">$T('ssl_verify-disabled')</option>
@@ -104,7 +96,12 @@
                        <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="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
+                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}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>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="required">$T('srv-required')</label>
@@ -131,7 +128,7 @@
                        <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                    </div>
                    <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default addNewServer" disabled><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <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">
@@ -142,7 +139,7 @@
        </div>
    </div>

-    <!--#set $prio_colors = ["#59cc33", "#26a69a", "#3366cc", "#7f33cc", "#cc33a6", "#f39c12", "#cc3333", "#8d6e63"] #-->
+    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
    <!--#set $cur_prio_color = -1 #-->
    <!--#set $last_prio = -1 #-->
    <!--#for $cur, $server in enumerate($servers) #-->
@@ -150,11 +147,11 @@
            <input type="hidden" name="apikey" value="$apikey" />
            <input type="hidden" name="output" value="json" />
            <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" name="ajax" value=1 />
+            <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="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3 title="$server['displayname']">$server['displayname'] <a href="$helpuri$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 #-->
@@ -183,9 +180,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 advanced-settings">
+                        <div class="field-pair">
                            <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" max="65535" required />
+                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
                        </div>
                        <div class="field-pair">
                            <label class="config" for="ssl$cur">$T('srv-ssl')</label>
@@ -203,7 +200,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="500" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="1000" required />
                        </div>
                        <div class="field-pair">
                            <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -218,9 +215,9 @@
                            <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 advanced-settings">
+                        <div class="field-pair <!--#if int($certificate_validation) == 0 then "disabled" else ""#--> advanced-settings">
                            <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
-                            <select name="ssl_verify" id="ssl_verify$cur">
+                            <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>
                                <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
@@ -228,10 +225,10 @@
                            <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                        </div>
                        <div class="field-pair advanced-settings">
-                            <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']" />
+                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
+                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
                            <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
+                            <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
                        </div>
                        <div class="field-pair advanced-settings">
                            <label class="config" for="required$cur">$T('srv-required')</label>
@@ -243,6 +240,11 @@
                            <input type="checkbox" name="optional" id="optional$cur" value="1" <!--#if int($server['optional']) != 0 then 'checked="checked"' else ""#--> />
                            <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>
+                        </div>
                        <div class="field-pair advanced-settings">
                            <label class="config" for="expire_date$cur">$T('srv-expire_date')</label>
                            <input type="date" name="expire_date" id="expire_date$cur"  value="$server['expire_date']" />
@@ -257,7 +259,7 @@
                            <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 no-field-pair-bg">
+                        <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 testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                            <button class="btn btn-default delServer"><span class="glyphicon glyphicon-trash"></span> $T('button-delServer')</button>
@@ -281,8 +283,7 @@

                            <p title="$T('readwiki')">
                                <b>$T('srv-article-availability'):</b><br/>
-                                $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>
+                                $T('selectedDates'): <span id="server-article-value-${cur}"></span>
                            </p>
                            <!--#if $server['expire_date']#-->
                            <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
@@ -299,9 +300,6 @@
                            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>
@@ -339,8 +337,8 @@

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

@@ -351,8 +349,8 @@
        var maxBandwith = 0

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

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

            // Calculate article success ratio, if available
            var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
@@ -403,17 +401,14 @@
            // If values were missing
            if(!isNaN(articleRatio)) {
                // Use filesize to convert to unit-display
-                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()
+                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
            } else {
-                jQuery('#server-article-value-' + server_id).text('$T("notAvailable")')
-                jQuery('#server-article-not-complete-' + server_id).hide()
+                \$('#server-article-value-' + server_id).text('$T("notAvailable")')
            }

            // 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
-            jQuery(elemn).data("chart-data", data)
+            \$(elemn).data("chart-data", data)
        })

        // Set the maximum
@@ -421,11 +416,11 @@
        chartOptions.axisY.low = 0

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

            // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, jQuery(elemn).data("chart-data"), chartOptions)
+            chart = new Chartist.Line('#server-chart-'+server_id, \$(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', {
@@ -437,15 +432,15 @@
                    stroke: '#b9b9b9',
                    'stroke-width': '1px'
                }, '', context.svg, true)
-                jQuery('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                \$('#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
-        jQuery('#chart-start').attr("max", jQuery('#chart-end').val())
-        jQuery('#chart-end').attr("min", jQuery('#chart-start').val())
+        \$('#chart-start').attr("max", \$('#chart-end').val())
+        \$('#chart-end').attr("min", \$('#chart-start').val())
    }

    // Need to mitigate timezone effects!
@@ -458,12 +453,12 @@
    /**
        When finished loading
    **/
-    jQuery(document).ready(function(){
+    \$(document).ready(function(){
        // Exception when change of priority, reload
-        jQuery('input[name="priority"], input[name="displayname"]').on('change', function() {
-            jQuery('.fullform').submit(function() {
+        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
+            \$('.fullform').submit(function() {
                // No ajax this time
-                jQuery('input[name="ajax"]').val('')
+                \$('input[name="ajax"]').val('')
                // Skip the fancy stuff, just submit
                this.submit()
            })
@@ -472,7 +467,7 @@
        /**
            Update charts when changed
        **/
-        jQuery('#chart-start, #chart-end').on('change', function(elemn) {
+        \$('#chart-start, #chart-end').on('change', function(elemn) {
            showCharts()

            // Lets us leave (needs to be called after the change event)
@@ -487,16 +482,16 @@
        /**
            Click events
        **/
-        jQuery('.showserver').click(function () {
-            if(jQuery(this).parent().hasClass('server-disabled')) {
-                jQuery(this).parent().parent().toggleClass('server-disabled')
+        \$('.showserver').click(function () {
+            if(\$(this).parent().hasClass('server-disabled')) {
+                \$(this).parent().parent().toggleClass('server-disabled')
            }
-            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')"));
+            \$(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')"));
            } else {
-                jQuery(this).html(jQuery(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
+                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
                // Recalculate the charts if changed while details were open
                showCharts()
            }
@@ -504,24 +499,24 @@
            addRowColor()
        });

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

-        jQuery('[name="ssl"]').click(function() {
+        \$('[name="ssl"]').click(function() {
            // Use CSS transitions to do some highlighting
-            var portBox = jQuery(this).parent().parent().find('[name="port"]')
+            var portBox = \$(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')
                }
@@ -530,16 +525,16 @@
        })

        // Testing servers
-        jQuery('.testServer').click(function(event){
+        \$('.testServer').click(function(event){
            removeObfuscation()
-            var theButton = jQuery(this)
+            var theButton = \$(this)
            var resultBox = theButton.parents('.col1').find('.result-box .alert');
            theButton.attr("disabled", "disabled")
            theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            jQuery.ajax({
+            \$.ajax({
                type: "POST",
                url: "../../api",
-                data: "mode=config&name=test_server&" + jQuery(this).parents('form:first').serialize()
+                data: "mode=config&name=test_server&" + \$(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>')
@@ -550,30 +545,20 @@
                theButton.removeAttr("disabled")
                theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')

-                // Success or not?
+                // Succes or not?
                if(data.value.result) {
                    resultBox.addClass('alert-success')
                    resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
-
-                    // Allow adding the new server if we are in the new-server section
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").removeAttr("disabled")
-                    }
                } else {
                    resultBox.addClass('alert-danger')
                    resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
-
-                    // Disable the adding of new server, just to be sure
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").attr("disabled", "disabled")
-                    }
                }
            });
        });

-        jQuery('.delServer').click(function(){
+        \$('.delServer').click(function(){
            if( confirm("$T('confirm')") ) {
-                jQuery(this).parents('form:first').attr('action','delServer').submit();
+                \$(this).parents('form:first').attr('action','delServer').submit();
                // Let us leave!
                formWasSubmitted = true;
                formHasChanged = false;
@@ -582,9 +567,9 @@
            return false;
        });

-        jQuery('.clrServer').click(function(){
+        \$('.clrServer').click(function(){
            if( confirm("$T('confirm')") ) {
-                jQuery(this).parents('form:first').attr('action','clrServer').submit();
+                \$(this).parents('form:first').attr('action','clrServer').submit();
                // Let us leave!
                formWasSubmitted = true;
                formHasChanged = false;
@@ -593,9 +578,9 @@
            return false;
        });

-        jQuery('.toggleServerCheckbox').click(function(){
-            var whichServer = jQuery(this).attr("name");
-            jQuery.ajax({
+        \$('.toggleServerCheckbox').click(function(){
+            var whichServer = \$(this).attr("name");
+            \$.ajax({
                type: "POST",
                url: "toggleServer",
                data: {server: whichServer, apikey: "$apikey" }
@@ -606,35 +591,6 @@
                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 untill 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>

--- a/interfaces/Config/templates/config_sorting.tmpl
+++ b/interfaces/Config/templates/config_sorting.tmpl
--- a/interfaces/Config/templates/config_special.tmpl
+++ b/interfaces/Config/templates/config_special.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri = $confighelpuri + "special"#-->
+<!--#set global $help_uri="configuration/3.5/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -10,7 +10,7 @@
        </div>
        <div class="section">
            <div class="col2">
-                <h3>$T('sptag-boolean') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-boolean') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -33,7 +33,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('sptag-entries') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-entries') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
--- a/interfaces/Config/templates/config_switches.tmpl
+++ b/interfaces/Config/templates/config_switches.tmpl
@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri = $confighelpuri + "switches"#-->
+<!--#set global $help_uri="configuration/3.5/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
@@ -14,10 +14,19 @@
        <input type="hidden" name="output" value="json" />
        <div class="section advanced-settings">
            <div class="col2">
-                <h3>$T('swtag-server') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-server') <a href="$helpuri$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" />
@@ -37,11 +46,11 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-queue') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-queue') <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 advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="pre_script">$T('opt-pre_script')</label>
                        <select name="pre_script" id="pre_script">
                        <!--#for $sc in $scripts#-->
@@ -54,22 +63,9 @@
                        </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" min="0" /> <i>$T('minutes')</i>
+                        <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
                        <span class="desc">$T('explain-propagation_delay')</span>
                    </div>
                    <div class="field-pair advanced-settings">
@@ -93,39 +89,33 @@
                            <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('fail-to-history')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</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')<br>
-                            <a href="https://sabnzbd.org/wiki/duplicate-detection" target="_blank">https://sabnzbd.org/wiki/duplicate-detection</a>
-                        </span>
+                        <span class="desc">$T('explain-no_dupes')</span>
                    </div>
                    <div class="field-pair">
-                        <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>
+                        <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>
                        </select>
-                        <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>
+                        <span class="desc">$T('explain-no_series_dupes')</span>
                    </div>
                    <div class="field-pair advanced-settings">
-                        <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>
+                        <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>
                    </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('fail-to-history')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                        </select>
                        <span class="desc">$T('explain-pause_on_pwrar')</span>
                    </div>
@@ -143,7 +133,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('fail-to-history')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                        </select>
                        <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                    </div>
@@ -151,7 +141,6 @@
                        <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="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>
@@ -159,7 +148,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') $T('explain-auto_sort_remaining')</span>
+                        <span class="desc">$T('explain-auto_sort')</span>
                    </div>
                    <div class="field-pair">
                        <label class="config" for="direct_unpack">$T('opt-direct_unpack')</label>
@@ -175,7 +164,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-pp') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-pp') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -189,16 +178,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 $windows#-->
+                    <!--#if not $nt#-->
                    <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('readwiki')</span>
+                        <span class="desc">$T('explain-nice')</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('readwiki')</span>
+                        <span class="desc">$T('explain-ionice')</span>
                    </div>
                    <!--#else#-->
                    <div class="field-pair advanced-settings">
@@ -210,13 +199,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('readwiki')</span>
+                        <span class="desc">$T('explain-win_process_prio')</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('readwiki')</span>
+                        <span class="desc">$T('explain-par_option')</span>
                    </div>
                    <div class="field-pair advanced-settings">
                        <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
@@ -243,6 +232,11 @@
                        <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 ""#--> />
@@ -253,23 +247,27 @@
                        <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_option">$T('opt-history_retention')</label>
-                        <select name="history_retention_option" id="history_retention_option">
-                            <option value="all" <!--#if $auto_sort == "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>
+                        <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>
                        </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
+                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
                    </div>
                    <div class="field-pair">
                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -280,7 +278,7 @@
        </div><!-- /section -->
        <div class="section advanced-settings">
            <div class="col2">
-                <h3>$T('swtag-naming') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -294,17 +292,12 @@
                        <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 $windows#-->
+                    <!--#if not $nt#-->
                    <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 ""#--> />
@@ -320,7 +313,7 @@
        </div><!-- /section -->
        <div class="section">
            <div class="col2">
-                <h3>$T('swtag-quota') <a href="$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-quota') <a href="$helpuri$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
            <div class="col1">
                <fieldset>
@@ -355,33 +348,199 @@
                </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">
-jQuery(document).ready(function() {
-    jQuery('#history_retention_option').on('change', updateHistoryRetention)
-    function updateHistoryRetention() {
-        var retention_option = jQuery('#history_retention_option').val()
-        var retention_number = jQuery('#history_retention_number')
+\$(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();
+        }
+    });

-        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 {
+    \$('#history_retention_select, #history_retention_number').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") {
            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()))
+                }
+            }
        }
    }
-    updateHistoryRetention()
+    // 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()
+    }

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

        // Confirm?
        if(!confirm("$T('explain-restoreDefaults') \""+sectionName+"\"\n$T('confirm')")) return false
@@ -389,11 +548,11 @@ jQuery(document).ready(function() {

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

        // Send request
-        jQuery.ajax({
+        \$.ajax({
            type: "GET",
            url: "../../api",
            data: "mode=set_config_default&apikey=${apikey}&output=json&keyword=" + key_container.join('&keyword=')
--- a/interfaces/Config/templates/login/main.tmpl
+++ b/interfaces/Config/templates/login/main.tmpl
@@ -1,4 +1,3 @@
-<!DOCTYPE HTML>
 <html lang="$active_lang">
 <head>
    <title>SABnzbd - $T('login')</title>
@@ -16,9 +15,6 @@

    <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" />
-    <!--#if $color_scheme not in ('Light', '') #-->
-    <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
-    <!--#end if#-->

    <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>
@@ -37,8 +33,8 @@
                <div class="alert alert-danger" role="alert">$error</div>
                <!--#end if#-->

-                <input type="text" class="form-control" name="username" placeholder="$T('srv-username')" autocomplete="username" required autofocus>
-                <input type="password" class="form-control" name="password" placeholder="$T('srv-password')" autocomplete="current-password" required>
+                <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>

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

@@ -51,16 +47,16 @@
        </div>
        <script type="text/javascript">
            // Tooltip
-            jQuery('[data-toggle="tooltip"]').tooltip()
+            \$('[data-toggle="tooltip"]').tooltip()
            // Try-catch in case somebody disabled localstorage
            try {
                // Set what was done previously
-                jQuery('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
+                \$('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
                // Store if we change something
-                jQuery('input[type="checkbox"]').on('change', function() {
-                    localStorage.setItem("remember_me", jQuery(this).is(':checked'));
+                \$('input[type="checkbox"]').on('change', function() {
+                    localStorage.setItem("remember_me", \$(this).is(':checked'));
                })
            } catch(err) { }
        </script>
    </body>
- </html>
+ </html>
--- a/interfaces/Config/templates/staticcfg/css/Auto.css
+++ b/interfaces/Config/templates/staticcfg/css/Auto.css
@@ -1 +0,0 @@
-@import url('Night.css') screen and (prefers-color-scheme: dark);
--- a/interfaces/Config/templates/staticcfg/css/Night.css
+++ b/interfaces/Config/templates/staticcfg/css/Night.css
@@ -1,311 +0,0 @@
-body {
-    background-color: black;
-    color: #EBEBEB !important;
-}
-
-a:not(.btn) {
-    color: #63a7e1;
-}
-
-.btn {
-    box-shadow: 1px 1px 1px rgba(255, 255, 255, .1) !important;
-}
-
-.btn:not(.btn-danger),
-.btn-default,
-input,
-select,
-textarea,
-.advanced-button,
-.list-group-item  {
-    border-color: #252525 !important;
-}
-
-#addFeed,
-#addFeedContent,
-.section {
-    border-bottom: 1px solid #555555;
-}
-
-.col2 p,
-.col2-cats {
-    color: #AAA;
-}
-
-.col2 h3 {
-    background: none repeat scroll 0 0 #555555;
-}
-
-.catTable,
-.dropdown-menu,
-.dropdown-menu .divider,
-.even,
-.Key tr:nth-child(odd),
-.language:hover,
-.navbar-default .navbar-nav>.open>a,
-.navbar-default .navbar-nav>.open>a:focus,
-.navbar-default .navbar-nav>.open>a:hover,
-.navbar-default .navbar-nav>li>a.active,
-.navbar-default .navbar-nav>li>a:hover,
-.navbar-default .navbar-nav>li>a:focus,
-.navbar-logo:hover,
-.quoteBlock,
-.selected,
-.server-disabled,
-#serverResponse,
-.table>tbody>tr:nth-child(odd),
-.table-striped>tbody>tr:nth-child(odd),
-ul.tabs li.active a,
-select[disabled],
-select:hover {
-    background-color: #444444 !important;
-    color: #EBEBEB !important;
-}
-
-.correct {
-    border: 2px solid #00cc22 !important;
-}
-
-.failed,
-.required-star,
-.error-text {
-    color: #ff3333 !important;
-}
-
-.unselected,
-.selected {
-    border: 1px solid #EBEBEB !important;
-    color: #EBEBEB !important;
-}
-
-.incorrect {
-    border: 2px solid #ff3333 !important;
-}
-
-.disabled-text {
-    color: #777 !important;
-}
-
-#rightGreyText,
-small {
-    color: #c7c7c7 !important;
-}
-
-.Categories form.sorting-row:nth-child(2n-1) tr,
-.advanced-button,
-.advanced-buttonSeperator,
-.alt,
-.infoTableSeperator.alt,
-.btn:not(.btn-danger),
-.btn-default.disabled:active,
-.btn-default.disabled:focus,
-.btn-default.disabled:hover,
-a.btn.btn-default,
-select.form-control,
-.form-control[disabled],
-.input-group-addon,
-#inner,
-.navbar-default,
-.search-box input,
-.select,
-.table-striped>tbody>tr:nth-child(even),
-.table>tbody>tr:nth-child(even),
-.tab-pane tr:nth-child(odd),
-textarea,
-ul.tabs a.active,
-a.list-group-item,
-.dropdown-menu>li>a,
-input[type="text"],
-input[type="email"],
-input[type="url"],
-input[type="date"],
-input[type="number"],
-input[type="password"],
-input[disabled],
-textarea,
-select {
-    background-color: #555555;
-    color: #EBEBEB;
-}
-
-.btn:hover:not(.btn-danger),
-.btn-default:hover,
-.tab-content .catTable tr:hover td,
-input:hover,
-textarea:hover,
-a.list-group-item:hover,
-select:hover,
-textarea:hover,
-input[type="date"]:hover,
-input[type="datetime"]:hover,
-input[type="datetime-local"]:hover,
-input[type="email"]:hover,
-input[type="month"]:hover,
-input[type="number"]:hover,
-input[type="password"]:hover,
-input[type="search"]:hover,
-input[type="tel"]:hover,
-input[type="text"]:hover,
-input[type="time"]:hover,
-input[type="url"]:hover,
-input[type="week"]:hover,
-textarea:focus,
-select:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="email"]:focus,
-input[type="month"]:focus,
-input[type="number"]:focus,
-input[type="password"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="text"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="week"]:focus {
-    background-color: #666;
-    color: #EBEBEB;
-}
-
-.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;
-}
-
-.modal-backdrop {
-    background-color: #262626 !important;
-}
-
-.Key tr {
-    border: none;
-}
-
-.table>tbody>tr>td,
-.table>tbody>tr>th,
-.infoTableSeperator,
-.modal-footer,
-.data-row {
-    border-top: 1px solid #555555;
-}
-
-hr {
-    border-top: 1px solid #555555;
-}
-
-.btn-danger {
-    border-color: #7b2b28;
-}
-
-.tab-content .catTable tbody,
-ul.tabs a,
-.colmask,
-#subscriptions,
-.RSS form[action="add_rss_feed"] tr:nth-child(even),
-.Config .table {
-    border: 1px solid #555555;
-}
-
-.Categories form:first-of-type tr:last-of-type,
-.default,
-.dropdown-menu>li>a:focus,
-.dropdown-menu>li>a:hover {
-    background-color: #696969;
-}
-
-.activeRSS,
-.activeRSS a,
-.activeRSS a:visited,
-.btn-default,
-.checkbox label,
-.feed-row td,
-.help-block,
-#content,
-.navbar-default .navbar-nav>li>a,
-.navbar-default .navbar-nav>li>a>.glyphicon,
-.path,
-.Servers .ct-label,
-.time,
-.main-restarting.in,
-#search-dropdown .dropdown-header,
-ul.tabs a,
-a.wizard-advanced-settings,
-.quoteBlock a,
-a.main-helplink,
-col2 h3 a,
-.text-center a,
-.text-center a:hover {
-    color: #EBEBEB;
-}
-
-.container,
-#content {
-    background-color: unset !important;
-}
-
-#content>div.colmask>div:nth-child(3) {
-    border-bottom: 1px solid #555555 !important;
-}
-
-.Servers .ct-series-a .ct-line,
-.Servers .ct-series-a .ct-point {
-    stroke: #EBEBEB;
-}
-
-#inner,
-.colmask {
-    background-color: #303030;
-}
-
-.modal-header {
-    background-color: #3C3C3C;
-}
-
-.modal-content,
-.modal-body,
-.modal-footer {
-    background-color: #727272;
-}
-
-#modal_qr .modal-body {
-    background-color: #EBEBEB;
-}
-
-.form-signin .btn.btn-default {
-    color: black;
-}
-
-.rss-icon-svg {
-    fill: white;
-}
-
-.rss-symbol {
-    fill: #555555;
-}
-
-::placeholder {
-    color: #EBEBEB !important;
-    opacity: 0.5;
-}
-
-.tooltip-inner {
-    background-color: #E4E4E4 !important;
-    color: #000 !important;
-}
-/* for login */
-.tooltip.bottom .tooltip-arrow {
-    border-bottom-color: #E4E4E4 !important;
-}
-/* config>general - host-warning */
-.tooltip.top .tooltip-arrow {
-    border-top-color: #E4E4E4 !important;
-}
-
-.Special .glyphicon-asterisk {
-    color: #E4E4E4 !important;
-}
--- a/interfaces/Config/templates/staticcfg/css/login.css
+++ b/interfaces/Config/templates/staticcfg/css/login.css
@@ -7,10 +7,7 @@ body {
    border-radius: 0 !important;
 }

-.btn,
-.btn:hover,
-.btn:active,
-.btn:focus {
+.btn, .btn:hover, .btn:active, .btn:focus {
    box-shadow: 1px 1px 1px rgba(0,0,0,.1) !important;
    background-color: white !important;
 }
@@ -41,7 +38,7 @@ body {
 }

 .text-center a:hover {
-    color: black;
+    color: black !important;
 }

 .form-signin .alert {
--- a/interfaces/Config/templates/staticcfg/css/style.css
+++ b/interfaces/Config/templates/staticcfg/css/style.css
@@ -19,7 +19,6 @@ body {
    float: left;
    overflow: visible;
    border: 1px solid #dfdede;
-    border-bottom: none !important;
    background-color: #FFF;
    width: 100%
 }
@@ -90,20 +89,15 @@ body {
    display: block;
    position: static;
    float: right;
-    color: black;
+    color: black !important;
    padding: 0px;
    font-size: 1.2em;
 }
 .example {
    background-color: #fefeee;
 }
-.presets strong {
-    display: inline-block;
-    width: 75px;
-}
 .presets {
    margin-bottom: -6px;
-    max-width: 60%;
 }
 .presets input {
    margin: 2px 0;
@@ -145,9 +139,6 @@ label.wide,
    font-size: 12px;
    font-style: italic;
 }
-.desc .btn {
-    font-style: normal;
-}
 .desc.narrow {
    margin: 0 0 0 200px!important;
 }
@@ -178,8 +169,8 @@ input[type="checkbox"]+.desc {
    background-color: #F8F8F8;
 }
 .field-pair:last-child,
-.field-pair.no-field-pair-bg {
-    background-color: transparent !important;
+.no-field-pair-bg {
+    background-color: transparent;
 }
 .alt,
 .infoTableSeperator.alt {
@@ -226,38 +217,10 @@ input[type='checkbox'] {
    padding: 0;
    margin-left: 5px;
 }
-textarea:hover,
-input[type="date"]:hover,
-input[type="datetime"]:hover,
-input[type="datetime-local"]:hover,
-input[type="email"]:hover,
-input[type="month"]:hover,
-input[type="number"]:hover,
-input[type="password"]:hover,
-input[type="search"]:hover,
-input[type="tel"]:hover,
-input[type="text"]:hover,
-input[type="time"]:hover,
-input[type="url"]:hover,
-input[type="week"]:hover,
-textarea:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="email"]:focus,
-input[type="month"]:focus,
-input[type="number"]:focus,
-input[type="password"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="text"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="week"]:focus {
+textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, textarea:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="email"]:focus, input[type="month"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="time"]:focus, input[type="url"]:focus, input[type="week"]:focus {
    background-color: #fffff0;
    border: 1px solid #aaa;
 }
-
 .col1 input[type='checkbox'] {
    position: absolute;
    top: auto!important;
@@ -360,49 +323,6 @@ tr.separator {
    margin: 5px;
 }

-.Sorting .explain-pattern {
-    border: none;
-    width: 100%;
-}
-.Sorting .pattern-table {
-    border:1px solid #ccc;
-}
-.Sorting .sorter-switch {
-    margin-right: 0.2em;
-}
-.Sorting .sorter-switch-container {
-    margin: 10px 0px;
-    height: 1.5em;
-    display: block;
-}
-.Sorting .sorter-placeholder {
-    position: relative;
-}
-.Sorting .sorter-placeholder:after {
-    content: "\e034";
-    font-family: "Glyphicons Halflings";
-    background: unset;
-    text-align: center;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 30px;
-    border-radius: 15px;
-    border: 1px dashed #444;
-}
-.Sorting .glyphicon-option-vertical {
-    margin-top: 1.5em;
-    margin-right: 0.2em;
-    cursor: move;
-}
-.Sorting form:not(.sorting-row) .glyphicon-option-vertical {
-    visibility: hidden;
-}
-.Sorting .sorting-quick-setup {
-    padding: 1.5em 2em 3em
-}
-
 .RSS .rss-section input[type="text"] {
    max-width: 180px;
 }
@@ -498,9 +418,6 @@ tr.separator {
 .align-center {
    text-align: center;
 }
-.valign-top {
-    vertical-align: top;
-}
 .nowrap {
    white-space: nowrap;
 }
@@ -807,6 +724,41 @@ ul.tabs li.active a {
 .checkbox-days label {
    padding: 2px 20px;
 }
+.rating-filter  {
+    float:  left;
+}
+.rating-filter p  {
+    margin:  0 0 10px 0;
+}
+.rating-filter select  {
+    vertical-align: middle;
+}
+.rating-filter input  {
+    vertical-align: middle;
+     margin-top: -1px;
+}
+.rating-filter label  {
+    display: inline-block;
+     padding-left: 0px;
+     width: 100px;
+}
+.rating-filter input[type="checkbox"]  {
+    display: inline;
+}
+.rating-filter input[type="checkbox"] + label  {
+    padding-left: 20px;
+    padding-top: 5px;
+     width: auto;
+}
+.rating-filter p > span:first-child  {
+    float: left;
+     width: 130px;
+}
+.rating-filter .desc  {
+    display: block;
+     margin: 0px;
+     padding-left: 103px;
+}

 /** EDITS 2015 **/
 * {
@@ -864,7 +816,6 @@ select {
    vertical-align:middle;
    max-width: 100%;
    min-height: 34px;
-    min-width: 55px;
    font-size: 13px;
    background-color: white;
 }
@@ -1011,7 +962,7 @@ input[type="checkbox"] {
 }
 */
 .navbar-default .navbar-nav>li>a {
-    color: black;
+    color: black !important;
 }

 .navbar-default .navbar-nav>li>a:hover,
@@ -1048,32 +999,6 @@ input[type="checkbox"] {
    margin: 10px 0px;
 }

-.Servers .server-frame {
-    position: relative;
-    width: 220px;
-    height: 325px;
-    margin-bottom: -325px;
-    left: -240px;
-    display: none;
-}
-
-.Servers .server-frame a {
-    color: black !important;
-    text-decoration: none !important;
-    opacity: 0.8;
-    font-size: 2em;
-    font-family: arial, sans-serif !important;
-    position: absolute;
-    right: 5px;
-    top: -5px;
-}
-
-.Servers .server-frame iframe {
-    width: 100%;
-    height: 100%;
-    border: 0;
-}
-
 .Servers .col2 .label {
    margin-top: 8px;
    font-size: 0.85em;
@@ -1223,6 +1148,7 @@ input[type="checkbox"] {
 }
 .value-and-select select {
    min-width: 30px;
+    margin-top: 1px;
 }

 .dotOne, .dotTwo, .dotThree {
@@ -1354,12 +1280,6 @@ html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
        padding: 0px 15px 10px;
        width: inherit;
    }
-    .Sorting .glyphicon-option-vertical {
-        display: none;
-    }
-    .Sorting .sorter h3 {
-        cursor: move;
-    }
 }

@media screen and (max-width: 768px) {
--- a/interfaces/Config/templates/staticcfg/js/script.js
+++ b/interfaces/Config/templates/staticcfg/js/script.js
@@ -60,7 +60,6 @@
        // Initialize
        this.element = $(element);
        this.initialDir = null;
-        this.showFiles = false;
        this.currentBrowserPath = null;
        this.currentRequest = null;
        this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -100,11 +99,6 @@
            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);

@@ -115,13 +109,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;
            }
@@ -150,20 +144,12 @@
        // Still loading
        if (this.currentRequest) this.currentRequest.abort();

-        // 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"
-        }
+        // Show hidden folders on Linux?
+        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';

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

@@ -171,27 +157,17 @@
            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 () {
-                    // 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);
-
+                    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);
                }
@@ -227,12 +203,7 @@ $.fn.extractFormDataTo = function(target) {
    var selects = $("select", this);

    selects.each(function (i,elem) {
-        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;
-        }
+        target[elem.name] = elem.value;
    });

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

-    // 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))
+    // What template
+    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?
@@ -273,7 +243,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();
@@ -322,7 +292,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;
@@ -332,7 +302,7 @@ function do_restart() {
    });
 }

-// Remove obfuscation
+// Remove obfusication
 function removeObfuscation() {
    $('input[data-hide]').each(function(index, objInput) {
        $(objInput).attr('name', $(objInput).data('hide'))
@@ -348,36 +318,6 @@ function addRowColor() {
    })
 }

-// 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 () {
    /**
        Restart function
@@ -405,9 +345,8 @@ $(document).ready(function () {
        datatype: 'json',
        // But first remove Obfuscation!
        beforeSerialize: removeObfuscation,
-        beforeSubmit: function (arr, form, options) {
-            // Only in the current form
-            form.find('.saveButton').each(function () {
+        beforeSubmit: function () {
+            $('.saveButton').each(function () {
                $(this).attr("disabled", "disabled").removeClass('btn-danger').html('<span class="glyphicon glyphicon-transfer"></span> ' + configTranslate.saving);
            });
        },
@@ -468,7 +407,7 @@ $(document).ready(function () {
    $('input[type="checkbox"]').parents('label').addClass('config-hover')

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

    $(checkDisabled).on('change', function() {
        $(this).parent().nextAll().toggleClass('disabled')
@@ -484,15 +423,12 @@ $(document).ready(function () {
        $('.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
-    jQuery('[title]').tooltip()
 });

 /*
--- a/interfaces/Glitter/licenses/LICENSE-CC.txt
+++ b/interfaces/Glitter/licenses/LICENSE-CC.txt
@@ -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 ("syncing") 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 ("synching") 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, 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.
+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.

 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.

--- a/interfaces/Glitter/templates/include_history.tmpl
+++ b/interfaces/Glitter/templates/include_history.tmpl
@@ -1,10 +1,5 @@
-<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="#" 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>
+<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">
        <thead>
            <tr>
@@ -18,16 +13,7 @@
                <th style="width: 60px;"></th>
            </tr>
        </thead>
-        <!-- 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;">
+        <tbody data-bind="foreach: history.historyItems">
            <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                <td>
                    <div data-bind="visible: processingWaiting()">
@@ -55,11 +41,102 @@
                        </span>
                    </div>
                </td>
-                <td class="name">
+                <td class="name" data-bind="css: { 'name-has-ratings' : historyStatus.has_rating }">
                    <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 -->
@@ -69,10 +146,7 @@
                <!-- /ko -->
                <td class="history-completedon row-wrap-text" data-bind="text: completedOn(), attr: { 'data-timestamp': completed }" onclick="showDetails(this)"></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 } " />
-                    </label>
-                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
+                    <div class="dropdown">
                        <a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
                            <span class="caret"></span>
                        </a>
@@ -103,7 +177,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" data-bind="visible: historyStatus.storage() || historyStatus.path()">
+                                <div class="row">
                                    <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>
@@ -117,7 +191,7 @@
                        </div>
                        <!-- /ko -->
                    </div>
-                    <a href="#" data-bind="click: parent.triggerRemoveDownload">
+                    <a href="#" data-bind="click: deleteSlot">
                        <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>
@@ -139,23 +213,9 @@
    </ul>

    <div class="multioperations-selector" id="history-options">
-        <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>
-
-        <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>
+        <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>
    </div>

    <div class="info-container history-info">
@@ -165,3 +225,9 @@
        <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
    </div>
 </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>
--- a/interfaces/Glitter/templates/include_menu.tmpl
+++ b/interfaces/Glitter/templates/include_menu.tmpl
@@ -43,7 +43,7 @@
                        <button type="button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown" onclick="keepOpen(this)">
                            <span class="caret"></span>
                        </button>
-                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() < 100 && speedLimit() > 0)" style="display: none;">
+                        <a href="#" class="max-speed-input-clear hover-button" data-bind="click: clearSpeedLimit, visible:(speedLimit() != 100)" style="display: none;">
                            <span class="glyphicon glyphicon-link"></span>
                        </a>
                        <div class="dropdown-menu max-speed-input">
@@ -81,7 +81,7 @@
            <li data-tooltip="true" data-placement="bottom" title="SABnzbd $T('menu-config')">
                <a href="./config/"><span class="glyphicon glyphicon-cog"></span></a>
            </li>
-            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': finishaction()}">
+            <li class="dropdown main-menu-link" data-bind="css: { 'active-on-queue-finish-menu': onQueueFinish()}">
                <a href="#" data-toggle="dropdown"  onclick="keepOpen(this)">
                    <span class="icon-bar"></span>
                    <span class="icon-bar"></span>
@@ -102,14 +102,23 @@
                    <li class="divider"></li>
                    <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                    <li>
-                        <select data-bind="value: finishaction, event: { change: setOnQueueFinish }" class="form-control">
+                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
                            <option value=""></option>
-                            <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 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>
                        </select>
                    </li>
                </ul>
--- a/interfaces/Glitter/templates/include_overlays.tmpl
+++ b/interfaces/Glitter/templates/include_overlays.tmpl
@@ -1,6 +1,6 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
 <!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
-<!-- Notification box -->
+<!-- Notifcation 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>
@@ -107,7 +107,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')' : 'OK', css: { 'options-bad-status' : !statusInfo.dnslookup() }"></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 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/>
@@ -117,43 +117,30 @@
                                <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 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6" 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') (~10 $T('seconds'))"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small title="$cpumodel $cpusimd $docker" data-tooltip="true">$cpumodel $cpusimd $docker</small>
+                                <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>
                            </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 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6" 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') (~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>
+                                <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>
                            </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 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6" 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') (~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>
+                                <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>
                            </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>
@@ -161,8 +148,8 @@
                            <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') (~10 $T('seconds'))"><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')"><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>
@@ -172,6 +159,7 @@
                                <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 />
@@ -194,7 +182,7 @@
                            <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: loglevel">
+                                    <select class="form-control" data-bind="value: statusInfo.loglevel">
                                        <option value="0">$T('log-errWarn')</option>
                                        <option value="1">$T('log-info')</option>
                                        <option value="2">$T('log-debug')</option>
@@ -225,20 +213,15 @@
                                </div>
                                <div class="row" data-bind="visible: serverssl">
                                    <div class="col-sm-6">$T('srv-ssl')</div>
-                                    <div class="col-sm-6 col-dot-overflow">
-                                        <span class="glyphicon glyphicon-ok"></span>
-                                        <span data-bind="text: serversslinfo"></span>
+                                    <div class="col-sm-6">
+                                        <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><br>
-                                        <!-- ko if: serveripaddress() -->
-                                        <span data-bind="text: servercanonname"></span><br>
-                                        <span data-bind="text: serveripaddress"></span>
-                                        <!-- /ko -->
+                                        <span data-bind="text: servertotalconn"></span>
                                    </div>
                                </div>
                                <div class="row">
@@ -254,11 +237,11 @@
                                        </div>
                                    </div>
                                </div>
-                                <div class="row" data-bind="visible: serverwarning()">
+                                <div class="row" data-bind="visible: !isFinite(serveractiveconn())">
                                    <div class="col-sm-12">
                                        <div class="alert alert-warning">
                                            <span class="glyphicon glyphicon-info-sign"></span>
-                                            <span data-bind="text: serverwarning()"></span>
+                                            <span data-bind="text: serveractiveconn()"></span>
                                        </div>
                                    </div>
                                </div>
@@ -456,16 +439,6 @@
                                    <input type="checkbox" name="confirmDeleteHistory" value="true" data-bind="checked: confirmDeleteHistory" />
                                </div>
                            </div>
-                            <div class="form-group form-checkbox">
-                                <label class="col-sm-6 control-label">
-                                    $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" value="true" data-bind="checked: keyboardShortcuts" />
-                                </div>
-                            </div>
                        </form>
                    </div>
                </div>
@@ -528,36 +501,28 @@
                <div class="form-group">
                    <label class="col-sm-4 control-label">$T('category')</label>
                    <div class="col-sm-6">
-                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText', optionsCaption: ''"></select>
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
                        <span class="glyphicon glyphicon-tag"></span>
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-4 control-label">$T('priority')</label>
                    <div class="col-sm-6">
-                        <!-- This list is different from the one during download! -->
-                        <select name="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>
+                        <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></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>
                    <div class="col-sm-6">
-                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: ''"></select>
+                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
                        <span class="glyphicon glyphicon-check"></span>
                    </div>
                </div>
                <div class="form-group">
                    <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
                    <div class="col-sm-6">
-                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', optionsValue: 'scriptValue', optionsText: 'scriptText', enable: (queue.scriptsList().length > 1)"></select>
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', enable: (queue.scriptsList().length > 1)"></select>
                        <span class="glyphicon glyphicon-flash"></span>
                    </div>
                </div>
@@ -635,59 +600,6 @@
    </div>
 </div>

-<div id="modal-delete-queue-job" class="modal modal-delete-job fade" tabindex="-1">
-    <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">$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">
-    <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">$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">
-                        <label>
-                            <input type="checkbox" data-bind="checked: history.showArchive()"> <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">
    <div class="modal-dialog">
        <div class="modal-content">
@@ -718,9 +630,6 @@
                            </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>
@@ -768,13 +677,13 @@
                            <td><a href="https://github.com/sabnzbd/sabnzbd" target="_blank">https://github.com/sabnzbd/sabnzbd/</a></td>
                        </tr>
                        <tr>
-                            <td><strong>$T('menu-live-chat'):</strong></td>
+                            <td><strong>$T('menu-irc'):</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 &copy; 2007-2024 by The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)<br/>$T('yourRights') </small></p>
+                <p><small>Copyright (C) 2007-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
            </div>
        </div>
    </div>
@@ -793,18 +702,11 @@
                <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.showArchive()"> <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">
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
--- a/interfaces/Glitter/templates/include_queue.tmpl
+++ b/interfaces/Glitter/templates/include_queue.tmpl
@@ -9,6 +9,12 @@
            </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>
@@ -46,7 +52,6 @@
                <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="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>
@@ -157,13 +162,13 @@
                            </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, optionsValue: 'scriptValue', optionsText: 'scriptText', event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
+                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, 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: parent.triggerRemoveDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
                </td>
            </tr>
        </tbody>
@@ -171,10 +176,10 @@

    <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-queue">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
+            <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>
-            <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
+            <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
                <span class="glyphicon glyphicon-trash"></span>
            </a>
        </div>
@@ -204,7 +209,7 @@
        </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, optionsValue: 'scriptValue', optionsText: 'scriptText', optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
+            <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '', event: { change: queue.doMultiEditUpdate }"></select>
        </div>
        <div class="clearfix"></div>
    </form>
--- a/interfaces/Glitter/templates/main.tmpl
+++ b/interfaces/Glitter/templates/main.tmpl
@@ -65,9 +65,17 @@
            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.fetchingURL = "$T('Glitter-addFromURL')"
+            glitterTranslate.noSelect = "$T('Glitter-noSelect')";
+            glitterTranslate.sendThanks = "$T('Glitter-sendThanks')";
            glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
            glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
            glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -95,9 +103,7 @@
            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();
@@ -118,16 +124,14 @@
            glitterTranslate.priority['Stop'] = "$T('pr-stop')";
        </script>

-        <!-- Inclusion is faster than external scripts. We load momentJS locale separately so failure won't break anything -->
+        <!-- Inclusion is faster than external scripts. We load momentJS locale seperatly so failure won't break anything -->
        <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/jquery.hotkeys.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/javascripts/search-query-parser.js"#-->
            <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->
            <!--#include $webdir + "/static/javascripts/glitter.js"#-->
        </script>
@@ -147,10 +151,10 @@
                        <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>
+                        <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>
+                        <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>
--- a/interfaces/Glitter/templates/static/javascripts/glitter.basic.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.basic.js
@@ -24,7 +24,7 @@ if(isMobile) {
 }

 // Basic API-call
-function callAPI(data, timeout = 10000) {
+function callAPI(data) {
    // Fill basis var's
    data.output = "json";
    data.apikey = apiKey;
@@ -33,7 +33,24 @@ function callAPI(data, timeout = 10000) {
        type: "GET",
        cache: false,
        data: data,
-        timeout: timeout
+        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
    });

    return $.when(ajaxQuery);
@@ -58,11 +75,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
@@ -71,13 +88,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)
@@ -155,7 +172,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})
--- a/interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js
@@ -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? Bad!
+            // Are we on next page?
            if(self.currentPage() > 1) {
                // Force full update
                parent.parent.refresh(true);
@@ -302,6 +302,9 @@ 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())
@@ -356,7 +359,7 @@ function paginationModel(parent) {
            }

            // Change of number of pages?
-            if(newNrPages !== self.nrPages()) {
+            if(newNrPages != self.nrPages()) {
                // Update
                self.nrPages(newNrPages);
            }
--- a/interfaces/Glitter/templates/static/javascripts/glitter.history.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.history.js
@@ -9,16 +9,11 @@ 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.isLoading = ko.observable(false).extend({ rateLimit: 100 });
-    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, 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();
@@ -45,7 +40,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
@@ -61,7 +56,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 = [];
@@ -70,7 +65,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;
                }));
            });
        }
@@ -84,7 +79,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.id; })
+                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id == currentItem.nzo_id; })
                })
            }
        }
@@ -98,7 +93,6 @@ 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);
@@ -116,31 +110,8 @@ 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
@@ -168,28 +139,28 @@ function HistoryListModel(parent) {
        form.reset()
    }

-    // Searching in history (rate-limited in declaration)
+    // Searching in history (rate-limited in decleration)
    self.searchTerm.subscribe(function() {
+        // Make sure we refresh
+        self.lastUpdate = 0
+        self.parent.refresh();
        // Go back to page 1
-        if(self.pagination.currentPage() !== 1) {
-            // This forces a refresh
+        if(self.pagination.currentPage() != 1) {
            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 == 'mousedown' || (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 == 'mousedown' && self.searchTerm() == '') {
            $(event.target).parents('.search-box').find('input[type="text"]').focus()
            return;
        }
@@ -199,17 +170,10 @@ 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())
-        // 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
+        // Forde hide tooltip so it doesn't linger
        $('#history-options a').tooltip('hide')
        // Force refresh
        self.parent.refresh(true)
@@ -231,34 +195,36 @@ 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.id + ',';
+                    strIDs = strIDs + this.nzo_id + ',';
                }
            })
            // Send the command
@@ -266,7 +232,6 @@ function HistoryListModel(parent) {
                mode: 'history',
                name: 'delete',
                del_files: 1,
-                archive: (!skipArchive) * 1,
                value: strIDs
            }).then(function() {
                // Clear search, refresh and hide
@@ -281,157 +246,13 @@ function HistoryListModel(parent) {
        callAPI({
            mode: 'history',
            name: 'delete',
-            del_files: del_files,
-            archive: (!skipArchive) * 1,
-            value: value
+            value: value,
+            del_files: del_files
        }).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")
-            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())
-    }
-
-    // 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")
 }

 /**
@@ -445,7 +266,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.id = data.nzo_id;
+    self.nzo_id = data.nzo_id;
    self.index = data.index;
    self.updateAllHistory = false;
    self.hasDropdown = ko.observable(false);
@@ -482,14 +303,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
@@ -523,7 +344,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]
@@ -532,7 +353,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':
@@ -554,7 +375,7 @@ function HistoryModel(parent, data) {
    // Re-try button
    self.retry = function() {
        // Set JOB-id
-        $('#modal-retry-job input[name="retry_job_id"]').val(self.id)
+        $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
        // Set password
        $('#retry_job_password').val(self.historyStatus.password())
        // Open modal
@@ -597,4 +418,134 @@ function HistoryModel(parent, data) {
            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
+    }
 }
--- a/interfaces/Glitter/templates/static/javascripts/glitter.main.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.main.js
--- a/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
@@ -6,6 +6,8 @@ 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..
@@ -32,13 +34,12 @@ 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: 400, method: "notifyWhenChangesStop" } });
+    self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 200, method: "notifyWhenChangesStop" } });
    self.paginationLimit = ko.observable(20).extend({ persist: 'queuePaginationLimit' });
    self.pagination = new paginationModel(self);

@@ -65,6 +66,31 @@ 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);

@@ -75,7 +101,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) {
@@ -88,7 +114,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 = [];
@@ -97,7 +123,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;
                }));
            });
        }
@@ -148,27 +174,6 @@ 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
@@ -180,8 +185,6 @@ 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
@@ -191,25 +194,24 @@ 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) {
-            // This forces a refresh
+        if(self.pagination.currentPage() != 1) {
            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 == 'mousedown' || (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 == 'mousedown' && self.searchTerm() == '') {
            $(event.target).parents('.search-box').find('input[type="text"]').focus()
            return;
        }
@@ -224,10 +226,6 @@ function QueueListModel(parent) {
        // What action?
        var sort, dir;
        switch($(event.currentTarget).data('action')) {
-            case 'sortRemainingAsc':
-                sort = 'remaining';
-                dir = 'asc';
-                break;
            case 'sortAgeAsc':
                sort = 'avg_age';
                dir = 'desc';
@@ -276,7 +274,7 @@ function QueueListModel(parent) {
        // Reset form and remove all checked ones
        $form[0].reset();
        self.multiEditItems.removeAll();
-        $('.queue-table input[name="multiedit"], #multiedit-checkall-queue').prop({'checked': false, 'indeterminate': false})
+        $('.delete input[name="multiedit"], #multiedit-checkall').prop({'checked': false, 'indeterminate': false})

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

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

@@ -317,7 +315,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', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')

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

@@ -366,100 +364,91 @@ 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
-            }).then(nonCatUpdates)
-        } else {
-            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)
+        }
    }

-    // 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
+    // Selete all selected
    self.doMultiDelete = function() {
        // Anything selected?
        if(self.multiEditItems().length < 1) return;

-        // Trigger modal
-        self.triggerRemoveDownload(self.multiEditItems())
-    }
+        // 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 + ',';
+            })

-    // Focus on the confirm button
-    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
-        $('#modal-delete-queue-job .btn[type="submit"]').focus()
-    })
+            // 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()
+                }
+            })
+        }
+    }

    // On change of page we need to check all those that were in the list!
    self.queueItems.subscribe(function() {
@@ -470,7 +459,7 @@ function QueueListModel(parent) {
            })

            // Update check-all buton state
-            setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
+            setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
        }, 100)
    }, null, "arrayChange")
 }
@@ -490,8 +479,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' || data.avg_age == '-')
+    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))
@@ -502,7 +491,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
@@ -513,7 +502,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%)
@@ -521,7 +510,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
@@ -530,9 +519,6 @@ 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";
    })

@@ -552,15 +538,15 @@ function QueueModel(parent, data) {
    })
    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
@@ -570,7 +556,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()) {
@@ -584,17 +570,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':
@@ -610,7 +596,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' || data.avg_age == '-')
        self.totalMB(parseFloat(data.mb));
        self.remainingMB(parseFloat(data.mbleft));
        self.missingMB(parseFloat(data.mbmissing))
@@ -621,12 +607,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();
@@ -663,7 +649,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;
@@ -707,6 +693,8 @@ function QueueModel(parent, data) {
        })
    }
    self.changeScript = function(item) {
+        // Not on empty handlers
+        if(!item.script() || parent.scriptsList().length <= 1) return;
        callAPI({
            mode: 'change_script',
            value: item.id,
@@ -735,5 +723,29 @@ 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()
+            });
+        }
+    };
 }
--- a/interfaces/Glitter/templates/static/javascripts/jquery.hotkeys.min.js
+++ b/interfaces/Glitter/templates/static/javascripts/jquery.hotkeys.min.js
@@ -1,12 +0,0 @@
-/*
- * 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);
--- a/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js
+++ b/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js
@@ -1,3 +1,15 @@
+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())
--- a/interfaces/Glitter/templates/static/javascripts/search-query-parser.js
+++ b/interfaces/Glitter/templates/static/javascripts/search-query-parser.js
@@ -1,317 +0,0 @@
-/*!
- * 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;
-    }
-
-}
-
--- a/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css
+++ b/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css
@@ -94,8 +94,7 @@ legend,
 .nav-tabs>li.active>a,
 .nav-tabs>li.active>a:focus,
 .nav-tabs>li.active>a:hover,
-.nav-tabs>li>a:hover,
-.nav-tabs>li>a:focus {
+.nav-tabs>li>a:hover {
    background-color: #ddd;
    color: #555 !important;
    box-shadow: 0px -1px 1px 1px rgba(0,0,0,0.15);
@@ -140,12 +139,6 @@ select.form-control,
    color: #EBEBEB;
 }

-.btn-default:not(.navbar-btn):hover,
-select:hover,
-input:hover {
-    background-color: #666666;
-}
-
 /* Needed to force the text-color */
 .table-striped>tbody>tr:nth-child(odd)>td,
 .table>tbody>tr:nth-child(odd)>td,
@@ -206,8 +199,7 @@ tbody .caret {
 .info-container,
 #modal-options .options-status-box small,
 #modal-options #options-status small,
-#modal-options .tab-content h4,
-h2 small {
+#modal-options .tab-content h4 {
    color: #D6D6D6;
 }

@@ -273,11 +265,16 @@ button:focus {
    outline: initial;
 }

-.archive-icon {
-    fill: #EBEBEB;
+/* Placeholders - Will not work if grouped! */
+::-webkit-input-placeholder {
+   color: #EBEBEB !important;
 }

-::placeholder {
-    color: #EBEBEB !important;
-    opacity: 0.5 !important;
+::-moz-placeholder {
+   color: #EBEBEB !important;
+   opacity: 1 !important;
+}
+
+:-ms-input-placeholder {
+   color: #EBEBEB !important;
 }
--- a/interfaces/Glitter/templates/static/stylesheets/glitter.css
+++ b/interfaces/Glitter/templates/static/stylesheets/glitter.css
@@ -442,7 +442,7 @@ tbody>tr>td:last-child {
 .container-tabbed #queue-tab,
 .container-tabbed #queue-tab,
 .container-tabbed #queue-messages,
-.container-tabbed .history-header h2,
+.container-tabbed .history h2,
 .container-tabbed .queue h2,
 .history-queue-swicher {
    display: none;
@@ -494,10 +494,6 @@ tbody>tr>td:last-child {
    background-color: #d9534f !important;
 }

-.history-queue-swicher .badge-info {
-    background-color: #58A9FA !important;
-}
-
 .history-queue-swicher .badge {
    margin-left: 4px;
 }
@@ -690,10 +686,6 @@ tbody.no-downloads tr td {
    border-bottom: 1px solid #F0F0F0 !important;
 }

-tbody.no-downloads tr td>span {
-    opacity: 0.7;
-}
-
 tbody.no-downloads tr td a {
    line-height: 2em;
    font-size: 1.5em;
@@ -994,27 +986,8 @@ tr.queue-item>td:first-child>a {
    position: relative;
 }

-.history-header {
+.history h2 {
    clear: left;
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-}
-
-.history-header a {
-    align-self: center;
-    margin-right: 2px;
-    font-size: 12px;
-}
-
-.container-tabbed .history-header {
-    display: inline;
-}
-
-.container-tabbed .history-header a {
-    position: absolute;
-    right: 0;
-    top: 10px;
 }

 .history-table {
@@ -1036,6 +1009,10 @@ tr.queue-item>td:first-child>a {
    font-weight: bold;
 }

+.history-table td.name.name-has-ratings .row-wrap-text {
+    max-width: calc(100% - 80px) ;
+}
+
 .history-failed-download:hover .retry-button .glyphicon:before,
 .retry-button:hover .glyphicon:before {
    content: " \e030 ";
@@ -1100,6 +1077,83 @@ tr.queue-item>td:first-child>a {
 .history-status-hidden {
    display: none;
 }
+
+.history-ratings {
+    display: inline-block;
+}
+
+.history-ratings.open a {
+    opacity: 1;
+}
+
+.history-ratings .name-icons {
+    float: none !important;
+}
+
+.history-ratings-menu {
+    width: 300px;
+    padding: 10px;
+    margin-top: 4px !important;
+}
+
+.history-ratings-menu .divider {
+    background-color: black;
+}
+
+.history-ratings-menu label {
+    margin-right: 12px;
+    font-weight: normal;
+}
+
+.history-ratings-basic input[type="radio"] {
+    display: none;
+}
+
+.history-ratings-basic input[type="radio"]+span {
+    opacity: 0.6;
+    cursor: pointer;
+    font-size: 1.3em;
+    font-weight: bold;
+    top: 3px;
+    margin-left: 3px;
+}
+
+.history-ratings-basic input[type="radio"]+span+span {
+    opacity: 0.3;
+}
+
+.history-ratings-basic input[type="radio"]:checked+span,
+.history-ratings-basic input[type="radio"]:checked+span+span {
+    opacity: 1;
+}
+
+.history-ratings-basic .history-ratings-spacer {
+    margin-left: 10px;
+}
+
+.history-ratings-basic select {
+    margin-left: 3px;
+    background-color: transparent;
+    border: 1px solid #ccc;
+}
+
+.history-ratings-basic select:disabled {
+    background-color: #F5F5F5;
+}
+
+.history-ratings-report label {
+    width: 100%;
+}
+
+.history-ratings-report .ratings-report-hidden {
+    display: none;
+}
+
+.history-ratings-report input[type="radio"]:checked+input,
+.history-ratings-report input[type="radio"]:checked+select {
+    display: block;
+}
+
 #history-options {
    margin-top: 0;
    margin-left: 10px;
@@ -1107,29 +1161,11 @@ tr.queue-item>td:first-child>a {
 }

 #history-options .hover-button {
-    padding: 7px;
+    padding: 7px 8px 7px 8px;
    line-height: 1.428571429;
    display: inline-block;
 }

-#history-options .hover-button.history-archive {
-    line-height: 1em;
-    vertical-align: middle;
-}
-
-#history-options div {
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 5px;
-}
-
-#history-options input[name="multieditCheckAll"] {
-    vertical-align: middle;
-    position: relative;
-    top: -2px;
-    margin-left: 8px;
-} 
-
 #history-options .hover-button span {
    top: 2px;
 }
@@ -1196,10 +1232,6 @@ tr.queue-item>td:first-child>a {
    color:  red !important;
 }

-.history-options-show-failed .archive-icon {
-    fill: #2bbd43;
-}
-
 .processing-download {
    width: 16px;
    height: 18px;
@@ -1338,12 +1370,6 @@ tr.queue-item>td:first-child>a {
    padding-top: 3px;
 }

-#modal-options .col-dot-overflow {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 #modal-options #options-status .glyphicon:not(.glyphicon-comment) {
    margin-right: 5px;
    margin-left: 3px;
@@ -1535,34 +1561,6 @@ input[name="nzbURL"] {
    transition : border 500ms ease-out;
 }

-/* DELETE MODAL */
-.modal-delete-job ul {
-    margin-top: 10px;
-}
-
-.modal-delete-job li {
-    word-break: break-all;
-}
-
-.modal-delete-job .checkbox {
-    float: left;
-    margin: 8px 5px 0px;
-}
-
-#modal-purge-history .checkbox {
-    margin: 0;
-}
-
-.modal-delete-job .checkbox input,
-#modal-purge-history .checkbox input {
-    margin-top: 3px;
-}
-
-.modal-delete-job .checkbox input+span,
-#modal-purge-history .checkbox input+span {
-    font-weight: bold;
-}
-
 /* HELP MODAL */

 #modal-help .modal-body {
@@ -1956,6 +1954,10 @@ input[name="nzbURL"] {
    #feedback-slider {
        display: none;
    }
+
+    .glyphicon-facetime-video {
+        top: 2px;
+    }
 }

@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait) {
@@ -2034,6 +2036,7 @@ a:focus {
    text-decoration: none;
 }

+.glyphicon-volume-up,
 .glyphicon-trash {
    top: 2px;
 }
@@ -2102,6 +2105,15 @@ a:focus {
    content: '';
 }

+.history-ratings-menu:after {
+    right: inherit !important;
+    left: 23px;
+}
+.history-ratings-menu:before {
+    right: inherit !important;
+    left: 22px;
+}
+
 .open > .dropdown-menu {
    opacity: 1;
    visibility: visible;
--- a/interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css
+++ b/interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css
@@ -180,6 +180,14 @@ 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;
--- a/interfaces/wizard/README.TXT
+++ b/interfaces/wizard/README.TXT
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 The SABnzbd-Team (sabnzbd.org)
+# Copyright 2009 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
--- a/interfaces/wizard/inc_top.tmpl
+++ b/interfaces/wizard/inc_top.tmpl
@@ -5,9 +5,6 @@
        <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"/>
-        <!--#if $color_scheme not in ('Light', '') #-->
-        <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
-        <!--#end if#-->
        <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>
--- a/interfaces/wizard/index.html
+++ b/interfaces/wizard/index.html
@@ -26,13 +26,12 @@
            </div>
            <hr />
            <div class="row">
-                <div class="col-md-4 text-center">
+                <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>
-                <div class="col-md-4 text-center">
-                    <a class="btn btn-default" href="../config/general/#config_backup_file"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</a>
+                <div class="col-xs-4 text-center">
                </div>
-                <div class="col-md-4 text-center">
+                <div class="col-xs-4 text-center">
                    <button class="btn btn-default">$T('wizard-start') <span class="glyphicon glyphicon-chevron-right"></span></button>
                </div>
            </div>
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
@@ -15,8 +15,6 @@

                <br /><br />

-                <input type="hidden" name="server" value="$server" />
-
                <div class="row">
                    <div class="col-md-7 form-horizontal">
                        <div class="form-group">
@@ -48,7 +46,7 @@
                        <div class="form-group">
                            <div class="col-sm-4"></div>
                            <div class="col-sm-8">
-                                <a href="#" class="wizard-advanced-settings" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
+                                <a href="#" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
                                    <span class="glyphicon glyphicon-cog"></span> $T('button-advanced')
                                </a>
                            </div>
@@ -57,19 +55,19 @@
                            <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 '563' #-->" min="0" max="65535" />
+                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '119' #-->" />
                                </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'#-->" min="1" max="500" 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 '8'#-->" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
                                </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">
+                                    <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>
                                        <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
--- a/interfaces/wizard/static/javascript/checkserver.js
+++ b/interfaces/wizard/static/javascript/checkserver.js
@@ -56,12 +56,12 @@ $(document).ready(function() {
    $('#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')
            }
        }
--- a/interfaces/wizard/static/style.css
+++ b/interfaces/wizard/static/style.css
@@ -171,10 +171,10 @@ label {
 * {
    border-radius: 0 !important;
 }
-a,
-a:hover,
-a:active,
-a:visited,
+#content a,
+#content a:hover,
+#content a:active,
+#content a:visited,
 #serverResponse {
    color: #555;
 }
--- a/interfaces/wizard/two.html
+++ b/interfaces/wizard/two.html
@@ -32,7 +32,7 @@
            </div>

            <hr/>
-            <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>
+            <p>$T('wizard-tip-wiki') <a target="_blank" href="$helpuri">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>

        </div>
        <hr />
--- a/licenses/License-kronos.txt
+++ b/licenses/License-kronos.txt
@@ -1,5 +1,5 @@
 Kronos.py is written by Irmen de Jong.
-Retrieved from:
+Retreived from:
 http://www.razorvine.net/download/kronos.py

 Quote from the module:
--- a/linux/org.sabnzbd.sabnzbd.appdata.xml
+++ b/linux/org.sabnzbd.sabnzbd.appdata.xml
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022-2024 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>
-  <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>
-  </description>
-  <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="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="4.3.3" date="2024-08-01" type="stable"/>
-    <release version="4.3.2" date="2024-05-30" type="stable"/>
-    <release version="4.3.1" date="2024-05-03" type="stable"/>
-    <release version="4.3.0" date="2024-05-01" type="stable"/>
-    <release version="4.2.2" date="2024-02-01" type="stable"/>
-    <release version="4.2.1" date="2024-01-05" type="stable"/>
-    <release version="4.2.0" date="2024-01-03" type="stable"/>
-    <release version="4.1.0" date="2023-09-26" type="stable"/>
-    <release version="4.0.3" date="2023-06-16" type="stable"/>
-    <release version="4.0.2" date="2023-06-09" type="stable"/>
-    <release version="4.0.1" date="2023-05-01" type="stable"/>
-    <release version="4.0.0" date="2023-04-28" type="stable"/>
-    <release version="3.7.2" date="2023-02-05" type="stable"/>
-  </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>Web interface</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://sabnzbd.org/images/landing/screenshots/night-mode.png</image>
-      <caption>Night mode</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://sabnzbd.org/images/landing/screenshots/config.png</image>
-      <caption>Easy configuration</caption>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1"/>
-</component>
--- a/linux/org.sabnzbd.sabnzbd.sharedmimeinfo
+++ b/linux/org.sabnzbd.sabnzbd.sharedmimeinfo
@@ -1,9 +0,0 @@
-<?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>
--- a/linux/sabnzbd.bash-completion
+++ b/linux/sabnzbd.bash-completion
@@ -1,63 +0,0 @@
-# bash completion for sabnzbd
-
-_sabnzbd()
-{
-    local cur prev words cword split
-    # list all options here
-    local all_options="-f --config-file --pidfile -t --templates --pid -l --logging -w --weblogging -d --daemon -h
-                       --help -v --version -c --clean -p --pause --repair --repair-all --no-login --log-all --console
-                       --disable-file-log --new -b --browser --ipv6_hosting --inet_exposure --https -s --server"
-    _init_completion -s || return
-
-    # handle options that take arguments
-    case $prev in
-        # 0..1
-        --browser|--ipv6_hosting|-!(-*)[b])
-            COMPREPLY=( $(compgen -W '{0..1}' -- "$cur") )
-            return
-            ;;
-        # -1..2
-        --logging|-!(-*)[l])
-            COMPREPLY=( $(compgen -W '{-1..2}' -- "$cur") )
-            return
-            ;;
-        # 0..5
-        --inet_exposure)
-            COMPREPLY=( $(compgen -W '{0..5}' -- "$cur") )
-            return
-            ;;
-        # directory path
-        --templates|--pid|-!(-*)[t])
-            compopt +o nospace
-            _filedir -d
-            return
-            ;;
-        # file path
-        --config-file|--pidfile|-!(-*)[f])
-            compopt +o nospace
-            _filedir
-            return
-            ;;
-        # port number
-        --https)
-            COMPREPLY=( $(compgen -W '{0..65535}' -- "$cur") )
-            return
-            ;;
-        # host:port
-        --server|-!(-*)[s])
-            # suggest possible formats
-            COMPREPLY=( $(compgen -W 'hostname :port hostname:port ipv4 ipv4:port [ipv6] [ipv6]:port' -- "$cur") )
-            return
-            ;;
-    esac
-
-    $split && return
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $(compgen -W "$all_options" -- "$cur") )
-    else
-        _filedir '@(nzb|nzb.gz|nzb.bz2|zip|rar|7z)'
-    fi
-
-} &&
-complete -F _sabnzbd SABnzbd.py sabnzbd sabnzbdplus
--- a/linux/sabnzbd.desktop
+++ b/linux/sabnzbd.desktop
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=SABnzbd
-GenericName=Binary newsreader
-Comment=Download from Usenet
-Exec=/opt/sabnzbd/SABnzbd.py --browser 1 %F
-Icon=sabnzbd
-Terminal=false
-Type=Application
-Categories=Network;FileTransfer;
-Keywords=usenet;binaries;download;nzb;nntp;newsreader;
-MimeType=application/x-nzb;application/x-compressed-nzb;
--- a/linux/sabnzbd@.service
+++ b/linux/sabnzbd@.service
@@ -22,11 +22,6 @@ ExecStart=/opt/sabnzbd/SABnzbd.py --disable-file-log --logging 1 --browser 0
 User=%I
 Type=simple
 Restart=on-failure
-ProtectSystem=full
-DeviceAllow=/dev/null rw
-DeviceAllow=/dev/urandom r
-DevicePolicy=strict
-NoNewPrivileges=yes

 [Install]
 WantedBy=multi-user.target
--- a/osx/7zip/7za
+++ b/osx/7zip/7za
--- a/osx/7zip/7zz
+++ b/osx/7zip/7zz
--- a/osx/7zip/License.txt
+++ b/osx/7zip/License.txt
@@ -1,144 +1,53 @@
-  7-Zip for Linux and macOS
-  ~~~~~~~~~~~~~~~~~~~~~~~~~
-  License for use and distribution
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  7-Zip Copyright (C) 1999-2024 Igor Pavlov.
-
-  The licenses for 7zz and 7zzs files are:
-
-         - The "GNU LGPL" as main license for most of the code
-         - The "GNU LGPL" with "unRAR license restriction" for some code
-         - The "BSD 3-clause License" for some code
-         - The "BSD 2-clause License" for some code
-
-  Redistributions in binary form must reproduce related license information from this file.
-
-  Note:
-    You can use 7-Zip on any computer, including a computer in a commercial
-    organization. You don't need to register or pay for 7-Zip.
-
-
-GNU LGPL information
--------------------
-
-    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 can receive a copy of the GNU Lesser General Public License from
-    http://www.gnu.org/
-
-
-
-
-BSD 3-clause License in 7-Zip code
----------------------------------
-
-  The "BSD 3-clause License" is used for the following code in 7z.dll
-    1) LZFSE data decompression.
-       That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
-       that also uses the "BSD 3-clause License".
-    2) ZSTD data decompression.
-       that code was developed using original zstd decoder code as reference code.
-       The original zstd decoder code was developed by Facebook Inc,
-       that also uses the "BSD 3-clause License".
-
-  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
-  Copyright (c) Facebook, Inc. All rights reserved.
-  Copyright (c) 2023-2024 Igor Pavlov.
-
-Text of the "BSD 3-clause License"
----------------------------------
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---
-
-
-
-
-BSD 2-clause License in 7-Zip code
----------------------------------
-
-  The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
-
-  XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
-
-  Copyright (c) 2012-2021 Yann Collet.
-  Copyright (c) 2023-2024 Igor Pavlov.
-
-Text of the "BSD 2-clause License"
----------------------------------
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---
-
-
-
-
-unRAR license restriction
-------------------------
-
-The decompression engine for RAR archives was developed using source
-code of unRAR program.
-All copyrights to original unRAR code are owned by Alexander Roshal.
-
-The license for original unRAR code has the following restriction:
-
-  The unRAR sources cannot be used to re-create the RAR compression algorithm,
-  which is proprietary. Distribution of modified unRAR sources in separate form
-  or as a part of other software is permitted, provided that it is clearly
-  stated in the documentation and source comments that the code may
-  not be used to develop a RAR (WinRAR) compatible archiver.
-
--
+  7-Zip source code
+  ~~~~~~~~~~~~~~~~~
+  License for use and distribution
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+
+  Licenses for files are:
+
+    1) CPP/7zip/Compress/Rar* files:  GNU LGPL + unRAR restriction
+    2) All other files:  GNU LGPL
+
+  The GNU LGPL + unRAR restriction means that you must follow both 
+  GNU LGPL rules and unRAR restriction rules.
+
+
+  GNU LGPL information
+  --------------------
+
+    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
+
+
+  unRAR restriction
+  -----------------
+
+    The decompression engine for RAR archives was developed using source 
+    code of unRAR program.
+    All copyrights to original unRAR code are owned by Alexander Roshal.
+
+    The license for original unRAR code has the following restriction:
+
+    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
+    which is proprietary. Distribution of modified unRAR sources in separate form 
+    or as a part of other software is permitted, provided that it is clearly
+    stated in the documentation and source comments that the code may
+    not be used to develop a RAR (WinRAR) compatible archiver.
+
+
+  --
+  Igor Pavlov
--- a/osx/par2/LICENSE
+++ b/osx/par2/LICENSE
@@ -0,0 +1,10 @@
+par2SL version 1.0, Copyright (C) 2003 Peter Brian Clements.
+Adapted for use with MacPar deLuxe by Gerard Putter.
+
+This program is compatible with Mac OS X Snow Leopard or later.
+It uses Grand Central Dispatch to optimize the speed and processor load.
+
+This is free software, and you are welcome to 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. See COPYING for details.
--- a/osx/par2/arm64/par2-turbo
+++ b/osx/par2/arm64/par2-turbo
--- a/osx/par2/par2-sl64
+++ b/osx/par2/par2-sl64
--- a/osx/par2/par2-turbo
+++ b/osx/par2/par2-turbo
--- a/osx/unrar/arm64/unrar
+++ b/osx/unrar/arm64/unrar
--- a/osx/unrar/unrar
+++ b/osx/unrar/unrar
--- a/po/email/SABemail.pot
+++ b/po/email/SABemail.pot
@@ -1,10 +1,11 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha2\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
--- a/po/email/cs.po
+++ b/po/email/cs.po
@@ -1,11 +1,12 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
+"Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/da.po
+++ b/po/email/da.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
+"Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/de.po
+++ b/po/email/de.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
+"Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/es.po
+++ b/po/email/es.po
@@ -1,20 +1,21 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
+"Language-Team: Spanish (https://www.transifex.com/sabnzbd/teams/111101/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/fi.po
+++ b/po/email/fi.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
+"Language-Team: Finnish (https://www.transifex.com/sabnzbd/teams/111101/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/fr.po
+++ b/po/email/fr.po
@@ -1,20 +1,21 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"
+"Language-Team: French (https://www.transifex.com/sabnzbd/teams/111101/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/he.po
+++ b/po/email/he.po
@@ -1,20 +1,21 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # ION, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2020\n"
-"Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
+"Language-Team: Hebrew (https://www.transifex.com/sabnzbd/teams/111101/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/it.po
+++ b/po/email/it.po
@@ -1,113 +0,0 @@
-# SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
-"PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: email/email.tmpl:1
-msgid ""
-"##\n"
-"## Default Email template for SABnzbd\n"
-"## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
-"##\n"
-"## Newlines and whitespace are significant!\n"
-"##\n"
-"## These are the email headers\n"
-"To: $to\n"
-"From: $from\n"
-"Date: $date\n"
-"Subject: SABnzbd has <!--#if $status then \"completed\" else \"failed\" #--> job $name\n"
-"X-priority: 5\n"
-"X-MS-priority: 5\n"
-"## After this comes the body, the empty line is required!\n"
-"\n"
-"Hi,\n"
-"<!--#if $status #-->\n"
-"SABnzbd has downloaded \"$name\" <!--#if $msgid==\"\" then \"\" else \"(newzbin #\" + $msgid + \")\"#-->\n"
-"<!--#else#-->\n"
-"SABnzbd has failed to download \"$name\" <!--#if $msgid==\"\" then \"\" else \"(newzbin #\" + $msgid + \")\"#-->\n"
-"<!--#end if#-->\n"
-"Finished at $end_time\n"
-"Downloaded $size\n"
-"\n"
-"Results of the job:\n"
-"<!--#for $stage in $stages #-->\n"
-"Stage $stage <!--#slurp#-->\n"
-"<!--#for $result in $stages[$stage]#-->\n"
-"    $result <!--#slurp#-->\n"
-"<!--#end for#-->\n"
-"<!--#end for#-->\n"
-"<!--#if $script!=\"\" #-->\n"
-"Output from user script \"$script\" (Exit code = $script_ret):\n"
-"$script_output\n"
-"<!--#end if#-->\n"
-"<!--#if $status #-->\n"
-"Enjoy!\n"
-"<!--#else#-->\n"
-"Sorry!\n"
-"<!--#end if#-->\n"
-msgstr ""
-
-#: email/rss.tmpl:1
-msgid ""
-"##\n"
-"## RSS Email template for SABnzbd\n"
-"## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
-"##\n"
-"## Newlines and whitespace are significant!\n"
-"##\n"
-"## These are the email headers\n"
-"To: $to\n"
-"From: $from\n"
-"Date: $date\n"
-"Subject: SABnzbd has added $amount jobs to the queue\n"
-"X-priority: 5\n"
-"X-MS-priority: 5\n"
-"## After this comes the body, the empty line is required!\n"
-"\n"
-"Hi,\n"
-"\n"
-"SABnzbd has added $amount job(s) to the queue.\n"
-"They are from RSS feed \"$feed\".\n"
-"<!--#for $job in $jobs#-->\n"
-"    $job <!--#slurp#-->\n"
-"<!--#end for#-->\n"
-"\n"
-"Bye\n"
-msgstr ""
-
-#: email/badfetch.tmpl:1
-msgid ""
-"##\n"
-"## Bad URL Fetch Email template for SABnzbd\n"
-"## This a Cheetah template\n"
-"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
-"##\n"
-"## Newlines and whitespace are significant!\n"
-"##\n"
-"## These are the email headers\n"
-"To: $to\n"
-"From: $from\n"
-"Date: $date\n"
-"Subject: SABnzbd failed to fetch an NZB\n"
-"X-priority: 5\n"
-"X-MS-priority: 5\n"
-"## After this comes the body, the empty line is required!\n"
-"\n"
-"Hi,\n"
-"\n"
-"SABnzbd has failed to retrieve the NZB from $url.\n"
-"The error message was: $msg\n"
-"\n"
-"Bye\n"
-msgstr ""
--- a/po/email/nb.po
+++ b/po/email/nb.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/sabnzbd/teams/111101/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/nl.po
+++ b/po/email/nl.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"
+"Language-Team: Dutch (https://www.transifex.com/sabnzbd/teams/111101/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/pl.po
+++ b/po/email/pl.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
+"Language-Team: Polish (https://www.transifex.com/sabnzbd/teams/111101/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/email/pt_BR.po
+++ b/po/email/pt_BR.po
@@ -1,20 +1,21 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/ro.po
+++ b/po/email/ro.po
@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
+# Copyright 2007-2022 The SABnzbd-Team
+#   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.4.0Alpha1\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
-"Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
+"Language-Team: Romanian (https://www.transifex.com/sabnzbd/teams/111101/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`@import url('Night.css') screen and (prefers-color-scheme: dark);`