Set version to 2.3.1 and resolve merge conflicts

Merge branch 'develop'
Set version to 2.3.0 and resolve merge conflict
2026-01-06 06:28:45 -05:00 · 2017-10-27 10:12:36 +02:00 · 2017-10-27 10:07:42 +02:00 · 2017-09-21 10:13:56 +02:00 · 2017-09-21 10:10:45 +02:00 · 2017-08-25 22:11:47 +02:00
185 changed files with 16233 additions and 15654 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Compiled python
+#Compiled python
 *.py[cod]

 # Working folders for Win build
@@ -7,13 +7,6 @@ dist/
 locale/
 srcdist/

-# Snapcraft
-parts/
-prime/
-stage/
-snap/.snapcraft/
-*.snap
-
 # Generated email templates
 email/*.tmpl

@@ -23,14 +16,12 @@ SABnzbd*.exe
 SABnzbd*.gz
 SABnzbd*.dmg

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

 # Testing folders
 .cache
 .xprocess
-tests/cache

 # General junk
 *.keep
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,15 @@
-# Include the host/username/password for the test-servers
-matrix:
-  include:
-  - os: linux
-    language: python
-    env:
-      - secure: X5MY2HAtCxBI84IySY/XroFsFy2RIVhfsX+P1y3WXfvwBHYKCgrPV6BgwCg93ttkPmMS/IslP5Vp4F1OGqC9AZdxtxfHKpIPlIVxIHj6Lf6xwynmbGDQXjy73K13gjznK2mkGA0jcsp4Q5POS4ZKVkd6aOXnc8l8xS08+ztAvfxCC3tsMj2oMLEPP92j6zqb/1x2aX5+gVyVzrKgQQVKIk6R6jTxhIiOMPzj4+VMLXK8NEZqjV6RPwUjSoKHqJiV5URyf6/+2Ojmem3ilnpktn7xIJ/ZO1UNnZCrElOGZtmbryZFMctJvEAIQCOSdzsq/MACk0gocnOL3JQfDF5sYPOjJmc6sZI9PL78oFhwKaLkWEx565u8kdkLTMvv4A02HAmPzV1rKE1CTlEhsy0djU8mueCr9Ep1WyLJdY/igbyhR+dOd8fVo9Y1tY2o+ZisCsO5+PRfzhypK9xukqmWDJSXIWSuExUU/becXJ4IaTmlYJ+ArhKvkL90GmckH/zt9ZPIgr9Lq0OFva9uVHX+sbbsQZZ48lAmgiiiX335dONj8MxO8cDKsUT9FWQ8PzeJ8g8PErv5pmVVVODoOdKZg2Oo4jUsZG2yV8uUt9j87I2DPou4WiJ7wcTzQCPdzlaA5hdixPMyVUF/yCL+eKdJQFaKy3eaKwCxnAVp3WA2WdA=
-      - secure: gzvbgg+rdM/TfPOlXGE/JOW8VEfIJxwUnzt2bH07nj/PbREXQXrImC1SreMtwQX+gvd7bjIBZU/sgNSgRYcWKaSim4uNtAbinkcKQeP+V844ZY2Fabq/xpLluSP61vJLQ+hOLbnvilxmuI0E1Divahxo5qZJlwzCdk5u2txJRT/2LKGDT1lpGgIyDj9u0/ViAcpaAyfFR2Zd6ydHKbx+eFBE21LkyH/+GJmRiO0+qLIuCa2knmOJYjwBxRcPiAEDpbrRUbYDiNyzPqEVxJfCbsGYlo/QN/SnV6kTqM1WoFzvi4d1pDxDGRFLQj+KigihF6uY4eLC1e6yVQrDy0tyWKt6E+1tc8fH5dRS7AYtWMzURn/7Ebd72AiNIYaeAL8ZPqI7vw3ovFTqBS0h8Mg2uUZ503ytUvfwKyU9MgIkzXwmGuE37MCd0bRJ/blPS2DT+IMbrbEP90K5VrDrN/AGiYHR1TZ9GKUZd6xHibulEh2nNFMMQEga8nE2CWaJ3uJrCN7ud+4OJ0zCZFF7JiJTbOGApHg/aGWD/bYfg9sIh7up4PcxVs6RFxbf+M1aB8GO2A9aEZFow+djYVxiqf6esmzrnlsTfz16f8Txmez3BRftjVULre03a3Rt7WRxwYLveNlJos1nMw3G0CnruCe+wJbHEK4tEiqIXqB8UemT4zw=
-      - secure: f5QGjZESH4khjLOO1Ntgtiol4ZvwcqHLIV1sdK162dVkNT6UKOTRQflj2UmRXzwiRzWtVX/Ri0zT0j+SUJy2+aqJY/gxvisdTIWzRQ3w/CJPGgCizSkTQEWJ2V/n7DUAJ4xerme36zYi21S3d8VEWVDzU/duLu3yhlN5x0wMCY+dDPSDTFubmptGeCmyxqBqGVd7gD3PaiK7fDBB/eAXbW3QxLLQfxLHmPsx8vzPhDTQiLFtY43jfnVGEBdUbxSMXbq2NRB5eXH3bBkW8u/5y9uoyuF45CQn8f3UB6F84L+/n9M2ryCGeSJOFuZqSUHXvRF2acON40jx3t4PVocEzYguPwewoiFxfFHjRWmiI4WljiN30taK0pgstmzLTedozK+NdZ0M8vD7MCyK0yegPQolzFRngWW5Y8NY1XwlBT9W2lqGmrFge+dB86wOArMcRlY62PTOJ9Zqspbe/6mBT4Tq4O2OsXxGX/x60W/NJynva9WAz2SLEi5Pjs6r1a3tyXssw4/8KVhWl92WfpOnWrZrnZlsxOTmcS2OhLB0FQikTv9T/i3CZNcCI4PELkExeIwh4JW1MY0iGeLDHcAUKryJGrRZj1x32Nt1uUPTPBi8l8EzNyNOUvbHYTdpBr5r2JW1orvT55OhvKauc3wB7ogj673iYsqx5jeazHhgJMs=
-  - os: osx
-    env:
-      - HOMEBREW_NO_AUTO_UPDATE=1
-      - secure: RI/WxBI5kTP5v0qZ6im5BwqPurzzwKIl8GSbM2dFSEiWYEbKwHTDJ3KDDsXqS8YMNaropNVgzsdpCGXYUWRNTraKVa9GZEGNJ+fQuBWK9wkJ0MDTYfL/QFSN1CDXXlg7k26VXu6PgvEFA5kyDfSpxrxXJC6yXOUeJqmebkU2fiQo7/5Vpb1WAwpYlBP6zL5lYt2lpJ85fhYEjuAeuP/9zdVIlgCB7rDCgUX7tCKKXgwbKXfcff7lOCneB00/RCmRuNp3/tohGlgrSXh4ivHx4XEQgRoiVdeR3RCKZa5tBIXANefuJ2VopBrAbSRmVBexQP1818IU/XLlwtEEpC1vulpkx+5JolWksCrx4uJkKdlH0KA4k1m88L0Q1Rmmnp9LgRgeEl5xqt5s6RR6lS63ChQYkVFgWandwlrWu7Uenne4401KbG58PzDXEGlsKhUXnYBX+SU6gwejImCMb3vszKRAge5QAQlkiruCu31W9tWpY9ezHYrbv9ckOqdFXf9qsPEnU352v/8qHFe7jT/+7RSYdUzuo/d2aQqPKfkb7sy1VLEznmbGmv1BH4rGNpxd5inlcFKsR099Hx7PWgY8MHZcnEP3PJ2kBseFzVP3WKXHDTcv8yR0w6EgQyMzSHl9Ah3WJJ7TXZQ82gcqF8LcmuKcqXcwTkffG3ww7Vzuq4M=
-      - secure: uXHKYgQAwnfhWKi7RKAEumMMZZTJBb878KpodRfs1fz0NffdPo5+Ak1ricNzOJ8wti8/lXycDS+YmnFs64lGUxL+zvbQlFv7QuKfN0uHfPlo6zux9Ha9pg1rSUI4zqZ9kmbtwc0I2mdy1VeWwHvnbQDXUIt6a+tTwYZL3MGdP6kNvtSXaYhbEoHExjqeHUtVhUTafvWGtwE7uN+sdvhwXQ0dWlz6HGub8qYjkKCmF9VG+OyLKjFHjLVDMQ7Jnng2l1ZOgHSh5g5m6r++NEwSzZ8wFVULdzv5eEcR9U+mHmonFKOA/ICcZGd8MhEuvz9BupfgDWFqSTb5JGxzlZ28YdtjcAudzrWQMSpP2R0ks2Ttxz9Kpgw1L75HMvj0smazHs7IEEiXf2Yr03bzeHg7CGXNqOYyEOxxrPaJekCjMlX/YGqT/iv/8pZPfew7k/iVJlvCam76WNXABjJncHJeMsCgkItYZAoRZJDc+7z8J4g4ys1Rk0V/difjjwc/pSeKbt6wDA/9cmZ7r4Cs1Yh9Pl/mw6kzWGGpejO7lmsayQN3Pw99QMcZByUHx5BR+ZtIfF7Sl+F0uDQJ0MntJcteF7z1Dam2jHlkLckb85j6YWup5ItLAj5Hz7V2YUwqFmQhfOWEAjxagNSNnB8we4YBWS4KDTBEVDm6ITTfddlYvCw=
-      - secure: HKaT52NUQh18kllFQTjpKC64KlDkWEz0XnIEKJffumctrJjCvoFZFNC7ip3j7Bi3yp2IeD2SMsdxrrT6YFKxx5FfSdPqpQnsY34bzdEFZQomNJg4n/tmBc350PoVQ0PvLQiVoCCfVbdS/b4makNK7A+d9KED+SEsQMAqKp2mSnGhATB9MwFaZL5S4nGnEkqW5+eeAQxJ8JRawwumOOx/xhPOoEMIfHMpyTwFI1yUh1nJhZ9k1nxHzPlM78goyIuf0MjeZfSZ2fIlNZGVruYM28i9hpO4bzPFhk51uryWv8DQZiZlpCkHl6Po7rVVf5pNqm+l9SD/t0DnhS2rJHdeFSI2lM/uZtdOxaY5fTTj83LbCGhFtuZnZRwoQ73tpda8J7Z1E5Ni9bi7vOiZQ4pEIPt4LLu0X607sPWMkqrmgalKQQS13b5oliyMpkIguvmj9822BpaNVqamIrfn0z38+0Gog8iuGlMAQnRO9tGDO4kbVLcZQTRWpSwIC3niTPjPgLq/N92XQ9xmccrFT7efwemgF65FNM5ltv8+9AmI+hsuyXfqeHaAV9wmxRAAhaqvRgnSLYa3u1CPn5fF2CDvPvPcyCEIWnyxc7dYHDpzAQDcyuSejtbnL8gpkDqEHpy23hTjgZnZD7Pk7PQ7ayA8zBumTMGZ+/GAn5Wmgce+w0M=
-    addons:
-      chrome: stable
-
-before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew cask install chromedriver;
-    else
-      sudo add-apt-repository ppa:jcfp -y;
-      sudo apt-get update -q;
-      sudo apt-get install unrar p7zip-full par2 chromium-chromedriver -y;
-      ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver;
-    fi;
-
+language: python
+python:
+  - "2.7"
+before_install:
+  - sudo add-apt-repository ppa:jcfp -y
+  - sudo apt-get update -q
+  - sudo apt-get install sabnzbdplus -y
 install:
  - pip install --upgrade -r tests/requirements.txt
-
 script:
-  - python ./tests/test_functional.py
-
+  - pytest
 notifications:
  email:
    on_success: never
-    on_failure: always
+    on_failure: always
--- a/ABOUT.txt
+++ b/ABOUT.txt
@@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 2.3.7               ***
+*** This is SABnzbd 2.4.0               ***
 *******************************************
 SABnzbd is an open-source cross-platform binary newsreader.
 It simplifies the process of downloading from Usenet dramatically,
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,5 +1,5 @@

-(c) Copyright 2007-2019 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2017 by "The SABnzbd-team" <team@sabnzbd.org>

 The SABnzbd-team is:

--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,10 +1,10 @@
-                            SABnzbd 2.3.7
+                                SABnzbd 2.3.1

 -------------------------------------------------------------------------------
 0) LICENSE
 -------------------------------------------------------------------------------

-(c) Copyright 2007-2019 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2017 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/ISSUES.txt
+++ b/ISSUES.txt
@@ -66,7 +66,3 @@
  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-2019 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2017 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/4
+++ b/4
@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.3.7RC1
-Summary: SABnzbd-2.3.7RC1
+Version: 2.3.1
+Summary: SABnzbd-2.3.1
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org
--- a/README.md
+++ b/README.md
@@ -1,12 +1,6 @@
 SABnzbd - The automated Usenet download tool
 ============================================

-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/sabnzbd/sabnzbd.svg)](https://isitmaintained.com/project/sabnzbd/sabnzbd "Average time to resolve an issue")
-[![Travis CI](https://travis-ci.org/sabnzbd/sabnzbd.svg?branch=develop)](https://travis-ci.org/sabnzbd/sabnzbd)
-[![AppVeryor](https://ci.appveyor.com/api/projects/status/github/sabnzbd/sabnzbd?svg=true&branch=develop)](https://ci.appveyor.com/project/Safihre/sabnzbd)
-[![Snap Status](https://build.snapcraft.io/badge/sabnzbd/sabnzbd.svg)](https://snapcraft.io/sabnzbd)
-[![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.

 It's totally free, incredibly easy to use, and works practically everywhere.
@@ -27,6 +21,7 @@ Optional:
 - `python-cryptography` (enables certificate generation and detection of encrypted RAR-files during download)
 - `python-dbus` (enable option to Shutdown/Restart/Standby PC on queue finish)
 - `7zip`
+- `unzip`

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

--- a/README.mkd
+++ b/README.mkd
@@ -1,20 +1,48 @@
-Release Notes - SABnzbd 2.3.7 RC 1
+Release Notes - SABnzbd 2.3.1
 =========================================================

-## Improvements and bug fixes since 2.3.7 Beta 1
- Added option to quickly add a verified test download
- Direct Unpack could get stuck processing
- Show Details on Servers page could break graph display
- Windows: Update MultiPar to 1.3.0.3
+## Changes since 2.3.0
+- Added post-processing script Deobfuscate.py (in "scripts" folder)
+  which can automatically process "rename.par2" after unpacking
+  or rename the largest file in the folder to the job's name
+- Maximum Article Cache size increased to 4GB on 64 bit systems
+- New servers will have timeout of 60 seconds instead of 120
+- Last output of a running script is shown in history
+- Paths to par2, unrar, unzip and 7zip are passed to scripts
+- Path to gzipped NZB file of job is passed to scripts
+- Windows: Single click on tray icon pauses/unpauses queue

-## Improvements and bug fixes since 2.3.6
- Hopeless jobs will be failed faster, based on the first article of
-  each file. If 80% of these first articles is missing, the job is aborted.
- Option "fast_fail" added to disable the new behavior.
- Readout of some RSS feeds could result in a crash
+## Bugfixes since 2.3.0
+- Abort Direct Unpack if not progressing 2 minutes after download
+- Direct Unpacker could crash on some downloads
+- Added measures to prevent "Failed to import" errors
+- Downloader could crash during first few seconds after start
+- Saving errors of renames-file prevented
+- More verbose logging of creating and deleting files
+- Remove ".par2" at end of job name, could cause failure of repair
+- Fix racing-condition for files coming in after a job finishes
+- When re-adding a job, the time left was not calculated
+- Priority of category was ignored when adding new job
+- Server information in Status window was not always updated
+- Always show Direct Unpack status on smaller screens
+- Correctly adapt date and time display to local time zone
+- Category folders cannot be sub-folders of Temporary Download Folder
+- Email notifications could not be limited to categories
+- Testing email notifications did not work
+- Added "with" to list of lowercase words in titles for Sorting
+- "From SxxEyy" RSS filter did not always work
+- Show clearly that RSS "From Show SxxEyy" is an "Accept"-type filter
+- Sorting failed when "Ignore folders inside archives" was enabled
+- Always send "failure_url" to post-processing scripts
+- Decoding of articles no longer logged by default to reduce logging
+- Windows: Remove incompatible "Extra Par2 Parameters" for MultiPar
+- Windows: Special filenames could cause failures during unpack
+- Windows: Message box is shown in case of fatal startup error
+- Windows: Unpacking to network shares could fail
+- macOS: Added Safari pinned tab icon

-Still looking for help with SABnzbd (Python 3) development!
-https://www.reddit.com/r/usenet/comments/918nxv/
+In case of "Article DB missing/empty" errors, enable +Debug logging
+and report here: https://github.com/sabnzbd/sabnzbd/issues/952

 ## Upgrading from 2.2.x and older
 - Finish queue
@@ -40,4 +68,4 @@ https://www.reddit.com/r/usenet/comments/918nxv/
  that automatically verify, repair, extract and clean up posts downloaded
  from Usenet.

-  (c) Copyright 2007-2019 by "The SABnzbd-team" \<team@sabnzbd.org\>
+  (c) Copyright 2007-2017 by "The SABnzbd-team" \<team@sabnzbd.org\>
--- a/SABHelper.py
+++ b/SABHelper.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python -OO
-# Copyright 2007-2019 The SABnzbd-Team <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,6 +20,7 @@ if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
    print "Sorry, requires Python 2.6 or 2.7."
    sys.exit(1)

+import os
 import time
 import subprocess

--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python -OO
-# Copyright 2007-2019 The SABnzbd-Team <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
@@ -44,7 +44,7 @@ import re

 try:
    import Cheetah
-    if Cheetah.Version[0] < '2':
+    if Cheetah.Version[0] != '2':
        raise ValueError
 except ValueError:
    print "Sorry, requires Python module Cheetah 2.0rc7 or higher."
@@ -173,7 +173,7 @@ class guiHandler(logging.Handler):

 def print_help():
    print
-    print "Usage: %s [-f <configfile>] <other options> [NZB (or related) file]" % sabnzbd.MY_NAME
+    print "Usage: %s [-f <configfile>] <other options>" % sabnzbd.MY_NAME
    print
    print "Options marked [*] are stored in the config file"
    print
@@ -182,7 +182,7 @@ def print_help():
    print "  -s  --server <srv:port>  Listen on server:port [*]"
    print "  -t  --templates <templ>  Template directory [*]"
    print
-    print "  -l  --logging <-1..2>    Set logging level (-1=off, 0= least, 2= most) [*]"
+    print "  -l  --logging <0..2>     Set logging level (-1=off, 0= least, 2= most) [*]"
    print "  -w  --weblogging         Enable cherrypy access logging"
    print
    print "  -b  --browser <0..1>     Auto browser launch (0= off, 1= on) [*]"
@@ -204,20 +204,15 @@ def print_help():
    print "      --ipv6_hosting <0|1> Listen on IPv6 address [::1] [*]"
    print "      --no-login           Start with username and password reset"
    print "      --log-all            Log all article handling (for developers)"
-    print "      --disable-file-log   Logging is only written to console"
    print "      --console            Force console logging for OSX app"
    print "      --new                Run a new instance of SABnzbd"
-    print ""
-    print "NZB (or related) file:"
-    print "  NZB or compressed NZB file, with extension .nzb, .zip, .rar, .7z, .gz, or .bz2"
-    print ""


 def print_version():
    print """
 %s-%s

-Copyright (C) 2007-2019, The SABnzbd-Team <team@sabnzbd.org>
+Copyright (C) 2008-2017, 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
@@ -406,7 +401,7 @@ def print_modules():
    """ Log all detected optional or external modules """
    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)
+        logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION_REQUIRED)
    else:
        # Something wrong with SABYenc, so let's determine and print what:
        if sabnzbd.decoder.SABYENC_VERSION:
@@ -502,7 +497,7 @@ def all_localhosts():
 def check_resolve(host):
    """ Return True if 'host' resolves """
    try:
-        socket.getaddrinfo(host, None)
+        dummy = socket.getaddrinfo(host, None)
    except:
        # Does not resolve
        return False
@@ -598,7 +593,7 @@ def get_webhost(cherryhost, cherryport, https_port):
            cherryhost = cherryhost.strip('[]')
        else:
            try:
-                socket.getaddrinfo(cherryhost, None)
+                info = socket.getaddrinfo(cherryhost, None)
            except:
                cherryhost = cherryhost.strip('[]')

@@ -659,12 +654,12 @@ def attach_server(host, port, cert=None, key=None, chain=None):
 def is_sabnzbd_running(url):
    """ Return True when there's already a SABnzbd instance running. """
    try:
-        url = '%s&mode=version' % url
+        url = '%s&mode=version' % (url)
        # Do this without certificate verification, few installations will have that
        prev = sabnzbd.set_https_verification(False)
        ver = get_from_url(url)
        sabnzbd.set_https_verification(prev)
-        return ver and (re.search(r'\d+\.\d+\.', ver) or ver.strip() == sabnzbd.__version__)
+        return (ver and (re.search(r'\d+\.\d+\.', ver) or ver.strip() == sabnzbd.__version__))
    except:
        return False

@@ -728,7 +723,7 @@ def evaluate_inipath(path):
            return path


-def commandline_handler():
+def commandline_handler(frozen=True):
    """ Split win32-service commands are true parameters
        Returns:
            service, sab_opts, serv_opts, upload_nzbs
@@ -761,7 +756,7 @@ def commandline_handler():
        opts, args = getopt.getopt(info, "phdvncwl:s:f:t:b:2:",
                                   ['pause', 'help', 'daemon', 'nobrowser', 'clean', 'logging=',
                                    'weblogging', 'server=', 'templates', 'ipv6_hosting=',
-                                    'template2', 'browser=', 'config-file=', 'force', 'disable-file-log',
+                                    'template2', 'browser=', 'config-file=', 'force',
                                    'version', 'https=', 'autorestarted', 'repair', 'repair-all',
                                    'log-all', 'no-login', 'pid=', 'new', 'console', 'pidfile=',
                                    # Below Win32 Service options
@@ -780,7 +775,7 @@ def commandline_handler():
    if not service:
        # Get and remove any NZB file names
        for entry in args:
-            if get_ext(entry) in VALID_NZB_FILES + VALID_ARCHIVES:
+            if get_ext(entry) in ('.nzb', '.zip', '.rar', '.gz', '.bz2'):
                upload_nzbs.append(os.path.abspath(entry))

    for opt, arg in opts:
@@ -824,11 +819,11 @@ def main():
    cherrypylogging = None
    clean_up = False
    logging_level = None
-    no_file_log = False
    web_dir = None
    vista_plus = False
    win64 = False
    repair = 0
+    api_url = None
    no_login = False
    sabnzbd.RESTART_ARGS = [sys.argv[0]]
    pid_path = None
@@ -864,9 +859,9 @@ def main():
        elif opt in ('-b', '--browser'):
            try:
                autobrowser = bool(int(arg))
-            except ValueError:
+            except:
                autobrowser = True
-        elif opt == '--autorestarted':
+        elif opt in ('--autorestarted', ):
            autorestarted = True
        elif opt in ('-c', '--clean'):
            clean_up = True
@@ -885,36 +880,34 @@ def main():
            exit_sab(0)
        elif opt in ('-p', '--pause'):
            pause = True
-        elif opt == '--https':
+        elif opt in ('--https',):
            https_port = int(arg)
            sabnzbd.RESTART_ARGS.append(opt)
            sabnzbd.RESTART_ARGS.append(arg)
-        elif opt == '--repair':
+        elif opt in ('--repair',):
            repair = 1
            pause = True
-        elif opt == '--repair-all':
+        elif opt in ('--repair-all',):
            repair = 2
            pause = True
-        elif opt == '--log-all':
+        elif opt in ('--log-all',):
            sabnzbd.LOG_ALL = True
-        elif opt == '--disable-file-log':
-            no_file_log = True
-        elif opt == '--no-login':
+        elif opt in ('--no-login',):
            no_login = True
-        elif opt == '--pid':
+        elif opt in ('--pid',):
            pid_path = arg
            sabnzbd.RESTART_ARGS.append(opt)
            sabnzbd.RESTART_ARGS.append(arg)
-        elif opt == '--pidfile':
+        elif opt in ('--pidfile',):
            pid_file = arg
            sabnzbd.RESTART_ARGS.append(opt)
            sabnzbd.RESTART_ARGS.append(arg)
-        elif opt == '--new':
+        elif opt in ('--new',):
            new_instance = True
-        elif opt == '--console':
+        elif opt in ('--console',):
            sabnzbd.RESTART_ARGS.append(opt)
            osx_console = True
-        elif opt == '--ipv6_hosting':
+        elif opt in ('--ipv6_hosting',):
            ipv6_hosting = arg

    sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
@@ -1005,13 +998,13 @@ def main():
        if enable_https and https_port:
            try:
                cherrypy.process.servers.check_port(cherryhost, https_port, timeout=0.05)
-            except IOError:
+            except IOError, error:
                Bail_Out(browserhost, cherryport)
            except:
                Bail_Out(browserhost, cherryport, '49')
        try:
            cherrypy.process.servers.check_port(cherryhost, cherryport, timeout=0.05)
-        except IOError:
+        except IOError, error:
            Bail_Out(browserhost, cherryport)
        except:
            Bail_Out(browserhost, cherryport, '49')
@@ -1048,7 +1041,7 @@ def main():
                        else:
                            # In case HTTPS == HTTP port
                            cherryport = newport
-                            sabnzbd.cfg.cherryport.set(newport)
+                            sabnzbd.cfg.port.set(newport)
        except:
            # Something else wrong, probably badly specified host
            Bail_Out(browserhost, cherryport, '49')
@@ -1079,7 +1072,11 @@ def main():
    # We found a port, now we never check again
    sabnzbd.cfg.fixed_ports.set(True)

-    # Logging-checks
+    if logging_level is None:
+        logging_level = sabnzbd.cfg.log_level()
+    else:
+        sabnzbd.cfg.log_level.set(logging_level)
+
    logdir = sabnzbd.cfg.log_dir.get_path()
    if fork and not logdir:
        print "Error:"
@@ -1098,24 +1095,19 @@ def main():
    # Prevent the logger from raising exceptions
    # primarily to reduce the fallout of Python issue 4749
    logging.raiseExceptions = 0
-
-    # Log-related constants we always need
-    if logging_level is None:
-        logging_level = sabnzbd.cfg.log_level()
-    else:
-        sabnzbd.cfg.log_level.set(logging_level)
    sabnzbd.LOGFILE = os.path.join(logdir, DEF_LOG_FILE)
-    logformat = '%(asctime)s::%(levelname)s::[%(module)s:%(lineno)d] %(message)s'
-    logger.setLevel(LOGLEVELS[logging_level + 1])

    try:
-        if not no_file_log:
-            rollover_log = logging.handlers.RotatingFileHandler(
-                sabnzbd.LOGFILE, 'a+',
-                sabnzbd.cfg.log_size.get_int(),
-                sabnzbd.cfg.log_backups())
-            rollover_log.setFormatter(logging.Formatter(logformat))
-            logger.addHandler(rollover_log)
+        rollover_log = logging.handlers.RotatingFileHandler(
+            sabnzbd.LOGFILE, 'a+',
+            sabnzbd.cfg.log_size.get_int(),
+            sabnzbd.cfg.log_backups())
+
+        logformat = '%(asctime)s::%(levelname)s::[%(module)s:%(lineno)d] %(message)s'
+        rollover_log.setFormatter(logging.Formatter(logformat))
+        sabnzbd.LOGHANDLER = rollover_log
+        logger.addHandler(rollover_log)
+        logger.setLevel(LOGLEVELS[logging_level + 1])

    except IOError:
        print "Error:"
@@ -1145,8 +1137,6 @@ def main():
                console.setLevel(LOGLEVELS[logging_level + 1])
                console.setFormatter(logging.Formatter(logformat))
                logger.addHandler(console)
-            if no_file_log:
-                logging.info('Console logging only')
            if noConsoleLoggingOSX:
                logging.info('Console logging for OSX App disabled')
                so = file('/dev/null', 'a+')
@@ -1179,7 +1169,7 @@ def main():
        logging.info('Preferred encoding = ERROR')
        preferredencoding = ''

-    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly advised:
+    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
    if not sabnzbd.WIN32 and not sabnzbd.DARWIN and not ('utf' in preferredencoding.lower() and '8' in preferredencoding.lower()):
        logging.warning(T("SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads.") % preferredencoding)

@@ -1236,6 +1226,8 @@ def main():

    if autobrowser is not None:
        sabnzbd.cfg.autobrowser.set(autobrowser)
+    else:
+        autobrowser = sabnzbd.cfg.autobrowser()

    if not sabnzbd.WIN_SERVICE and not getattr(sys, 'frozen', None) == 'macosx_app':
        signal.signal(signal.SIGINT, sabnzbd.sig_handler)
@@ -1369,11 +1361,8 @@ def main():
    staticcfg = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(sabnzbd.WEB_DIR_CONFIG, 'staticcfg'), 'tools.staticdir.content_types': forced_mime_types}
    wizard_static = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(sabnzbd.WIZARD_DIR, 'static'), 'tools.staticdir.content_types': forced_mime_types}

-    appconfig = {'/api': {
-                            'tools.basic_auth.on': False,
-                            'tools.response_headers.on': True,
-                            'tools.response_headers.headers': [('Access-Control-Allow-Origin', '*')]
-                         },
+    appconfig = {'/api': {'tools.basic_auth.on': False},
+                 '/rss': {'tools.basic_auth.on': False},
                 '/static': static,
                 '/wizard/static': wizard_static,
                 '/favicon.ico': {'tools.staticfile.on': True, 'tools.staticfile.filename': os.path.join(sabnzbd.WEB_DIR_CONFIG, 'staticcfg', 'ico', 'favicon.ico')},
@@ -1521,7 +1510,9 @@ def main():
        # Or special restart cases like Mac and WindowsService
        if sabnzbd.TRIGGER_RESTART:
            # Shutdown
-            sabnzbd.shutdown_program()
+            cherrypy.engine.exit()
+            sabnzbd.halt()
+            sabnzbd.SABSTOP = True

            if sabnzbd.downloader.Downloader.do.paused:
                sabnzbd.RESTART_ARGS.append('-p')
@@ -1598,7 +1589,7 @@ if sabnzbd.WIN32:
            win32serviceutil.ServiceFramework.__init__(self, args)

            self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
-            self.overlapped = pywintypes.OVERLAPPED()
+            self.overlapped = pywintypes.OVERLAPPED()  # @UndefinedVariable
            self.overlapped.hEvent = win32event.CreateEvent(None, 0, 0, None)
            sabnzbd.WIN_SERVICE = self

@@ -1728,7 +1719,9 @@ if __name__ == '__main__':

                def stop(self):
                    logging.info('[osx] sabApp Quit - stopping main thread ')
-                    sabnzbd.shutdown_program()
+                    sabnzbd.halt()
+                    cherrypy.engine.exit()
+                    sabnzbd.SABSTOP = True
                    logging.info('[osx] sabApp Quit - main thread stopped')

            sabApp = startApp()
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,14 +1,6 @@
-environment:
-  SAB_NEWSSERVER_HOST:
-    secure: UNnTfVHDugC9amTucdTRyxe8RZfVBLYfI1EOTaDUjNM=
-  SAB_NEWSSERVER_USER:
-    secure: npe0D4TiEzXMUVMCH3+SHA==
-  SAB_NEWSSERVER_PASSWORD:
-    secure: 28COv3RG+KAnBLxIrR1EDw==
-
 install:
  - pip install --upgrade -r tests/requirements.txt
  - pip install pypiwin32 subprocessww

 build_script:
-  - python ./tests/test_functional.py
+  - pytest
--- a/interfaces/Config/templates/config.tmpl
+++ b/interfaces/Config/templates/config.tmpl
@@ -81,7 +81,7 @@
                    </td>
                </tr>
                <!--#end if#-->
-                <!--#if not $have_unzip and not $have_7zip #-->
+                <!--#if not $have_unzip #-->
                <tr>
                    <th scope="row">$T('opt-enable_unzip'):</th>
                    <td>
@@ -142,7 +142,7 @@

 <div class="colmask">
    <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2019 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+        <h5 class="copyright">Copyright &copy; 2008-2017 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_folders.tmpl
+++ b/interfaces/Config/templates/config_folders.tmpl
@@ -3,11 +3,6 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
-    <div class="padding alt section">
-        <label for="advanced-settings-button" class="form-control advanced-button ">
-            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
-        </label>
-    </div>
    <form action="saveDirectories" method="post" name="fullform" class="fullform" autocomplete="off">
    <input type="hidden" id="session" name="session" value="$session" />
    <input type="hidden" id="ajax" name="ajax" value="1" />
@@ -26,7 +21,7 @@
                    <input type="text" name="download_dir" id="download_dir" value="$download_dir" data-initialdir="$my_home" />
                    <span class="desc">$T('explain-download_dir')</span>
                </div>
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <label class="config" for="download_free">$T('opt-download_free')</label>
                    <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input"  />
                    <span class="desc">$T('explain-download_free')</span>
@@ -37,7 +32,7 @@
                    <span class="desc">$T('explain-complete_dir')</span>
                </div>
                <!--#if not $nt#-->
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <label class="config" for="permissions">$T('opt-permissions')</label>
                    <input type="text" name="permissions" id="permissions" value="$permissions" class="smaller_input" />
                    <span class="desc">$T('explain-permissions')</span>
@@ -48,7 +43,7 @@
                    <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
                    <span class="desc">$T('explain-dirscan_dir')</span>
                </div>
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
                    <input type="number" name="dirscan_speed" id="dirscan_speed" value="$dirscan_speed"  min="0" max="3600" />
                    <span class="desc">$T('explain-dirscan_speed')</span>
@@ -58,12 +53,12 @@
                    <input type="text" name="script_dir" id="script_dir" value="$script_dir" data-initialdir="$my_home" />
                    <span class="desc">$T('explain-script_dir')</span>
                </div>
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <label class="config" for="email_dir">$T('opt-email_dir')</label>
                    <input type="text" name="email_dir" id="email_dir" value="$email_dir" data-initialdir="$my_home" />
                    <span class="desc">$T('explain-email_dir')</span>
                </div>
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <label class="config" for="password_file">$T('opt-password_file')</label>
                    <input type="text" name="password_file" id="password_file" value="$password_file" />
                    <span class="desc">$T('explain-password_file')</span>
@@ -77,7 +72,7 @@
            </fieldset>
        </div><!-- /col1 -->
    </div><!-- /section -->
-    <div class="section advanced-settings">
+    <div class="section">
        <div class="col2">
            <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>
--- a/interfaces/Config/templates/config_general.tmpl
+++ b/interfaces/Config/templates/config_general.tmpl
@@ -3,11 +3,6 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
-    <div class="padding alt section">
-        <label for="advanced-settings-button" class="form-control advanced-button ">
-            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
-        </label>
-    </div>
    <form action="saveGeneral" method="post" name="fullform" class="fullform" autocomplete="off">
    <input type="hidden" id="session" name="session" value="$session" />
    <input type="hidden" id="ajax" name="ajax" value=1 />
@@ -33,7 +28,7 @@
                    <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>
                </div>
-                <div class="field-pair advanced-settings">
+                <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#-->
@@ -94,6 +89,7 @@
                <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>
+                    <button class="btn btn-default advancedButton enable_https_options"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</button>
                </div>
            </fieldset>
        </div>
@@ -177,7 +173,7 @@
                    </select>
                    <span class="desc">$T('explain-check_new_rel')</span>
                </div>
-                <div class="field-pair advanced-settings <!--#if int($have_ssl_context) == 0 then "disabled" else ""#-->">
+                <div class="field-pair <!--#if int($have_ssl_context) == 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($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#--> />
                    <span class="desc">$T('explain-enable_https_verification')</span>
@@ -204,12 +200,12 @@
                    </select>
                    <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
                </div>
-                <div class="field-pair advanced-settings">
+                <div class="field-pair">
                    <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">
+                <div class="field-pair">
                    <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>
--- a/interfaces/Config/templates/config_notify.tmpl
+++ b/interfaces/Config/templates/config_notify.tmpl
@@ -91,7 +91,7 @@
                    <input type="text" name="email_pwd" id="email_pwd" value="$email_pwd" />
                    <span class="desc">$T('explain-email_pwd')</span>
                </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" type="button" id="test_email" rel="$T('askTestEmail')"><span class="glyphicon glyphicon-envelope"></span> $T('link-testEmail')</button>
                </div>
@@ -115,7 +115,7 @@
        <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">
+                <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" type="button" id="test_notif"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
               </div>
@@ -141,7 +141,7 @@
        <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">
+                <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" type="button" id="test_windows"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
               </div>
@@ -167,7 +167,7 @@
        <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">
+                <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" type="button" id="test_osd"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
               </div>
@@ -194,7 +194,7 @@
            <fieldset>
                <div class="field-pair">
                    <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
-                    <select name="nscript_script" id="nscript_script">
+                    <select name="nscript_script">
                        <!--#for $sc in $scripts#-->
                        <option value="$sc" <!--#if $nscript_script == $sc then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                        <!--#end for#-->
@@ -207,7 +207,7 @@
                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
                </div>
                $show_notify_checkboxes('nscript')
-                <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" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -241,7 +241,7 @@
                    <span class="desc">$T('explain-growl_password')</span>
                </div>
                $show_notify_checkboxes('growl')
-                <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" type="button" id="test_growl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -286,7 +286,7 @@
                        </select>
                    </div>
                <!--#end for#-->
-                <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" type="button" id="test_prowl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -352,7 +352,7 @@
                        </select>
                    </div>
                <!--#end for#-->
-                <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" type="button" id="test_pushover"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -389,7 +389,7 @@
                </div>
                <!--#end if#-->
                $show_notify_checkboxes('pushbullet')
-                <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" type="button" id="test_pushbullet"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -417,7 +417,6 @@
            \$(this).parents('.col2').find('.col2-cats').hide()
        }
        \$('form').submit()
-        addRowColor()
    })
    \$('#email_endjob').change(function() {
        if(\$(this).val() > 0) {
--- a/interfaces/Config/templates/config_rss.tmpl
+++ b/interfaces/Config/templates/config_rss.tmpl
@@ -390,10 +390,9 @@
                        <th class="no-sort">$T('link-download')</th>
                        <th>$T('rss-filter')</th>
                        <th>$T('size')</th>
-                        <th width="60%">$T('sort-title')</th>
+                        <th width="65%">$T('sort-title')</th>
                        <th>$T('category')</th>
                        <th class="default-sort">$T('nzo-age')</th>
-                        <th>$T('source')</th>
                    </tr>
                </thead>
                <!--#for $job in $matched#-->
@@ -412,13 +411,6 @@
                        <td>$job['title']</td>
                        <td>$job['cat']</td>
                        <td data-sort-value="$job['age_ms']">$job['age']</td>
-                        <td data-sort-value="$job['baselink']" title="$job['baselink']">
-                            <!--#if not $job['infourl']#-->
-                            <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
-                            <!--#else#-->
-                            <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
-                            <!--#end if#-->
-                        </td>
                    </tr>
                <!--#end for#-->
            </table>
@@ -434,10 +426,9 @@
                        <th class="no-sort">$T('link-download')</th>
                        <th>$T('rss-filter')</th>
                        <th>$T('size')</th>
-                        <th width="60%">$T('sort-title')</th>
+                        <th width="65%">$T('sort-title')</th>
                        <th>$T('category')</th>
                        <th class="default-sort">$T('nzo-age')</th>
-                        <th>$T('source')</th>
                    </tr>
                </thead>
                <!--#for $job in $unmatched#-->
@@ -456,13 +447,6 @@
                        <td>$job['title']</td>
                        <td>$job['cat']</td>
                        <td data-sort-value="$job['age_ms']">$job['age']</td>
-                        <td data-sort-value="$job['baselink']" title="$job['baselink']">
-                            <!--#if not $job['infourl']#-->
-                            <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
-                            <!--#else#-->
-                            <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
-                            <!--#end if#-->
-                        </td>
                    </tr>
                <!--#end for#-->
            </table>
@@ -492,10 +476,8 @@
                            <td>$job['title']</td>
                            <td>$job['cat']</td>
                            <td data-sort-value="$job['baselink']" title="$job['baselink']">
-                                <!--#if not $job['infourl']#-->
+                                <!--#if $job['baselink']#-->
                                <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
-                                <!--#else#-->
-                                <a class="favicon source-icon" href="$job['infourl']" target="_blank" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></a>
                                <!--#end if#-->
                            </td>
                        </tr>
--- a/interfaces/Config/templates/config_server.tmpl
+++ b/interfaces/Config/templates/config_server.tmpl
@@ -2,311 +2,107 @@
 <!--#set global $help_uri="configuration/2.3/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

-<!--
-    We need to find how many months we have recorded so far, so we
-    loop over all the dates to find the lowest value and then use
-    this to calculate the date-selector and maximum value per month.
-->
-<!--#import json#-->
-<!--#import datetime#-->
-<!--#import sabnzbd.misc#-->
-
-<!--#set month_names = [$T('January'), $T('February'), $T('March'), $T('April'), $T('May'), $T('June'), $T('July'), $T('August'), $T('September'), $T('October'), $T('November'), $T('December')] #-->
-<!--#set min_date = datetime.date.today()#-->
-<!--#set max_data_all = {}#-->
-
-<!--#for $server in $servers #-->
-    <!--#if 'amounts' in $server#-->
-        <!--#set max_data_server = {}#-->
-        <!--#for date in $server['amounts'][4]#-->
-            <!--#set split_date = $date.split('-')#-->
-            <!--#set min_date = min(min_date, datetime.date(int(split_date[0]), int(split_date[1]), 1))#-->
-
-            <!--#set month_date = $date[:7]#-->
-            <!--#if $month_date not in $max_data_server#-->
-                <!--#set max_data_server[$month_date] = 0#-->
-             <!--#end if#-->
-             <!--#set max_data_server[$month_date] = max(max_data_server[$month_date], $server['amounts'][4][$date])#-->
-        <!--#end for#-->
-
-        <!--#for month_date in max_data_server#-->
-            <!--#if $month_date not in $max_data_all#-->
-                <!--#set max_data_all[$month_date] = 0#-->
-             <!--#end if#-->
-             <!--#set max_data_all[$month_date] = max(max_data_all[$month_date], max_data_server[$month_date])#-->
-        <!--#end for#-->
-    <!--#end if#-->
-<!--#end for#-->
-
-<!--#set months_recorded = list(sabnzbd.misc.monthrange(min_date, datetime.date.today()))#-->
-<!--#$months_recorded.reverse()#-->
-
-<script type="text/javascript">
-    // Define variable needed for the server-plots
-    var serverData = {}
-</script>
-
 <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>
-        <label for="advanced-settings-button" class="form-control advanced-button ">
-            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
-        </label>
-
-        <!--#if $months_recorded#-->
-        <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('srv-bandwidth')">
-            <span class="glyphicon glyphicon-signal"></span>
-            <select name="chart-selector" id="chart-selector">
-                <!--#for $cur_date in months_recorded#-->
-                    <!--#set month_date = '%d-%02d' % ($cur_date.year, $cur_date.month)#-->
-                    <!--#if $month_date not in $max_data_all#-->
-                        <!--#set max_data_all[$month_date] = 0#-->
-                     <!--#end if#-->
-                    <option value="$month_date" data-max="$max_data_all[$month_date]">$month_names[$cur_date.month-1] $cur_date.year</option>
-                <!--#end for#-->
-            </select>
+    <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
+    <input type="hidden" name="session" value="$session" />
+    <div id="addServer">
+        <div class="padding alt">
+            <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
        </div>
-        <!--#end if#-->
    </div>
    <div class="section" id="addServerContent" style="display: none;">
        <div class="col2">
            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-        </div>
+        </div><!-- /col2 -->
        <div class="col1">
-            <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
-                <input type="hidden" name="session" value="$session" />
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="enable">$T('srv-enable')</label>
-                        <input type="checkbox" name="enable" id="enable" value="1" checked="checked" />
-                        <span class="desc">$T('srv-enable')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="host">$T('srv-host')</label>
-                        <input type="text" name="host" id="host" required />
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="port">$T('srv-port')</label>
-                        <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" />
-                        <span class="desc">$T('explain-ssl')</span>
-                    </div>
-                    <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
-                    <div class="field-pair">
-                        <label class="config" for="${pid}_00">$T('srv-username')</label>
-                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="${pid}_01">$T('srv-password')</label>
-                        <input type="text" name="${pid}_01" id="${pid}_01" data-hide="password" />
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="100" value="8" required />
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="priority">$T('srv-priority')</label>
-                        <input type="number" name="priority" id="priority" min="0" max="99" /> <i>$T('explain-svrprio')</i>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="retention">$T('srv-retention')</label>
-                        <input type="number" name="retention" id="retention" min="0" /> <i>$T('days')</i>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="timeout">$T('srv-timeout')</label>
-                        <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
-                    </div>
-                    <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
-                        <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
-                        <select name="ssl_verify" id="ssl_verify" <!--#if int($have_ssl_context) == 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>
-                        </select>
-                        <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                        <input type="text" name="ssl_ciphers" id="ssl_ciphers" />
-                        <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
-                    </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="optional">$T('srv-optional')</label>
-                        <input type="checkbox" name="optional" id="optional" value="1" />
-                        <span class="desc">$T('explain-optional')</span>
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="displayname">$T('srv-displayname')</label>
-                        <input type="text" name="displayname" id="displayname" />
-                    </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="notes">$T('srv-notes')</label>
-                        <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
-                    </div>
-                    <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
-                        <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
-                    </div>
-                    <div class="field-pair result-box">
-                        <div class="alert"></div>
-                    </div>
-                </fieldset>
-            </form>
-        </div>
-    </div>
-
-    <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
-    <!--#set $cur_prio_color = -1 #-->
-    <!--#set $last_prio = -1 #-->
-    <!--#for $cur, $server in enumerate($servers) #-->
-        <form action="saveServer" method="post" class="fullform" autocomplete="off">
-            <input type="hidden" name="session" value="$session" />
-            <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" id="ajax" name="ajax" value=1 />
-
-            <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3>$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 #-->
-                            <!--#set $last_prio = $server['priority'] #-->
-                        <!--#end if#-->
-                        <span class="label label-primary" style="background-color: $prio_colors[$cur_prio_color]">$server['priority']</span>
-                        <span class="label label-primary" style="background-color: $prio_colors[$cur_prio_color]">$T('srv-priority'):</span>
-                    <!--#end if#-->
-                    <table>
-                        <tr>
-                            <td><input type="checkbox" class="toggleServerCheckbox" id="enable_$cur" name="$server['name']" value="1" <!--#if int($server['enable']) != 0 then 'checked="checked"' else ""#--> /></td>
-                            <td><label for="enable_$cur">$T('enabled')</label></td>
-                        </tr>
-                    </table>
-                    <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
-                    <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="enable">$T('srv-enable')</label>
+                    <input type="checkbox" name="enable" id="enable" value="1" checked="checked" />
+                    <span class="desc">$T('srv-enable')</span>
                </div>
-                <div class="col1" style="display:none;">
-                    <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
-                    <fieldset>
-                        <div class="field-pair">
-                            <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">
-                            <label class="config" for="port$cur">$T('srv-port')</label>
-                            <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
-                        </div>
-                        <div class="field-pair">
-                            <label class="config" for="ssl$cur">$T('srv-ssl')</label>
-                            <input type="checkbox" name="ssl" id="ssl$cur" value="1" <!--#if int($server['ssl']) != 0 then 'checked="checked"' else ""#--> />
-                            <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}_${cur}0">$T('srv-username')</label>
-                            <input type="text" name="${pid}_${cur}0" id="${pid}_${cur}0" value="$server['username']" data-hide="username" />
-                        </div>
-                        <div class="field-pair">
-                            <label class="config" for="${pid}_${cur}1">$T('srv-password')</label>
-                            <input type="text" name="${pid}_${cur}1" id="${pid}_${cur}1" value="$server['password']" data-hide="password" />
-                        </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="100" required />
-                        </div>
-                        <div class="field-pair">
-                            <label class="config" for="priority$cur">$T('srv-priority')</label>
-                            <input type="number" name="priority" id="priority$cur" value="$server['priority']" min="0" max="99" required /> <i>$T('explain-svrprio')</i>
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="retention$cur">$T('srv-retention')</label>
-                            <input type="number" name="retention" id="retention$cur" value="$server['retention']" min="0" required /> <i>$T('days')</i>
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="timeout$cur">$T('srv-timeout')</label>
-                            <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
-                        </div>
-
-                        <div class="field-pair <!--#if int($have_ssl_context) == 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" <!--#if int($have_ssl_context) == 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>
-                            </select>
-                            <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
-                            <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <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="optional$cur">$T('srv-optional')</label>
-                            <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="displayname$cur">$T('srv-displayname')</label>
-                            <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
-                        </div>
-                        <div class="field-pair advanced-settings">
-                            <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">
-                            <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>
-                        </div>
-                        <div class="field-pair result-box">
-                            <div class="alert"></div>
-                        </div>
-                    </fieldset>
+                <div class="field-pair">
+                    <label class="config" for="host">$T('srv-host')</label>
+                    <input type="text" name="host" id="host" required />
                </div>
-                <div class="col1" style="display:block;">
-                    <!--#if 'amounts' in $server#-->
-                        <div class="server-amounts-text">
-                            <b>$T('srv-bandwidth'):</b><br/>
-                            $T('total'): $(server['amounts'][0])B<br/>
-                            $T('today'): $(server['amounts'][3])B<br/>
-                            $T('thisWeek'): $(server['amounts'][2])B<br/>
-                            $T('thisMonth'): $(server['amounts'][1])B<br/>
-                            <span id="server-data-label-${cur}"></span>: <span id="server-data-value-${cur}"></span>
-                        </div>
-                        <div class="server-chart" data-serverid="${cur}"s>
-                            <div id="server-chart-${cur}" class="ct-chart"></div>
-                        </div>
-                        <script type="text/javascript">
-                            // Server data
-                            serverData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
-                        </script>
-                    <!--#end if#-->
+                <div class="field-pair">
+                    <label class="config" for="port">$T('srv-port')</label>
+                    <input type="number" name="port" id="port" size="8" value="119" min="0" />
                </div>
-            </div>
-        </form>
-    <!--#end for#-->
-</div>
+                <div class="field-pair">
+                    <label class="config" for="ssl">$T('srv-ssl')</label>
+                    <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}_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}_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="100" value="8" required />
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="priority">$T('srv-priority')</label>
+                    <input type="number" name="priority" id="priority" min="0" max="99" /> <i>$T('explain-svrprio')</i>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="retention">$T('srv-retention')</label>
+                    <input type="number" name="retention" id="retention" min="0" /> <i>$T('days')</i>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="timeout">$T('srv-timeout')</label>
+                    <input type="number" name="timeout" id="timeout" min="20" max="240" /> <i>$T('seconds')</i>
+                </div>
+                <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
+                    <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
+                    <select name="ssl_verify" id="ssl_verify" <!--#if int($have_ssl_context) == 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>
+                    </select>
+                    <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</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="optional">$T('srv-optional')</label>
+                    <input type="checkbox" name="optional" id="optional" value="1" />
+                    <span class="desc">$T('explain-optional')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="displayname">$T('srv-displayname')</label>
+                    <input type="text" name="displayname" id="displayname" />
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="notes">$T('srv-notes')</label>
+                    <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
+                </div>
+                <div class="field-pair">
+                    <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                    <button class="btn btn-default advancedButton"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</button>
+                    <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
+                </div>
+                <div class="field-pair result-box">
+                    <div class="alert"></div>
+                </div>
+            </fieldset>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
+</form>

 <script type="text/javascript" src="${root}staticcfg/js/chartist.min.js"></script>
-<script type="text/javascript" src="${root}staticcfg/js/filesize.min.js"></script>
 <script type="text/javascript">
-    // Standardize chart options
+    // Define variables needed for the server-plots
+    var serverData = {}
    var chartOptions = {
        fullWidth: true,
        showArea: true,
@@ -329,76 +125,246 @@
            right: 20
        }
    }
+</script>
+<!--
+    We need to find how many months we have recorded so far, so we
+     loop over all the dates to find the lowest value and then use
+     this to calculate the date-selector
+-->

-    function showCharts() {
+<!--#import json#-->
+<!--#import datetime#-->
+<!--#import sabnzbd.misc#-->
+
+<!--#def show_date_selector($server, $id)#-->
+    <!--#set month_names = [$T('January'), $T('February'), $T('March'), $T('April'), $T('May'), $T('June'), $T('July'), $T('August'), $T('September'), $T('October'), $T('November'), $T('December')] #-->
+    <!--#set min_date = datetime.date.today()#-->
+    <!--#for date in $server['amounts'][4]#-->
+        <!--#set split_date = $date.split('-')#-->
+        <!--#set min_date = min(min_date, datetime.date(int(split_date[0]), int(split_date[1]), 1))#-->
+    <!--#end for#-->
+    <!--#set months_recorded = list(sabnzbd.misc.monthrange(min_date, datetime.date.today()))#-->
+    <!--#$months_recorded.reverse()#-->
+    <select class="chart-selector" name="chart-selector-${id}" id="chart-selector-${id}" data-id="${id}">
+        <!--#for $cur_date in months_recorded#-->
+            <option value="<!--#echo '%d-%02d' % ($cur_date.year, $cur_date.month)#-->">$month_names[$cur_date.month-1] $cur_date.year</option>
+        <!--#end for#-->
+    </select>
+<!--#end def#-->
+
+<!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
+<!--#set $cur_prio_color = -1 #-->
+<!--#set $last_prio = -1 #-->
+<!--#for $cur, $server in enumerate($servers) #-->
+    <form action="saveServer" method="post" class="fullform" autocomplete="off">
+    <input type="hidden" name="session" value="$session" />
+    <input type="hidden" name="server" value="$server['name']" />
+
+    <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>$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 #-->
+                    <!--#set $last_prio = $server['priority'] #-->
+                <!--#end if#-->
+                <span class="label label-primary" style="background-color: $prio_colors[$cur_prio_color]">$server['priority']</span>
+                <span class="label label-primary" style="background-color: $prio_colors[$cur_prio_color]">$T('srv-priority'):</span>
+            <!--#end if#-->
+            <table><tr>
+              <td><input type="checkbox" class="toggleServerCheckbox" id="enable_$cur" name="$server['name']" value="1" <!--#if int($server['enable']) != 0 then 'checked="checked"' else ""#--> /></td>
+              <td><label for="enable_$cur">$T('enabled')</label></td>
+            </tr></table>
+
+            <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
+            <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
+        </div><!-- /col2 -->
+        <div class="col1"  style="display:none;">
+            <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
+            <fieldset>
+                <div class="field-pair">
+                    <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">
+                    <label class="config" for="port$cur">$T('srv-port')</label>
+                    <input type="number" name="port" id="port$cur" value="$server['port']" size="8" min="0" required />
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="ssl$cur">$T('srv-ssl')</label>
+                    <input type="checkbox" name="ssl" id="ssl$cur" value="1" <!--#if int($server['ssl']) != 0 then 'checked="checked"' else ""#--> />
+                    <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}_${cur}0">$T('srv-username')</label>
+                    <input type="text" name="${pid}_${cur}0" id="${pid}_${cur}0" value="$server['username']" data-hide="username" />
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="${pid}_${cur}1">$T('srv-password')</label>
+                    <input type="text" name="${pid}_${cur}1" id="${pid}_${cur}1" value="$server['password']" data-hide="password" />
+                </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="100" required />
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="priority$cur">$T('srv-priority')</label>
+                    <input type="number" name="priority" id="priority$cur" value="$server['priority']" min="0" max="99" required /> <i>$T('explain-svrprio')</i>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="retention$cur">$T('srv-retention')</label>
+                    <input type="number" name="retention" id="retention$cur" value="$server['retention']" min="0" required /> <i>$T('days')</i>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="timeout$cur">$T('srv-timeout')</label>
+                    <input type="number" name="timeout" id="timeout$cur" value="$server['timeout']" min="20" max="240" required /> <i>$T('seconds')</i>
+                </div>
+
+                <div class="field-pair <!--#if int($have_ssl_context) == 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" <!--#if int($have_ssl_context) == 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>
+                    </select>
+                    <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="optional$cur">$T('srv-optional')</label>
+                    <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="displayname$cur">$T('srv-displayname')</label>
+                    <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
+                </div>
+                <div class="field-pair advanced-settings">
+                    <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">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    <button class="btn btn-default advancedButton"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</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>
+                </div>
+                <div class="field-pair result-box">
+                    <div class="alert"></div>
+                </div>
+            </fieldset>
+        </div>
+        <div class="col1" style="display:block;">
+            <!--#if 'amounts' in $server#-->
+                <div class="server-amounts-text">
+                    <b>$T('srv-bandwidth'):</b><br/>
+                    $T('total'): $(server['amounts'][0])B<br/>
+                    $T('today'): $(server['amounts'][3])B<br/>
+                    $T('thisWeek'): $(server['amounts'][2])B<br/>
+                    $T('thisMonth'): $(server['amounts'][1])B
+                </div>
+                <div class="server-chart">
+                    $show_date_selector($server, $cur)
+                    <div id="server-chart-${cur}" class="ct-chart"></div>
+                </div>
+                <script type="text/javascript">
+                    // Server data
+                    serverData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
+                    \$(document).ready(function() {
+                        showChart(${cur}, \$('#chart-selector-${cur}').val())
+                    })
+                </script>
+            <!--#end if#-->
+        </div>
+    </div>
+    </form>
+<!--#end for#-->
+
+</div><!-- /colmask -->
+
+<script type="text/javascript">
+    function showChart(server_id, month) {
        // This month
-        var theMonth = \$('#chart-selector').val()
        var thisDay = new Date()

        // What month are we doing?
-        var inputDate = new Date(theMonth+'-01')
+        var inputDate = new Date(month+'-01')
        var baseDate = new Date(inputDate.getUTCFullYear(), inputDate.getUTCMonth(), 1)
        var maxDaysInMonth = new Date(baseDate.getFullYear(), baseDate.getMonth()+1, 0).getDate()

-        // Set the new maximum
-        chartOptions.axisY.high = \$('#chart-selector :selected').data('max');
-        chartOptions.axisY.low = 0
-
-        // For each chart
-        \$('.server-chart').each(function(i, elemn) {
-            var server_id = \$(elemn).data('serverid')
-
-            // Fill the data array
-            var data = {
-                labels: [],
-                series: [[]]
-            };
-            var totalThisMonth = 0
-            for(var i = 1; i < maxDaysInMonth+1; i++) {
-                // Add X-label
-                if(i % 3 == 1) {
-                    data['labels'].push(i)
-                } else {
-                    data['labels'].push(NaN)
-                }
-
-                // Get formatted date
-                baseDate.setDate(i)
-                var dateCheck = toFormattedDate(baseDate)
-
-                // Add data if we have it
-                if(dateCheck in serverData[server_id]) {
-                    data['series'][0].push(serverData[server_id][dateCheck])
-                    totalThisMonth += serverData[server_id][dateCheck]
-                } else if(thisDay.getYear() == baseDate.getYear() && thisDay.getMonth() == baseDate.getMonth() && thisDay.getDate() < i) {
-                    data['series'][0].push(NaN)
-                } else {
-                    data['series'][0].push(0)
-                }
+        // Fill the data array
+        var data = {
+            labels: [],
+            series: [[]]
+        };
+        var largestVal = 0
+        for(var i = 1; i < maxDaysInMonth+1; i++) {
+            // Add X-label
+            if(i % 3 == 1) {
+                data['labels'].push(i)
+            } else {
+                data['labels'].push(NaN)
            }

-            // Update the text value
-            \$('#server-data-label-' + server_id).text(\$('#chart-selector :selected').text())
-            \$('#server-data-value-' + server_id).text(filesize(totalThisMonth, {round: 1}))
+            // Get formatted date
+            baseDate.setDate(i)
+            var dateCheck = toFormattedDate(baseDate)

-            // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, 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', {
-                    x: context.chartRect.x1,
-                    y: context.chartRect.y2-1,
-                    width: context.chartRect.width(),
-                    height: context.chartRect.height()+2,
-                    fill: 'none',
-                    stroke: '#B9B9B9',
-                    'stroke-width': '1px'
-                }, '', context.svg, true)
-                \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
-                    elmn.innerHTML = filesize(elmn.innerHTML, {round: 1}).replace(' ','')
-                })
-            });
+            // Add data if we have it
+            if(dateCheck in serverData[server_id]) {
+                data['series'][0].push(serverData[server_id][dateCheck])
+                largestVal = Math.max(largestVal, serverData[server_id][dateCheck])
+            } else if(thisDay.getYear() == baseDate.getYear() && thisDay.getMonth() == baseDate.getMonth() && thisDay.getDate() < i) {
+                data['series'][0].push(NaN)
+            } else {
+                data['series'][0].push(0)
+            }
+        }
+
+        // Check if we should shrink the Y-axis values
+        var devideBy = 1024
+        var axisLabel = 'KB'
+        if(largestVal > 1024*1024) {
+            devideBy = 1024*1024
+            axisLabel = 'MB'
+        }
+        if(largestVal > 1024*1024*1024) {
+            devideBy = 1024*1024*1024
+            axisLabel = 'GB'
+        }
+        if(largestVal > 1024*1024*1024*1024) {
+            devideBy = 1024*1024*1024*1024
+            axisLabel = 'TB'
+        }
+
+        // Shrink the value
+        data['series'][0] = data['series'][0].map(function(num) {
+            return num / devideBy;
        })
+
+        // Show the chart
+        chart = new Chartist.Line('#server-chart-'+server_id, 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', {
+                x: context.chartRect.x1,
+                y: context.chartRect.y2-1,
+                width: context.chartRect.width(),
+                height: context.chartRect.height()+2,
+                fill: 'none',
+                stroke: '#B9B9B9',
+                'stroke-width': '1px'
+            }, '', context.svg, true)
+            \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                elmn.innerHTML += axisLabel
+            })
+        });
    }

    // Need to mitigate timezone effects!
@@ -415,8 +381,6 @@
        // Exception when change of priority, reload
        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
            \$('.fullform').submit(function() {
-                // No ajax this time
-                \$('input[name="ajax"]').val('')
                // Skip the fancy stuff, just submit
                this.submit()
            })
@@ -425,17 +389,14 @@
        /**
            Update charts when changed
        **/
-        \$('#chart-selector').on('change', function(elemn) {
-            showCharts()
-
+        \$('.chart-selector').on('change', function(elemn) {
+            showChart(\$(elemn.target).data('id'), \$(elemn.target).val())
            // Lets us leave (needs to be called after the change event)
            setTimeout(function() {
                formWasSubmitted = true;
                formHasChanged = false;
            }, 100)
        })
-        // And on page-load
-        showCharts()

        /**
            Click events
@@ -450,17 +411,12 @@
                \$(this).html(\$(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
            } else {
                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
-                // Recalculate the charts if changed while details were open
-                showCharts()
            }
-            // Add coloring
-            addRowColor()
        });

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

        \$('[name="ssl"]').click(function() {
@@ -482,7 +438,6 @@
            setTimeout(function() { portBox.removeClass('port-highlight') }, 2000)
        })

-        // Testing servers
        \$('.testServer').click(function(event){
            removeObfuscation()
            var theButton = \$(this)
--- a/interfaces/Config/templates/config_sorting.tmpl
+++ b/interfaces/Config/templates/config_sorting.tmpl
@@ -40,8 +40,6 @@
                            <br/>
                            <input type="button" class="btn btn-default" onclick="tvSet('%sn/%sx%0e - %en/%sn - %sx%0e - %en.%ext')" value="$T('button-Ep1x05')" />
                            <input type="button" class="btn btn-default" onclick="tvSet('%sn/S%0sE%0e - %en/%sn - S%0sE%0e - %en.%ext')" value="$T('button-EpS01E05')" />
-                            <br>
-                            <input type="button" class="btn btn-default" onclick="tvSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                        </div>
                    </div>
                    <div id="previewtv" class="example">
@@ -53,7 +51,7 @@
                            <label class="config">$T('sortResult')</label> <span class="desc path" id="previewtv-result">&nbsp;</span>
                        </div>
                    </div>
-                    <div class="field-pair no-field-pair-bg">
+                    <div class="field-pair">
                        <label class="config">$T('sort-legenda')</label>
                        <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key1').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                        <table id="Key1" class="Key">
@@ -141,9 +139,9 @@
                                    <td>$T("sort-File")</td>
                                </tr>
                                <tr>
-                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
+                                    <td class="align-right"><b>$T('orgDirname'):</b></td>
                                    <td>%dn</td>
-                                    <td></td>
+                                    <td>$T("sort-Folder")</td>
                                </tr>
                                <tr>
                                    <td class="align-right"><b>$T('lowercase'):</b></td>
@@ -201,7 +199,6 @@
                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');movieExtraFolder(false)" value="$T('button-inFolders')" />
                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('button-noFolders')" />
                            <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('decade')" />
-                            <input type="button" class="btn btn-default" onclick="movieSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                        </div>
                    </div>
                    <div id="previewmovie" class="example">
@@ -213,7 +210,7 @@
                            <label class="config">$T('sortResult')</label> <span class="desc path" id="previewmovie-result">&nbsp;</span>
                        </div>
                    </div>
-                    <div class="field-pair no-field-pair-bg">
+                    <div class="field-pair">
                        <label class="config">$T('sort-legenda')</label>
                        <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key2').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                        <table id="Key2" class="Key">
@@ -266,9 +263,9 @@
                                    <td>$T('sort-File')</td>
                                </tr>
                                <tr>
-                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
+                                    <td class="align-right"><b>$T('orgDirname'):</b></td>
                                    <td>%dn</td>
-                                    <td></td>
+                                    <td>$T("sort-Folder")</td>
                                </tr>
                                <tr>
                                    <td class="align-right"><b>$T('lowercase'):</b></td>
@@ -331,9 +328,7 @@
                        <div class="presets float-left">
                            <input type="button" class="btn btn-default" onclick="dateSet('%t/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-ShowNameF')" />
                            <input type="button" class="btn btn-default" onclick="dateSet('%y-%0m/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-YMF')" />
-                            <br>
                            <input type="button" class="btn btn-default" onclick="dateSet('%y-%0m-%0d/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-DailyF')" />
-                            <input type="button" class="btn btn-default" onclick="dateSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                        </div>
                    </div>
                    <div id="previewdate" class="example">
@@ -345,7 +340,7 @@
                            <label class="config">$T('sortResult')</label> <span class="desc path" id="previewdate-result">&nbsp;</span>
                        </div>
                    </div>
-                    <div class="field-pair no-field-pair-bg">
+                    <div class="field-pair">
                        <label class="config">$T('sort-legenda')</label>
                        <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key3').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                        <table id="Key3" class="Key">
@@ -412,11 +407,6 @@
                                    <td>%fn</td>
                                    <td>$T('sort-File')</td>
                                </tr>
-                                <tr>
-                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
-                                    <td>%dn</td>
-                                    <td></td>
-                                </tr>
                                <tr>
                                    <td class="align-right"><b>$T('lowercase'):</b></td>
                                    <td>{$T('TEXT')}</td>
@@ -497,7 +487,7 @@
                \$.ajax({
                  type: "GET",
                  url: "../../tapi",
-                  data: {mode:'eval_sort', value: 'movie', name: \$('#moviesamplename').val(), title: \$moviesortstring, movieextra:  \$('#movieextra').val(), apikey: '$session', output: 'json' },
+                  data: {mode:'eval_sort', value: 'generic', name: \$('#moviesamplename').val(), title: \$moviesortstring, movieextra:  \$('#movieextra').val(), apikey: '$session', output: 'json' },
                  success: function(data){
                    \$('#previewmovie-result').removeClass("loading failure").html(data.result);
                  },
--- a/interfaces/Config/templates/config_switches.tmpl
+++ b/interfaces/Config/templates/config_switches.tmpl
@@ -3,14 +3,9 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->

 <div class="colmask">
-    <div class="padding alt section">
-        <label for="advanced-settings-button" class="form-control advanced-button ">
-            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
-        </label>
-    </div>
    <form action="saveSwitches" method="post" name="fullform" class="fullform" autocomplete="off">
        <input type="hidden" id="session" name="session" value="$session" />
-        <div class="section advanced-settings">
+        <div class="section">
            <div class="col2">
                <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
@@ -25,6 +20,12 @@
                        </select>
                        <span class="desc">$T('explain-load_balancing')</span>
                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
+                        <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$ssl_ciphers" />
+                        <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
+                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                    </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" />
@@ -66,12 +67,12 @@
                        <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">
+                    <div class="field-pair">
                        <label class="config" for="top_only">$T('opt-top_only')</label>
                        <input type="checkbox" name="top_only" id="top_only" value="1" <!--#if int($top_only) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-top_only')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="pre_check">$T('opt-pre_check')</label>
                        <input type="checkbox" name="pre_check" id="pre_check" value="1" <!--#if int($pre_check) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-pre_check')</span>
@@ -103,7 +104,7 @@
                        </select>
                        <span class="desc">$T('explain-no_series_dupes')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <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>
@@ -117,11 +118,6 @@
                        </select>
                        <span class="desc">$T('explain-pause_on_pwrar')</span>
                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
-                        <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
-                        <span class="desc">$T('explain-unwanted_extensions')</span>
-                    </div>
                    <div class="field-pair">
                        <label class="config" for="action_on_unwanted_extensions">$T('opt-action_on_unwanted_extensions')</label>
                        <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
@@ -131,7 +127,12 @@
                        </select>
                        <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
+                        <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
+                        <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
+                        <span class="desc">$T('explain-unwanted_extensions')</span>
+                    </div>
+                    <div class="field-pair">
                        <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                        <input type="checkbox" name="auto_sort" id="auto_sort" value="1" <!--#if int($auto_sort) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-auto_sort')</span>
@@ -159,76 +160,64 @@
                        <input type="checkbox" name="pause_on_post_processing" id="pause_on_post_processing" value="1" <!--#if int($pause_on_post_processing) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-pause_on_post_processing')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="enable_all_par">$T('opt-enable_all_par')</label>
                        <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                    </div>
-                    <!--#if not $nt#-->
-                    <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
-                        <label class="config" for="nice">$T('opt-nice')</label>
-                        <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-nice')</span>
-                    </div>
-                    <div class="field-pair advanced-settings <!--#if not $have_ionice then "disabled" else "" #-->">
-                        <label class="config" for="ionice">$T('opt-ionice')</label>
-                        <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
-                        <span class="desc">$T('explain-ionice')</span>
-                    </div>
-                    <!--#else#-->
-                    <div class="field-pair advanced-settings">
-
-                        <label class="config" for="win_process_prio">$T('opt-win_process_prio')</label>
-                        <select name="win_process_prio" id="win_process_prio">
-                            <option value="4" <!--#if int($win_process_prio) == 4 then 'selected="selected"' else ""#-->>$T('win_process_prio-high')</option>
-                            <option value="3" <!--#if int($win_process_prio) == 3 then 'selected="selected"' else ""#-->>$T('win_process_prio-normal')</option>
-                            <option value="2" <!--#if int($win_process_prio) == 2 then 'selected="selected"' else ""#-->>$T('win_process_prio-low')</option>
-                            <option value="1" <!--#if int($win_process_prio) == 1 then 'selected="selected"' else ""#-->>$T('win_process_prio-idle')</option>
-                        </select>
-                        <span class="desc">$T('explain-win_process_prio')</span>
-                    </div>
-                    <!--#end if#-->
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="par_option">$T('opt-par_option')</label>
                        <input type="text" name="par_option" id="par_option" value="$par_option" />
                        <span class="desc">$T('explain-par_option')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
                        <input type="checkbox" name="sfv_check" id="sfv_check" value="1" <!--#if int($sfv_check) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-sfv_check')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="safe_postproc">$T('opt-safe_postproc')</label>
                        <input type="checkbox" name="safe_postproc" id="safe_postproc" value="1" <!--#if int($safe_postproc) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-safe_postproc')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="enable_recursive">$T('opt-enable_recursive')</label>
                        <input type="checkbox" name="enable_recursive" id="enable_recursive" value="1" <!--#if int($enable_recursive) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-enable_recursive')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="flat_unpack">$T('opt-flat_unpack')</label>
                        <input type="checkbox" name="flat_unpack" id="flat_unpack" value="1" <!--#if int($flat_unpack) > 0 then 'checked="checked"' else ""#--> />
                        <span class="desc">$T('explain-flat_unpack')</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <label class="config" for="script_can_fail">$T('opt-script_can_fail')</label>
                        <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">
+                    <div class="field-pair">
                        <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>
+                    <!--#if not $nt#-->
+                    <div class="field-pair <!--#if not $have_nice then "disabled" else "" #-->">
+                        <label class="config" for="nice">$T('opt-nice')</label>
+                        <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
+                        <span class="desc">$T('explain-nice')</span>
+                    </div>
+                    <div class="field-pair <!--#if not $have_ionice then "disabled" else "" #-->">
+                        <label class="config" for="ionice">$T('opt-ionice')</label>
+                        <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
+                        <span class="desc">$T('explain-ionice')</span>
+                    </div>
+                    <!--#end if#-->
                    <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 ""#--> />
                        <span class="desc">$T('explain-ignore_samples') $T('igsam-del').</span>
                    </div>
-                    <div class="field-pair advanced-settings">
+                    <div class="field-pair">
                        <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>
@@ -257,7 +246,7 @@
                </fieldset>
            </div><!-- /col1 -->
        </div><!-- /section -->
-        <div class="section advanced-settings">
+        <div class="section">
            <div class="col2">
                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
            </div><!-- /col2 -->
--- a/interfaces/Config/templates/staticcfg/css/style.css
+++ b/interfaces/Config/templates/staticcfg/css/style.css
@@ -4,13 +4,16 @@ body {
 }
 #logo {
    display: block;
-    margin: 3px auto auto;
+    margin: auto;
+    margin-top: 3px;
 }

 #content {
    color: #000;
-    padding: 65px 20px 20px;
+    padding: 15px 20px 20px;
    font-size: 13px;
+    padding-top: 65px;
+    padding-bottom: 20px;
 }
 .colmask {
    z-index: 20;
@@ -20,32 +23,16 @@ body {
    overflow: visible;
    border: 1px solid #dfdede;
    background-color: #FFF;
+    border: 1px solid rgba(0, 0, 0, 0.2);
    width: 100%
 }
-.advanced-button {
-    float: right;
-    width: auto;
-    margin: 0 4px 0px 0px;
-    font-size: 13px;
-    color: inherit;
-    height: auto;
-    padding-bottom: 5px;
-}
-#advanced-settings-button {
-    float: left;
-    margin: 2px 7px 0px 0px;
-}
-.advanced-buttonSeperator {
-    width: 1px;
-    height: 34px;
-    background-color: #dfdede;
-    float: right;
-    margin: 0px 10px;
-}
-.section, #addFeed, #addFeedContent {
+.section, .Servers form, #addFeed, #addFeedContent {
    border-bottom: 1px solid #dfdede;
    overflow: auto;
 }
+.section:last-child, .Servers form:last-child {
+    border: 0;
+}
 .col2 {
    z-index: 10;
    float: left;
@@ -163,13 +150,13 @@ input[type="checkbox"]+.desc {
    overflow: hidden;
    min-width: 555px;
 }
+.field-pair:nth-child(odd),
 .Key tr:nth-child(odd),
 .tab-pane tr:nth-child(odd),
 .even {
    background-color: #F8F8F8;
 }
-.field-pair:last-child,
-.no-field-pair-bg {
+.field-pair:last-child {
    background-color: transparent;
 }
 .alt,
@@ -311,7 +298,7 @@ tr.separator {
    visibility: hidden;
 }

-.Categories form.sorting-row:nth-child(2n-1) tr {
+.Categories form.sorting-row:nth-child(even) tr {
    background-color: #F8F8F8;
 }

@@ -526,7 +513,7 @@ tr.separator {
 }
 #filebrowser_modal .checkbox {
    float: left;
-    margin:  8px 5px 0px;
+    margin:  8px 5px 0x;
 }
 #filebrowser_modal .checkbox input {
    margin-top: 1px;
@@ -573,7 +560,6 @@ h2.activeRSS {
    float: left;
    margin: 0 6px 0 2px;
    text-align: center;
-    color: black !important;
 }
 .source-icon span {
    top: -3px;
@@ -598,7 +584,8 @@ h2.activeRSS {
    padding-top: .4em;
 }
 #subscriptions .chk {
-    padding: 8px 5px 5px;
+    padding: 5px;
+    padding-top: 8px;
    vertical-align: middle;
 }
 #subscriptions .title {
@@ -770,6 +757,7 @@ input[type=radio] {
 input[type="button"],
 input[type="submit"] {
    color: #333;
+    background-color: #fff;
    display:inline-block;
    padding:6px 12px;
    margin-bottom: 0;
@@ -780,7 +768,7 @@ input[type="submit"] {
    white-space:nowrap;
    vertical-align:middle;
    cursor:pointer;
-    background: #fff none;
+    background-image:none;
    border:1px solid #ccc;
    height: 34px;
 }
@@ -998,7 +986,7 @@ input[type="checkbox"] {
 }

 .Servers .col2.server-disabled .label {
-    color: #777 !important;
+    color: ##777 !important;
 }

 .Servers .col2 .label:nth-child(2) {
@@ -1035,14 +1023,19 @@ input[type="checkbox"] {
    color: black;
 }

-.Servers .chart-selector-container {
-    float: right;
+.Servers .chart-selector {
+    position: absolute;
+    display: block;
+    top: -7px;
+    left: 50%;
+    width: 150px;
+    margin-left: -50px;
+    min-width: initial;
+    opacity: 0.8;
 }

-.Servers .chart-selector-container .glyphicon {
-    font-size: 1.3em;
-    padding-right: 4px;
-    top: 5px;
+.Servers .chart-selector:hover {
+    opacity: 1;
 }

 .Servers .ct-grid.ct-vertical:first-of-type {
@@ -1059,7 +1052,9 @@ input[type="checkbox"] {

 .Servers .col2 label,
 .Email .col2 label {
-    margin: 2px 0 0 4px;
+    margin: 0;
+    margin-left: 4px;
+    margin-top: 2px;
    cursor: pointer;
 }

@@ -1088,10 +1083,9 @@ input[type="checkbox"] {
 }

 .host-warning {
-    color: #F0AD4E;
-    margin-left: 13px;
-    top: 5px;
-    font-size: 1.2em;
+    color: #404040;
+    margin-left: 7px;
+    top: 3px;
 }

 .fileBrowser .glyphicon {
@@ -1135,7 +1129,6 @@ input[type="checkbox"] {
 }
 .value-and-select select {
    min-width: 30px;
-    margin-top: 1px;
 }

 .dotOne, .dotTwo, .dotThree {
@@ -1232,9 +1225,7 @@ input[type="checkbox"] {
        margin-bottom: 0;
    }

-    .Servers .server-chart,
-    .Servers .chart-selector-container,
-    .Servers .advanced-buttonSeperator {
+    .Servers .server-chart {
        display: none;
    }

@@ -1336,7 +1327,9 @@ input[type="checkbox"] {
    }

    .desc {
-        margin: 2px 0 0 3px;
+        margin: 0;
+        margin-left: 3px;
+        margin-top: 2px;
        padding: 0 !important;
    }

--- a/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-120x120-precomposed.png
+++ b/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-120x120-precomposed.png
--- a/interfaces/Config/templates/staticcfg/js/filesize.min.js
+++ b/interfaces/Config/templates/staticcfg/js/filesize.min.js
@@ -1,6 +0,0 @@
-/*
- 2017 Jason Mulligan <jason.mulligan@avoidwork.com>
- @version 3.5.11
-*/
-"use strict";!function(i){function e(i){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=[],d=0,r=void 0,a=void 0,s=void 0,f=void 0,u=void 0,l=void 0,v=void 0,B=void 0,c=void 0,p=void 0,y=void 0,m=void 0,x=void 0,g=void 0;if(isNaN(i))throw new Error("Invalid arguments");return s=!0===e.bits,y=!0===e.unix,a=e.base||2,p=void 0!==e.round?e.round:y?1:2,m=void 0!==e.spacer?e.spacer:y?"":" ",g=e.symbols||e.suffixes||{},x=2===a?e.standard||"jedec":"jedec",c=e.output||"string",u=!0===e.fullform,l=e.fullforms instanceof Array?e.fullforms:[],r=void 0!==e.exponent?e.exponent:-1,B=Number(i),v=B<0,f=a>2?1e3:1024,v&&(B=-B),(-1===r||isNaN(r))&&(r=Math.floor(Math.log(B)/Math.log(f)))<0&&(r=0),r>8&&(r=8),0===B?(n[0]=0,n[1]=y?"":t[x][s?"bits":"bytes"][r]):(d=B/(2===a?Math.pow(2,10*r):Math.pow(1e3,r)),s&&(d*=8)>=f&&r<8&&(d/=f,r++),n[0]=Number(d.toFixed(r>0?p:0)),n[1]=10===a&&1===r?s?"kb":"kB":t[x][s?"bits":"bytes"][r],y&&(n[1]="jedec"===x?n[1].charAt(0):r>0?n[1].replace(/B$/,""):n[1],o.test(n[1])&&(n[0]=Math.floor(n[0]),n[1]=""))),v&&(n[0]=-n[0]),n[1]=g[n[1]]||n[1],"array"===c?n:"exponent"===c?r:"object"===c?{value:n[0],suffix:n[1],symbol:n[1]}:(u&&(n[1]=l[r]?l[r]:b[x][r]+(s?"bit":"byte")+(1===n[0]?"":"s")),n.join(m))}var o=/^(b|B)$/,t={iec:{bits:["b","Kib","Mib","Gib","Tib","Pib","Eib","Zib","Yib"],bytes:["B","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"]},jedec:{bits:["b","Kb","Mb","Gb","Tb","Pb","Eb","Zb","Yb"],bytes:["B","KB","MB","GB","TB","PB","EB","ZB","YB"]}},b={iec:["","kibi","mebi","gibi","tebi","pebi","exbi","zebi","yobi"],jedec:["","kilo","mega","giga","tera","peta","exa","zetta","yotta"]};e.partial=function(i){return function(o){return e(o,i)}},"undefined"!=typeof exports?module.exports=e:"function"==typeof define&&define.amd?define(function(){return e}):i.filesize=e}("undefined"!=typeof window?window:global);
-//# sourceMappingURL=filesize.min.js.map
--- a/interfaces/Config/templates/staticcfg/js/script.js
+++ b/interfaces/Config/templates/staticcfg/js/script.js
--- a/interfaces/Glitter/templates/include_history.tmpl
+++ b/interfaces/Glitter/templates/include_history.tmpl
@@ -170,10 +170,6 @@
                                    <div class="col-sm-2">$T('category')</div>
                                    <div class="col-sm-10" data-bind="text: historyStatus.category() == '*' ? glitterTranslate.defaultText : historyStatus.category"></div>
                                </div>
-                                <div class="row" data-bind="visible: historyStatus.password">
-                                    <div class="col-sm-2">$T('srv-password')</div>
-                                    <div class="col-sm-10" data-bind="text: historyStatus.password"></div>
-                                </div>
                                <div class="row">
                                    <div class="col-sm-2">$T('msg-path')</div>
                                    <div class="col-sm-10" data-bind="text: historyStatus.storage() == '' ? historyStatus.path : historyStatus.storage"></div>
--- a/interfaces/Glitter/templates/include_overlays.tmpl
+++ b/interfaces/Glitter/templates/include_overlays.tmpl
@@ -137,17 +137,10 @@
                            </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 test-download">
-                            <div class="col-sm-6">$T('dashboard-testDownload')</div>
-                            <div class="col-sm-6">
-                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
-                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1000 MB</a>
-                            </div>
-                        </div>
                        <hr />
                        <div class="row options-function-box">
                            <div class="col-sm-6">
-                                <a href="#" data-bind="click: forceDisconnect" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('explain-forceDisc')"><span class="glyphicon glyphicon-minus-sign"></span> $T('link-forceDisc')</a>
+                                <a href="#" data-bind="click: forceDisconnect" class="btn btn-default "><span class="glyphicon glyphicon-minus-sign"></span> $T('link-forceDisc')</a>
                            </div>
                            <div class="col-sm-6">
                                <a href="#" data-bind="click: repairQueue" data-tooltip="true" data-placement="top" title="$T('explain-Repair').replace('<br>',' ').replace('<br />',' ')" class="btn btn-default">
@@ -157,9 +150,7 @@
                        </div>
                        <div class="row options-function-box">
                            <div class="col-sm-6">
-                                <a href="./status/showlog?session=$session" target="_blank" class="btn btn-default" data-tooltip="true" data-placement="top" title="$T('Glitter-logText')">
-                                    <span class="glyphicon glyphicon-file"></span> $T('link-showLog')
-                                </a>
+                                <a href="./status/showlog?session=$session" target="_blank" class="btn btn-default"><span class="glyphicon glyphicon-file"></span> $T('link-showLog')</a>
                            </div>
                            <div class="col-sm-6">
                                <div class="input-group" data-tooltip="true" data-placement="top" title="$T('logging')">
@@ -640,7 +631,7 @@
                    </tbody>
                </table>
                <hr/>
-                <p><small>Copyright (C) 2007-2019, The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
+                <p><small>Copyright (C) 2008-2017, The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
            </div>
        </div>
    </div>
--- a/interfaces/Glitter/templates/static/javascripts/glitter.main.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.main.js
@@ -849,24 +849,6 @@ function ViewModel() {
        })
    }

-    // Download a test-NZB
-    self.testDownload = function(data, event) {
-        var nzbSize = $(event.target).data('size')
-        // Build request
-        var theCall = {
-            mode: "addurl",
-            name: "https://sabnzbd.org/tests/test_download_" + nzbSize + ".nzb",
-            priority: self.queue.priorityName["Force"]
-        }
-
-        // Add
-        callAPI(theCall).then(function(r) {
-            // Hide and reset/refresh
-            self.refresh()
-            $("#modal-options").modal("hide");
-        });
-    }
-
    // Unblock server
    self.unblockServer = function(servername) {
        callSpecialAPI("./status/unblock_server/", {
--- a/interfaces/Glitter/templates/static/javascripts/moment.min.js
+++ b/interfaces/Glitter/templates/static/javascripts/moment.min.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js
@@ -19,7 +19,7 @@ var da = moment.defineLocale('da', {
    longDateFormat : {
        LT : 'HH:mm',
        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
+        L : 'DD/MM/YYYY',
        LL : 'D. MMMM YYYY',
        LLL : 'D. MMMM YYYY HH:mm',
        LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js
@@ -28,7 +28,7 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) {

 var de = moment.defineLocale('de', {
    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+    monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
    monthsParseExact : true,
    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js
@@ -13,9 +13,6 @@
 var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
 var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');

-var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
-var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
-
 var es = moment.defineLocale('es', {
    months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
    monthsShort : function (m, format) {
@@ -27,13 +24,7 @@ var es = moment.defineLocale('es', {
            return monthsShortDot[m.month()];
        }
    },
-    monthsRegex : monthsRegex,
-    monthsShortRegex : monthsRegex,
-    monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
-    monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
+    monthsParseExact : true,
    weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
    weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
    weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fi.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fi.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fr.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/fr.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/he.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/he.js
@@ -1,99 +0,0 @@
-//! moment.js locale configuration
-//! locale : Hebrew [he]
-//! author : Tomer Cohen : https://github.com/tomer
-//! author : Moshe Simantov : https://github.com/DevelopmentIL
-//! author : Tal Ater : https://github.com/TalAter
-
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
-   factory(global.moment)
-}(this, (function (moment) { 'use strict';
-
-
-var he = moment.defineLocale('he', {
-    months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
-    monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
-    weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
-    weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
-    weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [ב]MMMM YYYY',
-        LLL : 'D [ב]MMMM YYYY HH:mm',
-        LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
-        l : 'D/M/YYYY',
-        ll : 'D MMM YYYY',
-        lll : 'D MMM YYYY HH:mm',
-        llll : 'ddd, D MMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[היום ב־]LT',
-        nextDay : '[מחר ב־]LT',
-        nextWeek : 'dddd [בשעה] LT',
-        lastDay : '[אתמול ב־]LT',
-        lastWeek : '[ביום] dddd [האחרון בשעה] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'בעוד %s',
-        past : 'לפני %s',
-        s : 'מספר שניות',
-        m : 'דקה',
-        mm : '%d דקות',
-        h : 'שעה',
-        hh : function (number) {
-            if (number === 2) {
-                return 'שעתיים';
-            }
-            return number + ' שעות';
-        },
-        d : 'יום',
-        dd : function (number) {
-            if (number === 2) {
-                return 'יומיים';
-            }
-            return number + ' ימים';
-        },
-        M : 'חודש',
-        MM : function (number) {
-            if (number === 2) {
-                return 'חודשיים';
-            }
-            return number + ' חודשים';
-        },
-        y : 'שנה',
-        yy : function (number) {
-            if (number === 2) {
-                return 'שנתיים';
-            } else if (number % 10 === 0 && number !== 10) {
-                return number + ' שנה';
-            }
-            return number + ' שנים';
-        }
-    },
-    meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
-    isPM : function (input) {
-        return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 5) {
-            return 'לפנות בוקר';
-        } else if (hour < 10) {
-            return 'בבוקר';
-        } else if (hour < 12) {
-            return isLower ? 'לפנה"צ' : 'לפני הצהריים';
-        } else if (hour < 18) {
-            return isLower ? 'אחה"צ' : 'אחרי הצהריים';
-        } else {
-            return 'בערב';
-        }
-    }
-});
-
-return he;
-
-})));
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nb.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nb.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nl.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/nl.js
@@ -40,7 +40,7 @@ var nl = moment.defineLocale('nl', {

    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-    weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
+    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
    weekdaysParseExact : true,
    longDateFormat : {
        LT : 'HH:mm',
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/pl.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/pl.js
@@ -63,24 +63,7 @@ var pl = moment.defineLocale('pl', {
    calendar : {
        sameDay: '[Dziś o] LT',
        nextDay: '[Jutro o] LT',
-        nextWeek: function () {
-            switch (this.day()) {
-                case 0:
-                    return '[W niedzielę o] LT';
-
-                case 2:
-                    return '[We wtorek o] LT';
-
-                case 3:
-                    return '[W środę o] LT';
-
-                case 6:
-                    return '[W sobotę o] LT';
-
-                default:
-                    return '[W] dddd [o] LT';
-            }
-        },
+        nextWeek: '[W] dddd [o] LT',
        lastDay: '[Wczoraj o] LT',
        lastWeek: function () {
            switch (this.day()) {
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/pt-br.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/pt-br.js
@@ -11,8 +11,8 @@


 var ptBr = moment.defineLocale('pt-br', {
-    months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
-    monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
+    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
    weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
    weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
@@ -41,7 +41,6 @@ var ptBr = moment.defineLocale('pt-br', {
        future : 'em %s',
        past : '%s atrás',
        s : 'poucos segundos',
-        ss : '%d segundos',
        m : 'um minuto',
        mm : '%d minutos',
        h : 'uma hora',
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/ro.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/ro.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/ru.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/ru.js
@@ -174,7 +174,7 @@ var ru = moment.defineLocale('ru', {
    },
    week : {
        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
    }
 });

--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/sr.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/sr.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/sv.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/sv.js
--- a/interfaces/Glitter/templates/static/javascripts/momentjs_locale/zh-cn.js
+++ b/interfaces/Glitter/templates/static/javascripts/momentjs_locale/zh-cn.js
--- a/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css
+++ b/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css
@@ -76,7 +76,7 @@ legend,
    background-color: #666;
 }

-.navbar-collapse.in .dropdown-menu {
+.navbar-collapse.in .dropdown-menu, {
    border: none;
 }

--- a/interfaces/Glitter/templates/static/stylesheets/glitter.css
+++ b/interfaces/Glitter/templates/static/stylesheets/glitter.css
@@ -105,7 +105,10 @@ h2 {
 .navbar-logo {
    vertical-align: middle;
    display: inline-block;
-    margin: 4px 12px -1px 15px;
+    margin-right: 12px;
+    margin-left: 15px;
+    margin-top: 4px;
+    margin-bottom: -1px;
 }

 .navbar-logo svg {
@@ -285,7 +288,8 @@ li.dropdown {
    opacity: 0.9;
    color: black;
    z-index: 2000;
-    padding: 15% 1em 1em;
+    padding: 1em;
+    padding-top: 15%;
 }

 .main-filedrop.in span {
@@ -717,7 +721,8 @@ td.delete .dropdown>a {

 td.delete input[type="checkbox"],
 .add-nzb-inputbox-options input[type="checkbox"]{
-    margin: 0 0 -2px;
+    margin: 0;
+    margin-bottom: -2px;
    display: block;
 }

@@ -767,8 +772,8 @@ tr.queue-item>td:first-child>a {
    line-height: 24px;
    overflow: visible;
    margin-bottom: 0;
-    box-shadow: inset 0 0px 2px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: inset 0 0px 2px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.3);
 }

 .progress>span,
@@ -1150,7 +1155,8 @@ tr.queue-item>td:first-child>a {
 #history-options {
    margin-top: 0;
    margin-left: 10px;
-    padding: 0 0 0 4px;
+    padding: 0;
+    padding-left: 4px;
 }

 #history-options .hover-button {
@@ -1419,14 +1425,6 @@ tr.queue-item>td:first-child>a {
    margin: 5px 0px 10px;
 }

-#modal-options .test-download .btn {
-    padding: 1px 5px;
-}
-
-#modal-options #options-status .test-download .btn .glyphicon {
-    margin-right: 2px;
-}
-
 #modal-options .options-function-box {
    margin-top: 5px;
 }
@@ -1538,7 +1536,8 @@ tr.queue-item>td:first-child>a {

 .add-nzb-inputbox span {
    display: inline-block;
-    margin: 8px 2px 0px -20px;
+    margin: 8px 2px 0px 5px;
+    margin-left: -20px;
 }

 .btn-file {
@@ -1631,9 +1630,11 @@ input[name="nzbURL"] {

 #modal-item-files .multioperations-selector {
    clear: left;
+    margin: 0;
    float: left;
    padding: 5px 8px;
-    margin: 0 10px 5px 0;
+    margin-bottom: 5px;
+    margin-right: 10px;
    border: 1px solid #cccccc;
 }

@@ -2044,8 +2045,9 @@ a:focus {
    right: 17px;
    display: inline-block;
    border-right: 6px solid transparent;
-    border-bottom: 6px solid rgba(0, 0, 0, 0.2);
+    border-bottom: 6px solid #ccc;
    border-left: 6px solid transparent;
+    border-bottom-color: rgba(0, 0, 0, 0.2);
    content: '';
 }

--- a/interfaces/Plush/templates/_inc_modals.tmpl
+++ b/interfaces/Plush/templates/_inc_modals.tmpl
@@ -28,7 +28,7 @@
    </table>
    <div class="sabnzbd_logo main_sprite_container sprite_sabnzbdplus_logo"></div>
    <p><strong>SABnzbd $T('version'):</strong> $version</p>
-    <p><small>Copyright (C) 2008-2019, The SABnzbd Team &lt;team@sabnzbd.org&gt;</small></p>
+    <p><small>Copyright (C) 2008-2016, The SABnzbd Team &lt;team@sabnzbd.org&gt;</small></p>
    <p><small>$T('yourRights')</small></p>
  </div>

--- a/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/loading-bar.gif
+++ b/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/loading-bar.gif
--- a/interfaces/smpl/templates/main.tmpl
+++ b/interfaces/smpl/templates/main.tmpl
@@ -79,6 +79,7 @@
    input = input.replace(/%0e/g,'05');
    input = input.replace(/%e/g,'5');
    input = input.replace(/%fn/g,'$T("sort-File")');
+    input = input.replace(/%dn/g,'$T("sort-Folder")');

  document.getElementById('previewtv').innerHTML = getOutput(input);
 }
@@ -1253,10 +1254,8 @@ function loadingJSON(){
    <option value="180" >3 $T("minutes")</option>
    <option value="300" >5 $T("minutes")</option>
    <option value="0" >$T("none")</option>
-  </select></p>
-
-  <p><strong>This skin is no longer supported and may lose functionality in future releases.</strong></p>
-
+  </select>
+  <br />SABnzbd $T('version'): $version | smpl skin</a></p>
    <!--#if $new_release#-->
    <!--#set $msg=$T('ft-newRelease@1')%($new_release)#-->
    <b>$msg <a href="$new_rel_url" target="_blank">SF.net</a></b><br/>
--- a/interfaces/smpl/templates/static/MochiKit/MochiKit.js
+++ b/interfaces/smpl/templates/static/MochiKit/MochiKit.js
--- a/interfaces/smpl/templates/static/MochiKit/package.js
+++ b/interfaces/smpl/templates/static/MochiKit/package.js
@@ -1,2 +1,2 @@
-dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
-dojo.hostenv.moduleLoaded("MochiKit.*");
+dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
+dojo.hostenv.moduleLoaded("MochiKit.*");
--- a/interfaces/wizard/index.html
+++ b/interfaces/wizard/index.html
@@ -11,15 +11,11 @@
                    $T('explain-language')<br /><br />
                    <div class="main-container">
                        <!--#for $l, $language in $languages#-->
-                        <label class="language">
+                        <label class="language <!--#if $lang == $l then 'language-active' else ''#-->">
                            $language<br />
-                            <input type="radio" name="lang" id="$l" value="$l" <!--#if $active_lang == $l then 'checked="checked"' else ''#--> />
+                            <input type="radio" name="lang" id="$l" value="$l" <!--#if $lang == $l then 'checked="checked"' else ''#--> />
                        </label>
                        <!--#end for#-->
-                        <!--#if not $languages#-->
-                        <hr>
-                        No language files detected. Please run <code>python tools/make_mo.py</code> once and restart SABnzbd, or contact your package provider.
-                        <!--#end if#-->
                        <div class="spacer"></div>
                    </div>
                </div>
--- a/interfaces/wizard/one.html
+++ b/interfaces/wizard/one.html
@@ -20,7 +20,7 @@
                        <div class="form-group">
                            <label for="host" class="col-sm-4 control-label">$T('srv-host')</label>
                            <div class="col-sm-8">
-                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.newshosting.com" />
+                                <input type="text" class="form-control" name="host" id="host" value="$host" placeholder="$T('wizard-example') news.giganews.com" />
                            </div>
                        </div>
                        <div class="form-group">
@@ -87,7 +87,7 @@
                    </div>
                    <div class="col-md-5">
                        <div class="clearfix"></div>
-                        <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$active_lang"></iframe>
+                        <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$language"></iframe>
                    </div>
                </div>
                <input type="hidden" name="session" value="$session" />
--- a/interfaces/wizard/static/style.css
+++ b/interfaces/wizard/static/style.css
@@ -88,12 +88,19 @@ label {
    float: right;
    margin: 0;
 }
+.sup {
+    vertical-align: sup !important;
+}
+
 .align-right {
    text-align: right;
 }
 .align-center {
    text-align: center;
 }
+.float-center {
+    float: center;
+}
 .unselected,
 .selected {
    display: inline-block;
@@ -116,6 +123,9 @@ label {
 .bigger {
    font-size: 14px;
 }
+.padded {
+    padding: 12px;
+}
 .bigger input {
    font-size: 16px;
 }
@@ -125,6 +135,9 @@ label {
 .full-width {
    width: 100%;
 }
+.bigbutton {
+    font-size: 18px !important;
+}
 .correct {
    border: 2px solid #00cc22;
 }
@@ -140,6 +153,7 @@ label {
 .text-input-wide {
    width: 230px;
 }
+.text-input-thin,
 #server-hidden-settings input[type="number"] {
    width: 100px;
 }
--- a/interfaces/wizard/two.html
+++ b/interfaces/wizard/two.html
@@ -22,13 +22,13 @@
            <p><strong>$T('opt-complete_dir')</strong></p>
            <div class="quoteBlock">
                $complete_dir
-                <a href="${access_url}/config/folders#complete_dir" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
+                <a href="${access_url}config/folders" class="indented"><span class="glyphicon glyphicon-cog"></span></a>
            </div>

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

            <hr/>
--- a/licenses/License-Python.txt
+++ b/licenses/License-Python.txt
@@ -53,7 +53,7 @@ the various releases.
    2.4.2           2.4.1       2005        PSF         yes
    2.4.3           2.4.2       2006        PSF         yes
    2.5             2.4         2006        PSF         yes
-    2.7             2.6         2010        PSF         yes
+    2.5.1           2.5         2007        PSF         yes

 Footnotes:

@@ -89,9 +89,9 @@ license to reproduce, analyze, test, perform and/or display publicly,
 prepare derivative works, distribute, and otherwise use Python
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
+2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation; 
+All Rights Reserved" are retained in Python alone or in any derivative 
+version prepared by Licensee.

 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
--- a/licenses/License-pynewsleecher.txt
+++ b/licenses/License-pynewsleecher.txt
@@ -1,11 +1,11 @@
-The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
-
-Few parts of Pynewsleecher have survived the generations of SABnzbd in a
-recognizable form.
-Still, we wish to thank Freddy for his inspiration.
-
-The home of the Pynewsleecher project:
-http://www.madcowdisease.org/mcd/pynewsleecher
-
-The software does not carry any license information.
-
+The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
+
+Few parts of Pynewsleecher have survived the generations of SABnzbd in a
+recognizable form.
+Still, we wish to thank Freddy for his inspiration.
+
+The home of the Pynewsleecher project:
+http://www.madcowdisease.org/mcd/pynewsleecher
+
+The software does not carry any license information.
+
--- a/licenses/License-systrayicon.txt
+++ b/licenses/License-systrayicon.txt
@@ -1,8 +1,8 @@
-On http://www.brunningonline.net/simon/blog/archives/001835.html,
-the author licensed SysTrayIcon.py under a variant of the WTFPL:
-
-> Any road up, help yourself. Consider SysTrayIcon.py to be under an
-> "Aleister Crowley" style license - "Do what thou wilt shall be the
-> only law".
-> 
-> Err, but don't sue me if it doesn't work. ;-)
+On http://www.brunningonline.net/simon/blog/archives/001835.html,
+the author licensed SysTrayIcon.py under a variant of the WTFPL:
+
+> Any road up, help yourself. Consider SysTrayIcon.py to be under an
+> "Aleister Crowley" style license - "Do what thou wilt shall be the
+> only law".
+> 
+> Err, but don't sue me if it doesn't work. ;-)
--- a/osx/unrar/unrar
+++ b/osx/unrar/unrar
--- a/po/email/SABemail.pot
+++ b/po/email/SABemail.pot
@@ -1,6 +1,6 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2019 The SABnzbd-Team
+# Copyright 2011-2017 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
--- a/po/email/da.po
+++ b/po/email/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
-"PO-Revision-Date: 2018-11-27 23:39+0000\n"
-"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
+"PO-Revision-Date: 2013-05-05 14:50+0000\n"
+"Last-Translator: shypike <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
@@ -65,13 +65,13 @@ msgid ""
 "<!--#end if#-->\n"
 msgstr ""
 "##\n"
-"## Standard E-mail-skabelon til SABnzbd\n"
-"## Dette er en Cheetah-skabelon\n"
+"## Standard Email skabelon til SABnzbd\n"
+"## Dette er en Cheetah skabelon\n"
 "## Dokumentation: http://sabnzbd.wikidot.com/email-templates\n"
 "##\n"
-"## Linjeskift og blanktegn har betydning!\n"
+"## Linjeskift og blanktegn er betydelig!\n"
 "##\n"
-"## Dette er e-mail-headerne \n"
+"## Disse er e-mail-headerne \n"
 "To: $to\n"
 "From: $from\n"
 "Date: $date\n"
@@ -79,7 +79,7 @@ msgstr ""
 "job $name\n"
 "X-priority: 5\n"
 "X-MS-priority: 5\n"
-"## Herefter kommer kroppen, den tomme linje skal være der!\n"
+"## Efter dette kommer body, den tomme linje kræves!\n"
 "\n"
 "Hej,\n"
 "<!--#if $status #-->\n"
@@ -100,13 +100,13 @@ msgstr ""
 "<!--#end for#-->\n"
 "<!--#end for#-->\n"
 "<!--#if $script!=\"\" #-->\n"
-"Output fra brugerscriptet \"$script\" (Afslutningskode = $script_ret):\n"
+"Output fra bruger script \"$script\" (Exit code = $script_ret):\n"
 "$script_output\n"
 "<!--#end if#-->\n"
 "<!--#if $status #-->\n"
-"Hav det godt!\n"
+"Enjoy!\n"
 "<!--#else#-->\n"
-"Beklager!\n"
+"Sorry!\n"
 "<!--#end if#-->\n"

 #: email/rss.tmpl:1
@@ -138,25 +138,25 @@ msgid ""
 "Bye\n"
 msgstr ""
 "##\n"
-"## RSS E-mail-skabelon til SABnzbd\n"
-"## Dette er en Cheetah-skabelon\n"
+"## RSS Email skabelon til SABnzbd\n"
+"## Dette er Cheetah skabelon\n"
 "## Dokumentation: http://sabnzbd.wikidot.com/email-templates\n"
 "##\n"
-"## Linjeskift og blanktegn har betydning!\n"
+"## Linjeskift og blanktegn er betydelig!\n"
 "##\n"
-"## Dette er e-mai-headere\n"
+"## Dette er email headers\n"
 "To: $to\n"
 "From: $from\n"
 "Date: $date\n"
 "Subject: SABnzbd har tilføjet $antal jobs til køen\n"
 "X-priority: 5\n"
 "X-MS-priority: 5\n"
-"## Herefter kommer kroppen, den tomme linje skal være der!\n"
+"## Efter dette kommer body, den tomme linje kræves!\n"
 "\n"
 "Hej,\n"
 "\n"
 "SABnzbd har tilføjet $antal job(s) til køen.\n"
-"De er fra RSS-feedet \"$feed\".\n"
+"De er fra RSS feed \"$feed\".\n"
 "<!--#for $job in $jobs#-->\n"
 "    $job <!--#slurp#-->\n"
 "<!--#end for#-->\n"
@@ -189,24 +189,24 @@ msgid ""
 "Bye\n"
 msgstr ""
 "##\n"
-"## Dårlig URL-hentning af E-mail-skabelon til SABnzbd\n"
-"## Dette er en Cheetah-skabelon\n"
+"## Dårlig URL Fetch E-mail skabelon for SABnzbd\n"
+"## Dette er en Cheetah skabelon\n"
 "## Dokumentation: http://sabnzbd.wikidot.com/email-templates\n"
 "##\n"
-"## Linjeskift og blanktegn har betydning!\n"
+"## Linjeskift og blanktegn er betydelig!\n"
 "##\n"
-"## Dette er e-mail-headere\n"
+"## Dette er email headers\n"
 "To: $to\n"
 "From: $from\n"
 "Date: $date\n"
 "Subject: SABnzbd kunne ikke hente en NZB\n"
 "X-priority: 5\n"
 "X-MS-priority: 5\n"
-"## Herefter kommer kroppen, den tomme linje skal være der!\n"
+"## Efter dette kommer body, den tomme linje kræves!\n"
 "\n"
 "Hej,\n"
 "\n"
 "SABnzbd kunne ikke hente NZB fra $url.\n"
-"Fejlmeddelelsen er: $msg\n"
+"Fejl meddelelsen er: $msg\n"
 "\n"
 "Farvel\n"
--- a/po/email/de.po
+++ b/po/email/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Thomas Lucke (Lucky) <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/es.po
+++ b/po/email/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: shypike <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/fi.po
+++ b/po/email/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Matti Ylönen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/fr.po
+++ b/po/email/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Fox Ace <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/he.po
+++ b/po/email/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-08-01 16:45+0000\n"
 "Last-Translator: ION IL <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-08-02 06:03+0000\n"
+"X-Generator: Launchpad (build 18441)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/nb.po
+++ b/po/email/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/nl.po
+++ b/po/email/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: shypike <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/pl.po
+++ b/po/email/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Tomasz 'Zen' Napierala <tomasz@napierala.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/pt_BR.po
+++ b/po/email/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: lrrosa <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/ro.po
+++ b/po/email/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: nicusor <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/ru.po
+++ b/po/email/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/sr.po
+++ b/po/email/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-06-24 19:51+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Launchpad Serbian Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-27 06:00+0000\n"
+"X-Generator: Launchpad (build 18416)\n"
 "Language: sr\n"

 #: email/email.tmpl:1
--- a/po/email/sv.po
+++ b/po/email/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-06-24 19:50+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-27 06:00+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/email/zh_CN.po
+++ b/po/email/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2015-10-24 11:05+0000\n"
 "Last-Translator: shypike <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:47+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:55+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: email/email.tmpl:1
 msgid ""
--- a/po/main/SABnzbd.pot
+++ b/po/main/SABnzbd.pot
--- a/po/main/da.po
+++ b/po/main/da.po
--- a/po/main/de.po
+++ b/po/main/de.po
--- a/po/main/en.po
+++ b/po/main/en.po
@@ -69,6 +69,9 @@ msgstr "Replace spaces in folder name"
 msgid "Replace dots in Foldername"
 msgstr "Replace dots in folder name"

+msgid "Original Foldername"
+msgstr "Original folder name"
+
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr "How long or until when do you want to pause? (in English!)"

@@ -116,9 +119,3 @@ msgstr "Downloads will not be unpacked."

 msgid "Seperate multiple URLs by a comma"
 msgstr "Separate multiple URLs with a comma"
-
-msgid "Advanced"
-msgstr "Advanced Settings"
-
-msgid "0 is highest priority, 100 is the lowest priority"
-msgstr "0 is highest priority, 99 is the lowest priority"
--- a/po/main/es.po
+++ b/po/main/es.po
--- a/po/main/fi.po
+++ b/po/main/fi.po
--- a/po/main/fr.po
+++ b/po/main/fr.po
--- a/po/main/he.po
+++ b/po/main/he.po
--- a/po/main/nb.po
+++ b/po/main/nb.po
--- a/po/main/nl.po
+++ b/po/main/nl.po
--- a/po/main/pl.po
+++ b/po/main/pl.po
--- a/po/main/pt_BR.po
+++ b/po/main/pt_BR.po
--- a/po/main/ro.po
+++ b/po/main/ro.po
--- a/po/main/ru.po
+++ b/po/main/ru.po
--- a/po/main/sr.po
+++ b/po/main/sr.po
--- a/po/main/sv.po
+++ b/po/main/sv.po
--- a/po/main/zh_CN.po
+++ b/po/main/zh_CN.po
--- a/po/nsis/SABnsis.pot
+++ b/po/nsis/SABnsis.pot
@@ -1,6 +1,6 @@
 #
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2019 The SABnzbd-Team
+# Copyright 2011-2017 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
--- a/po/nsis/da.po
+++ b/po/nsis/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
-"PO-Revision-Date: 2018-11-27 23:30+0000\n"
-"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
+"PO-Revision-Date: 2017-04-10 11:28+0000\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
@@ -23,7 +23,7 @@ msgstr "Vis udgivelsesbemærkninger"

 #: NSIS_Installer.nsi
 msgid "Start SABnzbd"
-msgstr "Start SABnzbd"
+msgstr ""

 #: NSIS_Installer.nsi
 msgid "Support the project, Donate!"
@@ -38,7 +38,7 @@ msgid ""
 "The installation directory has changed (now in \"Program Files\"). \\nIf you "
 "run SABnzbd as a service, you need to update the service settings."
 msgstr ""
-"Installationsmappen er ændret (nu i  \"Program Files\"). \\nHvis du kører "
+"Installationsmappen er ændret (nu i  \"Program Files \"). \\nHvis du kører "
 "SABnzbd som en tjeneste, skal du opdatere tjenesteindstillingerne."

 #: NSIS_Installer.nsi
@@ -55,7 +55,7 @@ msgstr "Skrivebordsikon"

 #: NSIS_Installer.nsi
 msgid "NZB File association"
-msgstr "NZB-filtilknytning"
+msgstr "NZB filtilknytning"

 #: NSIS_Installer.nsi
 msgid "Delete Program"
@@ -70,20 +70,20 @@ msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
 msgstr ""
-"Systemet kræver at Microsoft runtime-biblioteket VC90 skal installeres "
-"først. Vil du gøre det nu?"
+"Dette system kræver, at Microsoft runtime biblioteket VC90 skal installeres "
+"først. Ønsker du at gøre det nu?"

 #: NSIS_Installer.nsi
 msgid "Downloading Microsoft runtime installer..."
-msgstr "Downloader Microsoft runtime-installationsfil..."
+msgstr "Downloader Microsoft runtime installationsfil..."

 #: NSIS_Installer.nsi
 msgid "Download error, retry?"
-msgstr "Fejl ved download, prøv igen?"
+msgstr "Download fejl, prøv igen?"

 #: NSIS_Installer.nsi
 msgid "Cannot install without runtime library, retry?"
-msgstr "Kan ikke installere uden runtime-bibliotek, prøv igen?"
+msgstr "Kan ikke installere uden runtime bibliotek, prøv igen?"

 #: NSIS_Installer.nsi
 msgid ""
@@ -91,7 +91,8 @@ msgid ""
 "the previous version or `Cancel` to cancel this upgrade."
 msgstr ""
 "Du kan ikke overskrive en eksisterende installation. \\n\\nKlik `OK` for at "
-"fjerne den tidligere version eller `Annuller` for at annullere opgraderingen."
+"fjerne den tidligere version eller `Annuller` for at annullere denne "
+"opgradering."

 #: NSIS_Installer.nsi
 msgid "Your settings and data will be preserved."
--- a/po/nsis/de.po
+++ b/po/nsis/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-05-22 08:00+0000\n"
 "Last-Translator: larshuth <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
--- a/po/nsis/es.po
+++ b/po/nsis/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Victor Herrero <victorhera@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
--- a/po/nsis/fi.po
+++ b/po/nsis/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-04-02 07:38+0000\n"
 "Last-Translator: Paavo Rissanen <paavo.rissanen@outlook.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
--- a/po/nsis/fr.po
+++ b/po/nsis/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-03-21 08:58+0000\n"
 "Last-Translator: Fred <88com88@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
--- a/po/nsis/he.po
+++ b/po/nsis/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2017-05-06 09:07+0000\n"
 "Last-Translator: ION IL <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
@@ -96,14 +96,3 @@ msgstr ""
 #: NSIS_Installer.nsi
 msgid "Your settings and data will be preserved."
 msgstr "ההגדרות והנתונים שלך יישמרו."
-
-#~ msgid ""
-#~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
-#~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"
-#~ msgstr ""
-#~ "                  >>>> אזהרה <<<<\\r\\n\\r\\n! "
-#~ "http://wiki.sabnzbd.org/introducing-0-7-0 אנא, בדוק תחילה את הערות השחרור או "
-#~ "לך אל"
-
-#~ msgid "Go to the SABnzbd Wiki"
-#~ msgstr "SABnzbd לך אל וויקי"
--- a/po/nsis/nb.po
+++ b/po/nsis/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-12-24 11:01+0000\n"
+"POT-Creation-Date: 2017-06-22 20:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2018-12-25 04:49+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2017-06-23 05:56+0000\n"
+"X-Generator: Launchpad (build 18416)\n"

 #: NSIS_Installer.nsi
 msgid "Show Release Notes"
--- a/Show More
+++ b/Show More