torrentview: change domain *28.com

documentarytorrents: removed, down for 30 days. resolves #10474 (#10780 )
hachede: removed, down for 30 days. resolves #10475 (#10779 )
2025-09-13 07:24:08 +02:00 · 2021-01-10 23:08:59 +00:00 · 2021-01-10 21:05:34 +00:00 · 2021-01-10 21:01:22 +00:00 · 2021-01-10 20:18:49 +00:00 · 2021-01-10 00:14:27 +00:00
463 changed files with 6100 additions and 6062 deletions
--- a/README.md
+++ b/README.md
@@ -17,10 +17,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/

 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)

-
 #### Supported Systems
-* Windows 7SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/3.1/3.1-supported-os.md#linux)
+* Windows 7 SP1 or greater
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux)
 * macOS 10.13 or greater

 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -46,7 +45,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Byrutor
 * CiliPro (LIAORENCILI)
 * ConCen
- * Corsaro.red
 * cpasbien
 * cpasbienClone
 * Demonoid
@@ -57,6 +55,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ETTV
 * EXT Torrents
 * ExtraTorrent.cd
+ * ExtraTorrent.it
 * EZTV
 * Filebase
 * FireBit
@@ -73,7 +72,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * KickAssTorrent (KATcr)
 * kickasstorrents (kickass.ws)
 * kickasstorrents.to
 * Legit Torrents
@@ -82,7 +80,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * LinuxTracker
 * MacTorrents
 * Magnet4You
- * MagnetDL
 * MejorTorrent
 * MixTapeTorrent
 * Monova
@@ -144,8 +141,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentKitty
 * TorrentMafya
 * TorrentParadise
+ * TorrentProject
 * TorrentProject2
- * TorrentQuest
 * Torrents.csv
 * Torrentv
 * TorrentView (토렌트뷰)
@@ -156,7 +153,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * UnionDHT
 * VSTHouse
 * VST Torrents
- * XFSUB
 * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
@@ -174,7 +170,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BookTracker
 * BootyTape
 * CasStudioTV
- * cool-torrent
 * Darmowe torrenty
 * Deildu
 * DimeADozen (EzTorrent)
@@ -190,7 +185,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * KinoNaVse100
 * Kinorun
 * Kinozal
- * Korsar
 * LostFilm.tv
 * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
 * MVGroup Forum
@@ -239,12 +233,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AmigosShareClub
 * AnimeBytes (AB)
 * AnimeTorrents (AnT)
+ * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
 * Anthelion
 * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
 * ArabP2P
- * Asgaard (AG)
 * AsianCinema
- * AST4u [![(invite needed)][inviteneeded]](#)
 * Asylum Share
 * AudioNews (AN)
 * Audiobook Torrents (ABT + RNS)
@@ -275,7 +268,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BroadCity [![(invite needed)][inviteneeded]](#)
 * BroadcasTheNet (BTN)
 * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BTGigs (TG) [![(invite needed)][inviteneeded]](#)
 * BTNext (BTNT)
 * BTSCHOOL
 * BWTorrents
@@ -289,11 +281,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * ChannelX
 * ChileBT
 * Cinecalidad
- * CinemaMovies
+ * CinemaMovieS_ZT
 * CinemaZ (EuTorrents)
 * Cinemageddon
 * Cinematik
 * Classix
+ * Coastal-Crew
 * Concertos
 * CrazyHD
 * CrazySpirits
@@ -310,7 +303,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DigitalCore
 * DivTeam
 * DivxTotal
- * DocumentaryTorrents (DT)
 * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
 * DXDHD
 * EbookParadijs
@@ -321,7 +313,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * EpubLibre
 * eShareNet
 * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
 * ExoticaZ (YourExotic)
 * ExtremeBits
 * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
@@ -353,7 +344,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * GreekDiamond
 * Greek Team
 * HaiDan
- * HacheDe
 * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD-Bits.com
 * HD-Forever (HDF)
@@ -369,7 +359,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * HDChina (HDWing)
 * HDC (HDCiTY)
 * HDCity
- * HDDisk (HDD)
 * HDHome (HDBigger)
 * HDME
 * HDRoute [![(invite needed)][inviteneeded]](#)
@@ -386,7 +375,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Horror Site
 * HQSource (HQS)
 * HuSh [![(invite needed)][inviteneeded]](#)
- * ICE Torrent
 * IPTorrents (IPT)
 * ImmortalSeed (iS)
 * Immortuos
@@ -400,7 +388,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * LatinoP2P
 * Le Saloon
 * LeChaudron
- * LeagueHD
+ * LemonHD
 * LearnFlakes
 * LegacyHD (HD4Free)
 * Libble
@@ -411,6 +399,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * MaDs Revolution
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
+ * MeseVilág (Fairytale World)
 * MicroBit (µBit)
 * Milkie
 * MMA-Torrents
@@ -457,6 +446,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PThome
 * PTMSG
 * PTSBAO
+ * PTtime
 * PuntoTorrent
 * PuroVicio
 * Puur-Hollands
@@ -470,7 +460,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * RevolutionTT
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
 * RPTorrents
- * SceneFZ
 * SceneHD
 * ScenePalace (SP)
 * SceneRush
@@ -478,14 +467,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SDBits [![(invite needed)][inviteneeded]](#)
 * Secret Cinema
 * SeedFile (SF)
- * ShareUniversity
 * Shareisland
 * Shazbat
 * Shellife (SL) [![(invite needed)][inviteneeded]](#)
 * SiamBIT
 * SnowPT (SSPT)
 * SoulVoice [![(invite needed)][inviteneeded]](#)
- * SpaceTorrent
+ * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
 * SpeedCD
 * Speedmaster HD
 * SpeedTorrent Reloaded
@@ -494,14 +482,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SportsCult
 * SpringSunday
 * Superbits (SBS)
- * TakeaByte
 * Tapochek
 * Tasmanit [![(invite needed)][inviteneeded]](#)
 * TeamHD
 * TeamOS
 * TEKNO3D [![(invite needed)][inviteneeded]](#)
 * TellyTorrent
- * TenYardTorrents (TYT) [![(invite needed)][inviteneeded]](#)
 * The Falling Angels (TFA)
 * The Geeks [![(invite needed)][inviteneeded]](#)
 * The Horror Charnel (THC)
@@ -562,7 +548,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * XWT-Classics
 * XWTorrents (XWT)
 * Xthor
- * XtreMeZone (MYXZ)
 * YDYPT
 * YingK
 * Zamunda.net
@@ -593,12 +578,13 @@ We recommend you install Jackett as a Windows service using the supplied install

 To get started with using the installer for Jackett, follow the steps below:

-1. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
-2. When prompted if you would like this app to make changes to your computer, select "yes".
-3. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
-4. Once the installation has finished, check the "Launch Jackett" box to get started.
-5. Navigate your web browser to http://127.0.0.1:9117
-6. You're now ready to begin adding your trackers and using Jackett.
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50#dependencies
+2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
+3. When prompted if you would like this app to make changes to your computer, select "yes".
+4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
+5. Once the installation has finished, check the "Launch Jackett" box to get started.
+6. Navigate your web browser to http://127.0.0.1:9117
+7. You're now ready to begin adding your trackers and using Jackett.

 When installed as a service the tray icon acts as a way to open/start/stop Jackett. If you opted to not install it as a service then Jackett will run its web server from the tray tool.

@@ -682,7 +668,7 @@ Jackett is available as a beta package from [SynoCommunity](https://synocommunit


 ## Running Jackett behind a reverse proxy
-When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base Path Override" Jackett option accordingly.
+When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base path override" Jackett option accordingly.

 Example config for apache:
 ```
@@ -706,6 +692,20 @@ location /jackett {
 }
 ```

+## Search Cache
+Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+The default values should be good for most users. If you have problems, you can reduce the TTL value in the
+configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
+* **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
+* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+
+## Configuring FlareSolverr
+Some indexers are protected by CloudFlare or similar services and Jackett is not able to solve the challenges.
+For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
+Setting up this service is optional, most indexers don't need it.
+* Install FlareSolverr service (following their instructions)
+* Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.
 To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett
@@ -731,9 +731,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 -   `-c, --UseClient`          Override web client selection.
                            [automatic(Default)/httpclient/httpclient2]

-   `-j, --ProxyConnection`    use proxy - e.g. 127.0.0.1:8888
-
-
 -   `-x, --ListenPublic`       Listen publicly

 -   `-z, --ListenPrivate`      Only allow local access
@@ -762,7 +759,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source

 ### Windows
-* Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
+* Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open PowerShell and from the `src` directory, run `dotnet restore`
 * Open the Jackett solution in Visual Studio 2019 (version 16.4 or above)
@@ -782,21 +779,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/osx-x64/jackett # run jackett
 ```

 ### Linux


 ```bash
-sudo apt install mono-complete nuget msbuild dotnet-sdk-3.1 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src

 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett
 ```

 ## Screenshots
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,12 +2,12 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 16
+  minorVersion: 17
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
-  netCoreFramework: netcoreapp3.1
-  netCoreSdkVersion: 3.1.x
+  netCoreFramework: net5.0
+  netCoreSdkVersion: 5.0.x
  # system.debug: true

 trigger:
@@ -110,7 +110,7 @@ stages:
              projects: 'src/Jackett.Tray/Jackett.Tray.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: DotNetCoreCLI@2
            displayName: Build Jackett Service (Windows only)
@@ -120,7 +120,7 @@ stages:
              projects: 'src/Jackett.Service/Jackett.Service.csproj'
              publishWebProjects: false
              zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'

          - task: CopyFiles@2
            displayName: Copy Jackett Server
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -134,8 +134,8 @@ hr {
    }

 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
    display: inline-block;
 }

@@ -165,7 +165,7 @@ hr {
    text-align: center;
 }

-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
    width: 25px;
 }

--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -98,6 +98,15 @@ function loadJackettSettings() {
        $("#jackett-allowupdate").attr('checked', data.updatedisabled);
        $("#jackett-prerelease").attr('checked', data.prerelease);
        $("#jackett-logging").attr('checked', data.logging);
+
+        $("#jackett-cache-enabled").attr('checked', data.cache_enabled);
+        $("#jackett-cache-ttl").val(data.cache_ttl);
+        $("#jackett-cache-max-results-per-indexer").val(data.cache_max_results_per_indexer);
+        if (!data.cache_enabled) {
+            $("#jackett-show-releases").attr("disabled", true);
+        }
+
+        $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
        $("#jackett-omdbkey").val(data.omdbkey);
        $("#jackett-omdburl").val(data.omdburl);
        var password = data.password;
@@ -1126,6 +1135,10 @@ function bindUIButtons() {
        var jackett_update = $("#jackett-allowupdate").is(':checked');
        var jackett_prerelease = $("#jackett-prerelease").is(':checked');
        var jackett_logging = $("#jackett-logging").is(':checked');
+        var jackett_cache_enabled = $("#jackett-cache-enabled").is(':checked');
+        var jackett_cache_ttl = $("#jackett-cache-ttl").val();
+        var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
+        var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
        var jackett_omdb_key = $("#jackett-omdbkey").val();
        var jackett_omdb_url = $("#jackett-omdburl").val();

@@ -1143,6 +1156,11 @@ function bindUIButtons() {
            blackholedir: $("#jackett-savedir").val(),
            logging: jackett_logging,
            basepathoverride: jackett_basepathoverride,
+            logging: jackett_logging,
+            cache_enabled: jackett_cache_enabled,
+            cache_ttl: jackett_cache_ttl,
+            cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
+            flaresolverrurl: jackett_flaresolverr_url,
            omdbkey: jackett_omdb_key,
            omdburl: jackett_omdb_url,
            proxy_type: jackett_proxy_type,
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -126,8 +126,8 @@ hr {
    }

 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
    display: inline-block;
 }

@@ -157,7 +157,7 @@ hr {
    text-align: center;
 }

-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
    width: 25px;
 }

--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -33,8 +33,8 @@

    <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20200223" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20200223" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20201208" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20201208" media="only screen and (max-device-width: 480px)">
    <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
    <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
    <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -127,7 +127,7 @@
            </a>
        </div>
        <div class="input-area">
-            <span class="input-header">Base Path Override: </span>
+            <span class="input-header">Base path override: </span>
            <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett">
        </div>
        <div class="input-area">
@@ -135,7 +135,7 @@
            <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
        </div>
        <div class="input-area">
-            <span class="input-header">Manual download blackhole directory: </span>
+            <span class="input-header">Blackhole directory: </span>
            <input id="jackett-savedir" class="form-control input-right" type="text" value="" placeholder="c:\torrents\">
        </div>

@@ -188,6 +188,22 @@
            <span class="input-header">Enhanced logging: </span>
            <input id="jackett-logging" class="form-control input-right" type="checkbox" />
        </div>
+        <div class="input-area">
+            <span class="input-header">Cache enabled (recommended): </span>
+            <input id="jackett-cache-enabled" class="form-control input-right" type="checkbox" />
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache TTL (seconds): </span>
+            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache max results per indexer: </span>
+            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr API URL: </span>
+          <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+        </div>
        <div class="input-area">
            <span class="input-header">OMDB API key: </span>
            <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -680,6 +696,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201107"></script>
+    <script type="text/javascript" src="../custom.js?changed=20201220"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/src/Jackett.Common/Definitions/0daykiev.yml
@@ -99,7 +99,7 @@ search:
    - name: re_replace # S01E01 to Сезон 1 Серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver
    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -14,9 +14,8 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337.root.yt/
-  - https://1337x.unblockit.app/
-  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.dev/
+  - https://1337x.unblocked.monster/
 legacylinks:
  - https://1337x.unblocked.earth/
  - https://1337x.unblockit.pro/
@@ -36,6 +35,9 @@ legacylinks:
  - https://1337x.uk-unblock.pro/
  - https://1337x.unblockit.top/
  - https://1337x.unblockit.lat/
+  - https://1337x.unblockit.app/
+  - https://1337x.unblocked.rest/
+  - https://1337.root.yt/

 caps:
  categorymappings:
@@ -134,8 +136,6 @@ settings:
    default: "magnet:"
    options:
      "http://itorrents.org/": iTorrents.org
-      "http://torrage.info/": Torrage.info
-      "http://btcache.me/": BTcache.me
      "magnet:": magnet
  - name: sort
    type: select
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/src/Jackett.Common/Definitions/2fast4you.yml
@@ -149,7 +149,7 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # 0 active, 1 incldead, 2 onlydead
    incldead: 1
--- a/src/Jackett.Common/Definitions/3evils.yml
+++ b/src/Jackett.Common/Definitions/3evils.yml
@@ -98,7 +98,7 @@ search:
    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # title, descr, genre, all
    searchin: title
--- a/src/Jackett.Common/Definitions/4thd.yml
+++ b/src/Jackett.Common/Definitions/4thd.yml
@@ -17,6 +17,7 @@ caps:
    - {id: 27, cat: Movies/HD, desc: "MoviesHD"}
    - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
    - {id: 26, cat: Movies/SD, desc: "Movies/XviD"}
+    - {id: 45, cat: Movies, desc: "Movies/Kids"}
    - {id: 41, cat: TV/Foreign, desc: "Foreign tv"}
    - {id: 40, cat: TV, desc: "Mini-Series"}
    - {id: 43, cat: TV/HD, desc: "TV H265"}
@@ -90,7 +91,7 @@ search:
    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
-    # 0 all 1 onlyfree
+    # 0 all, 1 onlyfree
    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
    title: "{{ .Keywords }}"
    search_type: 1
--- a/src/Jackett.Common/Definitions/7torrents.yml
+++ b/src/Jackett.Common/Definitions/7torrents.yml
@@ -20,10 +20,6 @@ caps:
    book-search: [q]

 settings:
-  - name: info_8000
-    type: info
-    label: About 7torrents Categories
-    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
  - name: sort
    type: select
    label: Sort requested from site
@@ -32,6 +28,14 @@ settings:
      created: created
      length: size
      seeders: seeders
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+  - name: info_8000
+    type: info
+    label: About 7torrents Categories
+    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).

 search:
  # https://www.7torrents.cc/search?query=2020&sort=created
--- a/src/Jackett.Common/Definitions/Bittorrentfiles.yml
+++ b/src/Jackett.Common/Definitions/Bittorrentfiles.yml
@@ -121,6 +121,14 @@ settings:
    options:
      desc: desc
      asc: asc
+  - name: info_account
+    type: info
+    label: Account Settings
+    default: In order to see the correct date and size in the torrent rows, change the <b>Torrentliste:</b> setting to <b>Modern</b> on your account profile.
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.

 login:
  path: signin.php
--- a/src/Jackett.Common/Definitions/DasUnerwartete.yml
+++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml
@@ -77,7 +77,7 @@ login:
 search:
  path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 1

@@ -119,8 +119,8 @@ search:
      selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
    downloadvolumefactor:
      case:
-        img[src="pic/oupic.gif"]: "0"
-        "*": "1"
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
    uploadvolumefactor:
      text: 1
 # engine tbd
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -81,7 +81,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
    search_type: title

--- a/src/Jackett.Common/Definitions/aither.yml
+++ b/src/Jackett.Common/Definitions/aither.yml
@@ -79,7 +79,7 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -87,10 +87,13 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -116,7 +119,9 @@ search:
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -189,7 +194,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-# UNIT3D 2.7.0
+# UNIT3D 4.0.0
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -166,7 +166,7 @@ search:
    order: "{{ .Config.type }}"
  # torrents-search.php does not support imdbid search or return imdb links.
  keywordsfilters:
-  # drop the year from searches since site titles do not include year
+    # drop the year from searches since site titles do not include year
    - name: re_replace
      args: ["(19|20[0-9]{2})", ""]

--- a/src/Jackett.Common/Definitions/animeworld.yml
+++ b/src/Jackett.Common/Definitions/animeworld.yml
@@ -1,11 +1,13 @@
 ---
-id: ast4u
-name: AST4u
-description: "AST4u is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+id: animeworld
+name: AnimeWorld
+description: "AnimeWorld (AST4u) is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
 language: de-de
 type: private
 encoding: iso-8859-1
 links:
+  - https://animeworld.cx/
+legacylinks:
  - https://www.ast4u.me/

 caps:
@@ -69,7 +71,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    incldead: 0
    orderby: added
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/src/Jackett.Common/Definitions/arenabg.yml
@@ -6,65 +6,70 @@ language: bg-BG
 type: semi-private
 encoding: UTF-8
 links:
-  - https://arenabg.ch/
-legacylinks:
  - https://arenabg.com/
+legacylinks:
+  - https://arenabg.ch/

 caps:
  categorymappings:
-    - {id: "movies", cat: Movies, desc: "Movies"}
-    - {id: "arenabgtv", cat: Movies, desc: "Movies / ArenaBG.TV"}
-    - {id: "xvid", cat: Movies/SD, desc: "Movies / XviD"}
-    - {id: "dvd-r", cat: Movies/DVD, desc: "Movies / DVD-R"}
-    - {id: "x264", cat: Movies/HD, desc: "Movies / x264"}
-    - {id: "animemanga", cat: TV/Anime, desc: "Movies / Anime & Manga"}
-    - {id: "documentaries", cat: TV/Documentary, desc: "Movies / Documentaries"}
-    - {id: "blu-ray", cat: Movies/BluRay, desc: "Movies / Blu-ray"}
-    - {id: "boxset", cat: Movies, desc: "Movies / Boxset"}
-    - {id: "x264boxset", cat: Movies/HD, desc: "Movies / x264 Boxset"}
-    - {id: "tvepisodeshd", cat: Movies/HD, desc: "Movies / HDTV"}
-    - {id: "3d", cat: Movies/3D, desc: "Movies / 3D"}
-    - {id: "movies-hd", cat: Movies/HD, desc: "Movies / Movies HD"}
-    - {id: "x265", cat: Movies/HD, desc: "Movies / x265"}
-    - {id: "4k", cat: Movies/UHD, desc: "Movies / 4K"}
-    - {id: "series", cat: TV, desc: "Series"}
-    - {id: "hdtv", cat: TV/HD, desc: "Series / TV Episodes HD"}
-    - {id: "tvepisodes", cat: TV, desc: "Series / TV Episodes"}
-    - {id: "tvboxset", cat: TV, desc: "Series / TV Boxset"}
-    - {id: "tvboxsethd", cat: TV/HD, desc: "Series / TV Boxset HD"}
-    - {id: "music", cat: Audio, desc: "Music"}
-    - {id: "mp3", cat: Audio/MP3, desc: "Music / MP3"}
-    - {id: "music-video", cat: Audio/Video, desc: "Music / Video"}
-    - {id: "flac", cat: Audio/Lossless, desc: "Music / FLAC"}
-    - {id: "music-dvd", cat: Audio, desc: "Music / DVD"}
-    - {id: "music-ape", cat: Audio/Lossless, desc: "Music / APE"}
-    - {id: "music-dts", cat: Audio, desc: "Music / DTS"}
-    - {id: "musicwavpack", cat: Audio, desc: "Music / WavePack"}
-    - {id: "musicost", cat: Audio, desc: "Music / OST"}
-    - {id: "games", cat: PC/Games, desc: "Games"}
-    - {id: "games-iso", cat: PC/Games, desc: "Games / PC ISO"}
-    - {id: "pc-rip", cat: PC, desc: "Games / PC RIP"}
-    - {id: "ps2", cat: Console, desc: "Games / PS2"}
-    - {id: "psp", cat: Console/PSP, desc: "Games / PSP"}
-    - {id: "xbox", cat: Console/XBox, desc: "Games / XBOX"}
-    - {id: "xbox-360", cat: Console/XBox 360, desc: "Games / XBOX-360"}
-    - {id: "ps3", cat: Console/PS3, desc: "Games / PS3"}
-    - {id: "wii", cat: Console/Wii, desc: "Games / WII"}
-    - {id: "PS4", cat: Console/PS4, desc: "Games / PS4"}
-    - {id: "software", cat: PC, desc: "Software"}
-    - {id: "pc-iso", cat: PC/ISO, desc: "Software / PC ISO"}
-    - {id: "pdasmartphone", cat: PC/Mobile-Other, desc: "Software / Smartphone"}
-    - {id: "tutorial", cat: PC, desc: "Software / Tutorial"}
-    - {id: "android", cat: PC/Mobile-Android, desc: "Software / Android"}
-    - {id: "ios", cat: PC/Mobile-iOS, desc: "Software / iOS"}
-    - {id: "misc", cat: Other/Misc, desc: "Misc"}
-    - {id: "other", cat: Other, desc: "Misc / Other"}
-    - {id: "e-books", cat: Books/EBook, desc: "Misc / e-Books"}
-    - {id: "sports", cat: TV/Sport, desc: "Misc / Sports"}
-    - {id: "0-day", cat: PC/0day, desc: "Misc / 0-Day"}
-    - {id: "xxx", cat: XXX, desc: "XXX"}
-    - {id: "porn", cat: XXX, desc: "XXX / Porn"}
-    - {id: "xxx-hd", cat: XXX, desc: "XXX / XXX HD"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 8, cat: Movies, desc: "Movies / ArenaBG.TV"}
+    - {id: 9, cat: Movies/SD, desc: "Movies / XviD"}
+    - {id: 10, cat: Movies/DVD, desc: "Movies / DVD-R"}
+    - {id: 11, cat: Movies/HD, desc: "Movies / x264"}
+    - {id: 12, cat: TV/Anime, desc: "Movies / Anime & Manga"}
+    - {id: 13, cat: TV/Documentary, desc: "Movies / Documentaries"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movies / Blu-ray"}
+    - {id: 15, cat: Movies, desc: "Movies / Weekend"}
+    - {id: 16, cat: Movies, desc: "Movies / Boxset"}
+    - {id: 17, cat: Movies/HD, desc: "Movies / x264 Boxset"}
+    - {id: 18, cat: Movies/HD, desc: "Movies / HDTV"}
+    - {id: 19, cat: Movies/3D, desc: "Movies / 3D"}
+    - {id: 20, cat: Movies/HD, desc: "Movies / Movies HD"}
+    - {id: 21, cat: Movies/HD, desc: "Movies / x265"}
+    - {id: 22, cat: Movies/UHD, desc: "Movies / 4K"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 23, cat: TV/HD, desc: "Series / TV Episodes HD"}
+    - {id: 24, cat: TV, desc: "Series / TV Episodes"}
+    - {id: 25, cat: TV, desc: "Series / TV Boxset"}
+    - {id: 26, cat: TV/HD, desc: "Series / TV Boxset HD"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 27, cat: Audio/MP3, desc: "Music / MP3"}
+    - {id: 28, cat: Audio/Video, desc: "Music / Video"}
+    - {id: 29, cat: Audio/Lossless, desc: "Music / FLAC"}
+    - {id: 30, cat: Audio, desc: "Music / DVD"}
+    - {id: 31, cat: Audio/Lossless, desc: "Music / APE"}
+    - {id: 32, cat: Audio, desc: "Music / DTS"}
+    - {id: 33, cat: Audio, desc: "Music / WavePack"}
+    - {id: 34, cat: Audio, desc: "Music / OST"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 35, cat: PC/Games, desc: "Games / PC ISO"}
+    - {id: 36, cat: PC, desc: "Games / PC RIP"}
+    - {id: 37, cat: Console, desc: "Games / PS2"}
+    - {id: 38, cat: Console/PSP, desc: "Games / PSP"}
+    - {id: 39, cat: Console/XBox, desc: "Games / XBOX"}
+    - {id: 40, cat: Console/XBox 360, desc: "Games / XBOX-360"}
+    - {id: 41, cat: Console/PS3, desc: "Games / PS3"}
+    - {id: 42, cat: Console/Wii, desc: "Games / WII"}
+    - {id: 43, cat: Console/NDS, desc: "Games / NDS"}
+    - {id: 44, cat: Console/PS4, desc: "Games / PS4"}
+    - {id: 5, cat: PC, desc: "Software"}
+    - {id: 45, cat: PC/ISO, desc: "Software / PC ISO"}
+    - {id: 46, cat: PC/Mobile-Other, desc: "Software / Smartphone"}
+    - {id: 47, cat: PC, desc: "Software / Tutorial"}
+    - {id: 48, cat: PC/Mac, desc: "Software / MAC"}
+    - {id: 49, cat: PC/Mobile-Android, desc: "Software / Android"}
+    - {id: 50, cat: PC/Mobile-iOS, desc: "Software / iOS"}
+    - {id: 51, cat: PC/Mobile-Other, desc: "Software / WM7"}
+    - {id: 6, cat: XXX, desc: "XXX"}
+    - {id: 52, cat: XXX, desc: "XXX / Porn"}
+    - {id: 53, cat: XXX, desc: "XXX / XXX HD"}
+    - {id: 7, cat: Other, desc: "Misc"}
+    - {id: 54, cat: Other/Misc, desc: "Misc / Other"}
+    - {id: 55, cat: Books/EBook, desc: "Misc / e-Books"}
+    - {id: 56, cat: Other, desc: "Misc / Banned"}
+    - {id: 57, cat: TV/Sport, desc: "Misc / Sports"}
+    - {id: 58, cat: PC/0day, desc: "Misc / 0-Day"}

  modes:
    search: [q]
@@ -85,104 +90,94 @@ settings:
    label: Download link
    default: "magnet:?xt="
    options:
-      "/get/key:": ".torrent"
+      "/en/torrents/download/?key=": ".torrent"
      "magnet:?xt=": "magnet"

 login:
-  path: /
+  path: en/users/signin/
  method: form
-  form: form[action="/users/"]
+  form: form[action="/en/users/signin/"]
  inputs:
-    email: "{{ .Config.username }}"
+    username_or_email: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    action: login
+  captcha:
+    type: image
+    selector: img[src="/captcha.php"]
+    input: captcha
  error:
-    - selector: div.row div div.alert i.fa-warning
-      message:
-        selector: div.row div div.alert
+    - selector: div.row div#container div.alert
  test:
-    path: /
-    selector: a[href="/users/logout/"]
+    path: en/
+    selector: a[href="/en/users/logout/"]

 download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
+  selector: a[href^="{{ .Config.downloadlink }}"]
  attribute: href

 search:
  paths:
-    - path: torrents/
-      method: post
-      followredirect: true
+    # https://arenabg.com/en/torrents/?text=ice+s01e01
+    - path: en/torrents/
  inputs:
-    text: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
-    "text_mobile": ""
-    type: 0
-    audio: 0
-    subtitles: 0
-    action: search
+    text: "{{ .Keywords }}"
+    subtitles: ""
+    audio: ""
+    # does not support multi-cats so defaulting to all
+    category: ""

  rows:
-    selector: tr:has(td.category)
+    selector: tr:has(a[href^="/en/torrents/?category="])

  fields:
-    title:
-      # use the second div for full title
-      selector: td.filename div:nth-child(2) a
-    details:
-      selector: td.filename div a
-      attribute: href
    category:
-      selector: td.category a
+      selector: td.category a[href^="/en/torrents/?category="]:last-of-type
      attribute: href
      filters:
-        - name: re_replace
-          args: ["/torrents/type:(.+?)/", "$1"]
+        - name: querystring
+          args: category
+    english:
+      selector: span[title="English"]
+      attribute: title
+      optional: true
+    bulgarian:
+      selector: span[title="Bulgarian"]
+      attribute: title
+      optional: true
+    title:
+      selector: td.filename a[href^="/en/torrents/"]
+      filters:
+        - name: append
+          args: "{{ if .Result.bulgarian }} {{ .Result.bulgarian }}{{ else }}{{ end }}{{ if .Result.english }} {{ .Result.english }}{{ else }}{{ end }}"
+    details:
+      selector: td.filename a[href^="/en/torrents/"]
+      attribute: href
    download:
-      selector: td.filename div a
+      selector: td.filename a[href^="/en/torrents/"]
      attribute: href
-    size:
-      selector: td:nth-child(4)
-    date:
-      # 08:49:09
-      selector: td:nth-child(3):contains(":")
-      optional: true
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "15:04:05 -07:00"
-    date:
-      # 2018-10-19
-      selector: td:nth-child(3):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "2006-01-02 -07:00"
-    seeders:
-      selector: td:nth-child(6)
-      filters:
-        - name: replace
-          args: ["-", "0"]
-        - name: replace
-          args: ["DHT", "0"] # torrent can only be downloaded via DHT
-    leechers:
-      selector: td:nth-child(7)
-      filters:
-        - name: replace
-          args: ["-", "0"]
-    grabs:
-      selector: td:nth-child(8)
-      filters:
-        - name: replace
-          args: ["-", "0"]
    poster:
-      selector: td.filename div:nth-child(2) a
+      selector: td.filename a[href^="/en/torrents/"]
      attribute: onmouseover
      filters:
        - name: regexp
-          args: src=\\'([^\s\\]+)
+          args: "\"(.+?)\""
+        - name: replace
+          args: ["\\", ""]
+    date:
+      # 2 January 2021, Saturday @ 20:46
+      selector: small
+      filters:
+        - name: regexp
+          args: "(.+?, .+? @ [0-9]{2}:[0-9]{2})"
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "2 January 2006, Monday @ 15:04 -07:00"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(4)
+    leechers:
+      selector: td:nth-child(5)
    downloadvolumefactor:
      text: 0
    uploadvolumefactor:
--- a/src/Jackett.Common/Definitions/asgaard.yml
+++ b/src/Jackett.Common/Definitions/asgaard.yml
@@ -1,204 +0,0 @@
---
-id: asgaard
-name: Asgaard
-description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://asgrd.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "Kidz"}
-    - {id: 2, cat: Movies, desc: "Movies"}
-    - {id: 3, cat: TV, desc: "TV"}
-    - {id: 4, cat: Audio, desc: "Music"}
-    - {id: 5, cat: PC, desc: "Apps"}
-    - {id: 6, cat: PC/Games, desc: "Games"}
-    - {id: 7, cat: Books, desc: "Books"}
-    - {id: 8, cat: Movies, desc: "Kidz Movies"}
-    - {id: 9, cat: TV, desc: "Kidz TV"}
-    - {id: 10, cat: TV, desc: "Kidz Boxset"}
-    - {id: 54, cat: Movies/SD, desc: "Movies SD"}
-    - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"}
-    - {id: 14, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 17, cat: Movies/BluRay, desc: "Movies BD"}
-    - {id: 73, cat: Movies, desc: "Movies Boxset"}
-    - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"}
-    - {id: 52, cat: TV/SD, desc: "TV SD"}
-    - {id: 58, cat: TV/SD, desc: "TV DVDR"}
-    - {id: 18, cat: TV/HD, desc: "TV HD"}
-    - {id: 19, cat: TV/UHD, desc: "TV 4K"}
-    - {id: 60, cat: TV/HD, desc: "TV BD"}
-    - {id: 20, cat: TV, desc: "TV Boxset"}
-    - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
-    - {id: 49, cat: Audio/Video, desc: "Music Video"}
-    - {id: 23, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
-    - {id: 24, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"}
-    - {id: 28, cat: PC/Mobile-Android, desc: "Apps Android"}
-    - {id: 29, cat: PC/Mobile-iOS, desc: "Apps iOS"}
-    - {id: 25, cat: PC/0day, desc: "Apps Windows"}
-    - {id: 26, cat: PC, desc: "Apps Linux"}
-    - {id: 27, cat: PC/Mac, desc: "Apps MacOS"}
-    - {id: 30, cat: PC/Games, desc: "Games Windows"}
-    - {id: 31, cat: PC, desc: "Games Linux"}
-    - {id: 32, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 33, cat: PC/Mobile-Android, desc: "Games Android"}
-    - {id: 34, cat: PC/Mobile-iOS, desc: "Games iOS"}
-    - {id: 35, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 38, cat: Console/PSP, desc: "Games Playstation"}
-    - {id: 39, cat: Console/XBox, desc: "Games XBox"}
-    - {id: 41, cat: Books/EBook, desc: "Books E-Book"}
-    - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"}
-    - {id: 43, cat: Books/Technical, desc: "Books Education"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info
-    type: info
-    label: "About the Username field"
-    default: "Enter your <b>Email address</b> in the username field."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 2
-    options:
-      2: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: post
-  form: form
-  inputs:
-    email: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: 1
-  error:
-    - selector: h2:contains("Error")
-      message:
-        selector: p
-  test:
-    path: /
-    selector: a[href$="/logout.php"]
-
-search:
-  paths:
-    # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}cats[]={{.}}&{{end}}"
-    sns: ""
-    sna: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    spf: ""
-    sr: ""
-    sg: ""
-    sys: ""
-    sye: ""
-    srs: ""
-    sre: ""
-    si: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}"
-    ss: ""
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 incl non-free, 1 incl only-free
-    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="])
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: div.torrent-name
-      filters:
-        # need to remove the tooltip text
-        - name: regexp
-          args: "(.+?)\\n"
-    details:
-      selector: a[href*="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href*="browse.php?"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: cats\[\]=(\d+)$
-    poster:
-      selector: img.tooltip-poster
-      attribute: src
-    download:
-      selector: a[href*="download.php?torrent="]
-      attribute: href
-    files:
-      # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    seeders:
-      selector: td:nth-child(9)
-    leechers:
-      selector: td:nth-child(10)
-    date:
-      # 26 May 20 14:05:06
-      selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day"))
-      optional: true
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "2 Jan 2006 15:04:05 -07:00"
-    date:
-      # Today, 20:26:23
-      # Yesterday, 13:50:05
-      selector: td:nth-child(2) > div > div:last-of-type:contains("day")
-      optional: true
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    downloadvolumefactor:
-      case:
-        img[src="./images/gold.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.95
-# Midgaard
--- a/src/Jackett.Common/Definitions/asiancinema.yml
+++ b/src/Jackett.Common/Definitions/asiancinema.yml
@@ -16,8 +16,8 @@ caps:

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
    music-search: [q]

 settings:
@@ -71,16 +71,17 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
@@ -107,8 +108,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -123,6 +128,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
@@ -144,7 +152,9 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 2.2.7
+# UNIT3D 3.0.0
--- a/src/Jackett.Common/Definitions/asylumshare.yml
+++ b/src/Jackett.Common/Definitions/asylumshare.yml
@@ -176,6 +176,9 @@ search:
    # drop the year from searches since site titles do not include year
    - name: re_replace
      args: ["(19|20[0-9]{2})", ""]
+    # prepend + to each word
+    - name: re_replace
+      args: ["(\\w+)", "+$1"]

  rows:
    selector: tr.t-row:has(a[href^="download.php?id="])
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
  - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
 legacylinks:
  - https://audiobookbay.la/
  - https://audiobookbay.unblockit.lat/
+  - https://audiobookbay.unblockit.app/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/audiobooktorrents.yml
+++ b/src/Jackett.Common/Definitions/audiobooktorrents.yml
@@ -114,7 +114,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # title, descr
    searchin: title
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/src/Jackett.Common/Definitions/audionews.yml
@@ -243,7 +243,7 @@ search:
    - path: tracker.php
      method: post
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -16,7 +16,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    movie-search: [q, imdbid, tmdbid]

 settings:
  - name: oneurl
@@ -55,17 +55,16 @@ search:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: ""
+    tmdb: "{{ .Query.TMDBID }}"
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100

  rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
    _category:
@@ -79,18 +78,12 @@ search:
      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
    details:
      selector: a.torrent-name
      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
    date:
      selector: td:not(a[href$="/history"]) span.text-orange
      filters:
@@ -106,6 +99,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    downloadvolumefactor:
      case:
        i[data-original-title="100% Free"]: 0
--- a/src/Jackett.Common/Definitions/beyond-hd.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -16,7 +16,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    movie-search: [q, imdbid, tmdbid]

 settings:
  - name: info_oid
@@ -75,17 +75,16 @@ search:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tmdb: ""
+    tmdb: "{{ .Query.TMDBID }}"
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100

  rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]

  fields:
    _category:
@@ -99,18 +98,12 @@ search:
      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
    title:
      selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
    details:
      selector: a.torrent-name
      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
    date:
      selector: td:not(a[href$="/history"]) span.text-orange
      filters:
@@ -126,6 +119,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    downloadvolumefactor:
      case:
        i[data-original-title="100% Free"]: 0
--- a/src/Jackett.Common/Definitions/bibliotik.yml
+++ b/src/Jackett.Common/Definitions/bibliotik.yml
@@ -30,25 +30,20 @@ settings:
  - name: orderby
    type: select
    label: Sort requested from site
-    default: relevance
+    default: added
    options:
-      relevance: relevance
-      year: year
+      "@relevance": relevance
+      title: title
      size: size
-      duration: duration
      added: added
-      leechers: leechers
      seeders: seeders
-      snatches: snatches
-      comments: comments
-      files: files
  - name: order
    type: select
    label: Order requested from site
-    default: desc
+    default: DESC
    options:
-      desc: desc
-      asc: asc
+      DESC: desc
+      ASC: asc

 login:
  path: /
@@ -68,7 +63,7 @@ search:
  paths:
    - path: torrents/
  inputs:
-    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{else}}{{end}}{{ if .Query.Title }} @title {{ .Query.Title }}{{else}}{{end}}{{ .Keywords }}"
+    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{ else }}{{ end }}{{ if .Query.Title }} @title {{ .Query.Title }}{{ else }}{{ end }}{{ .Keywords }}"
    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
    orderby: "{{ .Config.orderby }}"
    order: "{{ .Config.order }}"
@@ -105,10 +100,10 @@ search:
    booktitle:
      selector: .title a
    title:
-      text: "{{.Result.booktitle}}"
+      text: "{{ .Result.booktitle }}"
      filters:
        - name: append
-          args: "{{ if .Result.author }} by {{ .Result.author }}{{else}}{{end}}{{ if .Result._year }} {{ .Result._year }}{{else}}{{end}}{{ if .Result._filetype }} {{ .Result._filetype }}{{else}}{{end}}{{ if .Result._retail }} {{ .Result._retail }}{{else}}{{end}}"
+          args: "{{ if .Result.author }} by {{ .Result.author }}{{ else }}{{ end }}{{ if .Result._year }} {{ .Result._year }}{{ else }}{{ end }}{{ if .Result._filetype }} {{ .Result._filetype }}{{ else }}{{ end }}{{ if .Result._retail }} {{ .Result._retail }}{{ else }}{{ end }}"
    details:
      selector: .title a
      attribute: href
@@ -143,9 +138,7 @@ search:
      optional: true
      selector: .snatches
    downloadvolumefactor:
-      case:
-        "*": 1
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": 1
-# engine tbc
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/bigtorrent.yml
+++ b/src/Jackett.Common/Definitions/bigtorrent.yml
@@ -52,8 +52,8 @@ login:
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
-    sent: "yes"
-    returnto: "/"
+    sent: yes
+    returnto: /
  error:
    - selector: div.error
  test:
@@ -67,10 +67,12 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}{{ .Keywords }}{{else}}  {{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}  {{ end }}"
+
  rows:
    selector: table#torrent_table > tbody > tr:has(a[href^="browse.php?cat="])
+
  fields:
    category:
      selector: a[href^="browse.php?cat="]
@@ -98,8 +100,7 @@ search:
    date:
      selector: td:nth-child(4)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -81,7 +81,6 @@ caps:
    - {id: 9020, cat: Books/EBook, desc: "Books E-Book"}
    - {id: 9030, cat: Books, desc: "Books E-Paper"}
    - {id: 9040, cat: Books, desc: "Books E-Learning"}
-    - {id: 9050, cat: TV, desc: "TV Kids"}
    - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
    - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
    - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
@@ -90,7 +89,7 @@ caps:
  modes:
    search: [q]
    tv-search: [q, season, ep]
-    movie-search: [q, imdbid]
+    movie-search: [q]
    music-search: [q]
    book-search: [q]

@@ -111,9 +110,9 @@ settings:
    default: 1
    options:
      1: created
-      8: seeders
-      6: size
-      2: title
+      2: seeders
+      5: size
+      9: title
  - name: type
    type: select
    label: Order requested from site
@@ -137,97 +136,108 @@ login:
  error:
    - selector: div#login_error
  test:
-    path: browse.php
-    selector: a[href="logout.php"]
+    path: index.php
+#    selector: a[href="logout.php"] # ajax does not return a full page so cant test this.

 search:
  paths:
-    - path: browse.php
+    - path: ajax_browse.php
+      method: post
  inputs:
-    suchfeld: 2
-    alleanzeigen: 1
-    $raw: "{{ range .Categories }}kategorie[]={{.}}&{{end}}"
-    suche: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # searchin: 1 name, 2 descr, 3 all, 4 genre, 5 movei titles, 6 actors, 7 authors, 8 directors, 9 filmcrew, 10 plot, 11 imdbid, 12 tmdbid
-    # note: although tmdbid appears as option 12, searching for this yields no results.
-    durchsuche: "{{ if .Query.IMDBID }}11{{ else }}1{{ end }}"
-    # incldead: 1 active, 2 all, 3 onlydead, 4 highlight, 5 bookmark, 6 onlyups, 7 freeleech, 8 multi2, 9 multi5, 10 multi10, 11 25%d,l 12 50%dl, 13 75%dl
-    # note: searching with 6(freeleech) yielded no results, using 7(onlyups) works.
-    suchein: "{{ if .Config.freeleech }}6{{ else }}2{{ end }}"
-    # cat: 1 all, 1000 film, 2000 tv, 3000 docs, 4000 sport, 5000 xxx, 6000 games, 7000 apps, 8000 music, 9000 other
-    sucheaus: 1
-    sortierenach: "{{ .Config.sort }}"
-    sortierung: "{{ .Config.type }}"
+    # allCats=1000&categories[]=1010&categories[]=1020&search=&limit=1&searchIn=0&orderBy=1&order=1
+    $raw: "{{ if .Categories }}{{ range .Categories }}categories[]={{.}}&{{end}}{{ else }}{{ end }}"
+    # cat: (empty) all, 1000 film, 2000 tv, 3000 docs, 4000 sport, 5000 xxx, 6000 games, 7000 apps, 8000 music, 9000 other
+    allCats: ""
+    search: "{{ .Keywords }}"
+    # 1 25, 2 50, 3 75, 4 100
+    limit: 1
+    # searchin: 0 all, 1 active, 2 dead, 3 highlights, 4 bookmarks, 5 uploads, 10 bots, 11 onlyupload, 12 multiplier, 13 %download, 14 freeleech
+    # note: freeleech on this site means download and upload is not counted, whereas OU means download is free and upload is counted
+    # 14 yields no freeleech, but 11 returns results
+    searchin: "{{ if .Config.freeleech }}11{{ else }}0{{ end }}"
+    orderBy: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+  headers:
+    x-requested-with: ["XMLHttpRequest"]

  rows:
-    selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
+    selector: table.tableinborder tr:has(.catPic)

  fields:
    category:
-      selector: a.bt-cat
-      attribute: href
+      selector: td.catPic > img
+      attribute: src
      filters:
        - name: regexp
-          args: (\d+)$
+          args: (\d+).png$
    title:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
    details:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
      attribute: href
    download:
-      selector: div.tor-metadl a
-      attribute: href
-    poster:
-      selector: div[id^="details-"] img
-      attribute: src
+      # a[onlick="downloadTorrent(383718);"] --> a[href="download.php?torrent=383559"]
+      selector: td.tdl > a
+      attribute: onclick
+      filters:
+        - name: regexp
+          args: (\d+)
+        - name: prepend
+          args: "download.php?torrent="
    seeders:
-      selector: div.tor-seeder
+      selector: td.peers:has(i[title="Seeders"])
    leechers:
-      selector: div.tor-leecher
+      selector: td.peers:has(i[title="Leechers"])
    grabs:
-      selector: div.tor-snatcher
+      selector: td.peers:has(i[title="Snatchers"])
      # 2 flavours of dates
    date:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.tor-date:not(:contains("."))
+      # &nbsp;Heute 13:30:04
+      # &nbsp;Gestern 22:44:23
+      selector: td.added:not(:contains("."))
      optional: true
      filters:
+        - name: replace
+          args: ["\u00a0", ""]
        - name: replace
          args: ["Heute", "Today"]
        - name: replace
          args: ["Gestern", "Yesterday"]
        - name: append
          args: " +01:00" # CET
+        - name: fuzzytime
    date:
-      # &nbsp;&nbsp;27.05.2019 <b>12:52:11</b>
-      selector: div.tor-date:contains(".")
+      # &nbsp;24.05.2019 20:15:38
+      selector: td.added:contains(".")
      optional: true
      filters:
-        - name: replace
-          args: ["\u00a0", ""]
        - name: append
          args: " +01:00" # CET
        - name: dateparse
          args: "02.01.2006 15:04:05 -07:00"
    size:
-      selector: div.tor-size
+      selector: td.size
      filters:
+        - name: replace
+          args: ["\u00a0", ""]
        - name: replace
          args: [".", ""]
        - name: replace
          args: [",", "."]
    downloadvolumefactor:
      case:
-        font.ou: 0 # only upload is counted
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"OU\")": 0 # only upload is counted
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted (identity unconfirmed)
+        "span:contains(\"%25\")": .25 # 75% free
+        "span:contains(\"%50\")": .5 # 50% free
+        "span:contains(\"%75\")": .75 # 25% free
        "*": 1
    uploadvolumefactor:
      case:
-        "font.mu:contains(\"2x\")": 2
-        "font.mu:contains(\"5x\")": 5
-        "font.mu:contains(\"10x\")": 10
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"2x\")": 2
+        "span:contains(\"5x\")": 5
+        "span:contains(\"10x\")": 10
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
        "*": 1
    minimumseedtime:
      # 2 day (as seconds = 2 x 24 x 60 x 60)
--- a/src/Jackett.Common/Definitions/bithumen.yml
+++ b/src/Jackett.Common/Definitions/bithumen.yml
@@ -64,7 +64,7 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    incldead: 1

  rows:
@@ -123,7 +123,7 @@ search:
    size:
      selector: td:nth-child(6) > u
    downloadvolumefactor:
-      text: "1"
+      text: 1
    downloadvolumefactor:
      optional: true
      selector: td:nth-child(6) > nobr > font:contains(" × ")
@@ -131,7 +131,7 @@ search:
        - name: replace
          args: ["×", ""]
    uploadvolumefactor:
-      text: "1"
+      text: 1
    uploadvolumefactor:
      optional: true
      selector: td:nth-child(5) > nobr > font:contains(" × ")
--- a/src/Jackett.Common/Definitions/bitru.yml
+++ b/src/Jackett.Common/Definitions/bitru.yml
@@ -6,7 +6,9 @@ language: ru-ru
 type: public
 encoding: UTF-8
 links:
-  - http://bitru.org/ # site forces http, https is not supported
+  - https://bitru.org/
+legacylinks:
+  - http://bitru.org/ # site forces https

 caps:
  categorymappings:
@@ -30,12 +32,9 @@ caps:

 settings:
  - name: adverts
-    type: select
+    type: checkbox
    label: Include Advertising
-    default: _
-    options:
-      _: yes
-      no: no
+    default: true
  - name: sort
    type: select
    label: Sort requested from site
@@ -50,8 +49,8 @@ search:
    - path: browse.php
  inputs:
    s: "{{ .Keywords }}"
-    rek: "{{ re_replace .Config.adverts \"_\" \"\" }}"
    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
+    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"

  rows:
    selector: table.browse-list > tbody > tr
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -12,7 +12,6 @@ legacylinks:

 caps:
  categorymappings:
-    - {id: 69, cat: Movies, desc: "BiTTuRK Altın"}
    - {id: 56, cat: Movies, desc: "BTRG"}
    - {id: 57, cat: Movies, desc: "Yerli Dizi"}
    - {id: 62, cat: Movies, desc: "Yab@ncı Dizi"}
@@ -21,12 +20,15 @@ caps:
    - {id: 66, cat: Movies/HD, desc: "x265"}
    - {id: 67, cat: XXX, desc: "XxX"}
    - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
+    - {id: 71, cat: Movies, desc: "NFLIX"}
    - {id: 58, cat: Movies, desc: "Film"}
    - {id: 72, cat: Movies, desc: "Belgesel"}
    - {id: 60, cat: Movies/3D, desc: "3D"}
-    - {id: 45, cat: Movies, desc: "Eğitim / Prog "}
+    - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
+    - {id: 45, cat: Movies, desc: "Eğitim / Prog"}
    - {id: 1, cat: Movies, desc: "Filmler"}
    - {id: 14, cat: Movies/3D, desc: "3D Film"}
+    - {id: 77, cat: Movies/UHD, desc: "4K UHD"}
    - {id: 16, cat: Movies, desc: "Animasyon"}
    - {id: 17, cat: TV/Anime, desc: "Anime"}
    - {id: 31, cat: Movies, desc: "Belgesel"}
@@ -48,7 +50,9 @@ caps:
    - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
    - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
    - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 6, cat: PC, desc: "Program / Misc "}
+    - {id: 74, cat: PC, desc: "PC"}
+    - {id: 73, cat: Console, desc: "SONY-PS"}
+    - {id: 6, cat: PC, desc: "Program"}
    - {id: 47, cat: Other, desc: "Resimler"}
    - {id: 48, cat: TV, desc: "Televizyon"}
    - {id: 49, cat: TV/HD, desc: "Tv HD"}
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -74,13 +74,12 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    keywords: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
    tvdb: "{{ .Query.TVDBID }}"
-    view: list
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
@@ -90,6 +89,7 @@ search:
    direction: "{{ .Config.type }}"
    qty: 100
    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -115,7 +115,9 @@ search:
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -191,4 +193,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 3.0.0b
+# UNIT3D 4.0.0b
--- a/src/Jackett.Common/Definitions/brasiltracker.yml
+++ b/src/Jackett.Common/Definitions/brasiltracker.yml
@@ -133,8 +133,8 @@ search:
        - name: append
          args: " {{ .Result.title_details }}"
    minimumratio:
-      text: 0.6
+      text: 1.0
    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # Project Gazelle
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://btdb.eu/
-  - https://btdb.unblockit.app/
+  - https://btdb.unblockit.dev/
 legacylinks:
  - https://btdb.to/
  - https://btdb.unblocked.app/
@@ -29,6 +29,7 @@ legacylinks:
  - https://btdb.uk-unblock.pro/
  - https://btdb.unblockit.top/
  - https://btdb.unblockit.lat/
+  - https://btdb.unblockit.app/

 caps:
  categories:
@@ -57,11 +58,11 @@ settings:

 search:
  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=2"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=3"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=4"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=5"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=2"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=3"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=4"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=5"

  rows:
    selector: div.media
--- a/src/Jackett.Common/Definitions/btgigs.yml
+++ b/src/Jackett.Common/Definitions/btgigs.yml
@@ -1,148 +0,0 @@
---
-id: btgigs
-name: BTGigs
-description: "BTGigs (TG) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: private
-encoding: ISO-8859-2
-links:
-  - https://btgigs.info/
-
-caps:
-  categorymappings:
-    - {id: 36, cat: Audio/Audiobook, desc: "aBooki"}
-    - {id: 27, cat: TV/Anime, desc: "Anime"}
-    - {id: 1, cat: PC, desc: "Aplikacje PC"}
-    - {id: 10, cat: Books/EBook, desc: "eBooki"}
-    - {id: 34, cat: Movies/BluRay, desc: "Filmy/BR"}
-    - {id: 4, cat: Movies/SD, desc: "Filmy/DVD-R"}
-    - {id: 31, cat: Movies/HD, desc: "Filmy/HD Rip"}
-    - {id: 17, cat: Movies/Other, desc: "Filmy/Inne"}
-    - {id: 35, cat: Movies/UHD, desc: "Filmy/UHD"}
-    - {id: 20, cat: Movies/SD, desc: "Filmy/XviD"}
-    - {id: 21, cat: Console, desc: "Gry/konsole"}
-    - {id: 7, cat: PC/Games, desc: "Gry/PC ISO"}
-    - {id: 12, cat: PC/Games, desc: "Gry/PC Rips"}
-    - {id: 28, cat: Other, desc: "GSM/PDA"}
-    - {id: 19, cat: Audio/Video, desc: "Koncerty/Teledyski"}
-    - {id: 32, cat: Audio/Lossless, desc: "musicDVD/DTS/FLAC"}
-    - {id: 5, cat: Audio/MP3, desc: "Muzyka/MP3"}
-    - {id: 26, cat: Other, desc: "Rozne"}
-    - {id: 30, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: TV, desc: "TV/Seriale"}
-    - {id: 37, cat: TV/UHD, desc: "TV/UHD"}
-    - {id: 29, cat: PC, desc: "Witaminki"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: lang
-    type: checkbox
-    label: Add POLISH to title if is in polish category
-    default: false
-
-login:
-  path: takelogin_action.php
-  method: post
-  inputs:
-    username_dupa: "{{ .Config.username }}"
-    password__dupa: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-  test:
-    selector: a[href^="logout.php"]
-    path: index.php?news=1
-
-search:
-  paths:
-    - path: browse.php
-  error:
-    - selector: a.altlink
-  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    tyt: 0
-    lang: 0
-    subcat: 0
-
-  rows:
-    selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    is_polish:
-      optional: true
-      selector: img[src*="cat_pl"]
-      attribute: src
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_polish:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: append
-          args: " POLISH"
-    title:
-      text: "{{ if and (.Config.lang) (.Result.is_polish) }}{{ .Result.title_polish }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php/"]
-      attribute: href
-    description:
-      optional: true
-      selector: img[src^="/pic/cat_pl/"]
-      attribute: src
-      filters:
-        - name: append
-          args: "Language: polish\n<br>"
-        - name: prepend
-          args: "{{ .Result.description }}"
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    grabs:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: (\d+)
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        "img[src=\"pic/ico_disk1.png\"]": 0
-        "img[src=\"pic/ico_disk2.png\"]": 1
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -40,6 +40,10 @@ settings:
    type: checkbox
    label: Search freeleech only
    default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: info_tpp
    type: info
    label: Results Per Page
@@ -58,7 +62,7 @@ search:
    - path: torrents.php
  inputs:
    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    # 0 incldead, 1 active, 2 justdead
    incldead: 0
    # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
@@ -119,6 +123,8 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumratio:
+      text: 1.0
    description:
      selector: td:nth-child(2)
      remove: a, img
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/src/Jackett.Common/Definitions/btsow.yml
@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.work/
+  - https://btsow.cam/
 legacylinks:
  - https://btos.pw/
  - https://btio.pw/
@@ -20,6 +20,9 @@ legacylinks:
  - https://btsow.casa/
  - https://btsow.website/
  - https://btsow.online/
+  - https://btsow.work/
+  - https://btsow.store/
+  - https://btsow.surf/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/src/Jackett.Common/Definitions/carpathians.yml
@@ -11,22 +11,20 @@ links:
 caps:
  categorymappings:
    - {id: 186, cat: Books, desc: "E-book"}
-    - {id: 194, cat: Movies/SD, desc: "Film/CAM/Hun"}
+    - {id: 199, cat: Movies/SD, desc: "Film/Bluray/Hun"}
+    - {id: 194, cat: Movies/SD, desc: "Film/CAM"}
    - {id: 60, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
    - {id: 10, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
    - {id: 20, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
    - {id: 181, cat: Movies/HD, desc: "Film/HD/Eng"}
    - {id: 183, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 200, cat: Movies/HD, desc: "Film/UHD/Hun"}
    - {id: 192, cat: Movies/HD, desc: "Film/x264/Eng"}
    - {id: 190, cat: Movies/HD, desc: "Film/x264/Hun"}
    - {id: 70, cat: Movies/SD, desc: "Film/XviD/Eng"}
    - {id: 30, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 140, cat: PC/Games, desc: "Játék/DOX"}
-    - {id: 130, cat: PC/Games, desc: "Játék/PCiso"}
-    - {id: 160, cat: Console/PS3, desc: "Játék/PS2-PS3"}
-    - {id: 189, cat: Console/PSP, desc: "Játék/PSP"}
-    - {id: 184, cat: Console/Wii, desc: "Játék/Wii"}
-    - {id: 150, cat: Console/XBox, desc: "Játék/XBOX (XBOX360)"}
+    - {id: 150, cat: Console, desc: "Játék/Konzol"}
+    - {id: 130, cat: PC/Games, desc: "Játék/PC"}
    - {id: 182, cat: Audio/Lossless, desc: "Lossless"}
    - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"}
    - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"}
@@ -82,8 +80,8 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 both 1 only active 2 only dead
+    search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both, 1 only active, 2 only dead
    incldead: 0
    onlyname: 1
    onlyname2: true
@@ -158,4 +156,9 @@ search:
        img[src="pic/double.png"]: 2
        img[src="pic/doubledouble2.png"]: 4
        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TBDev & XBTT
--- a/src/Jackett.Common/Definitions/channelx.yml
+++ b/src/Jackett.Common/Definitions/channelx.yml
@@ -73,7 +73,7 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -81,10 +81,13 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -109,8 +112,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
--- a/src/Jackett.Common/Definitions/chilebt.yml
+++ b/src/Jackett.Common/Definitions/chilebt.yml
@@ -24,8 +24,8 @@ caps:

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
    music-search: [q]
    book-search: [q]

@@ -82,17 +82,18 @@ search:
    - path: filterTorrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -117,8 +118,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -133,6 +138,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
--- a/src/Jackett.Common/Definitions/cinemamovies.yml
+++ b/src/Jackett.Common/Definitions/cinemamovies.yml
@@ -1,7 +1,7 @@
 ---
 id: cinemamovies
-name: CinemaMovies
-description: "CinemaMovies is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+name: CinemaMovieS_ZT
+description: "CinemaMovieS_ZT is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pl-pl
 type: private
 encoding: ISO-8859-2
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -74,7 +74,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Query.Keywords }}"
    incldead: "{{ .Config.incldead }}"
    srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -35,10 +35,12 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
+
  rows:
    selector: table > tbody > tr:has(a[href^="torrents.php?cat="])
+
  fields:
    category:
      text: 1
@@ -60,8 +62,7 @@ search:
    leechers:
      selector: td:nth-child(9)
    downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -0,0 +1,236 @@
+---
+id: coastalcrew
+name: Coastal-Crew
+description: "Coastal-Crew is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://coastal-crew.bounceme.net/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Movie - Xvid/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Movie - 720p/1080p"}
+    - {id: 130, cat: Movies, desc: "Movie - Pack"}
+    - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
+    - {id: 154, cat: Movies/UHD, desc: "Movie - UHD/4K"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien - Xvid/x264"}
+    - {id: 157, cat: TV/HD, desc: "Serien - 720p/1080p"}
+    - {id: 57, cat: TV/SD, desc: "Serien - Pack/SD"}
+    - {id: 59, cat: TV/HD, desc: "Serien - Pack/720p"}
+    - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
+    - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Xvid/x264"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku - 720p/1080p"}
+    - {id: 13, cat: TV/Documentary, desc: "Doku - Pack"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App - Win"}
+    - {id: 11, cat: PC, desc: "App - Other"}
+    - {id: 10, cat: PC/Mac, desc: "App - Mac"}
+    - {id: 9, cat: PC/Mobile-Android, desc: "App - Linux/Android"}
+    # Game
+    - {id: 131, cat: Console, desc: "Game - Nintendo"}
+    - {id: 17, cat: PC/Games, desc: "Game - PC"}
+    - {id: 18, cat: Console, desc: "Game - PS"}
+    - {id: 24, cat: Console/Other, desc: "Game - Wimmelbild"}
+    # Music
+    - {id: 48, cat: Audio/MP3, desc: "Music - mp3"}
+    - {id: 53, cat: Audio/Lossless, desc: "Music - Flac"}
+    - {id: 52, cat: Audio, desc: "Music - Pack"}
+    - {id: 109, cat: Audio/Video, desc: "Music - Video-HD/SD"}
+    # Sport
+    - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
+    # Sonstiges
+    - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
+    - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
+    - {id: 69, cat: Books, desc: "Sonstiges - Tutorial"}
+    - {id: 71, cat: Books/Other, desc: "Sonstiges - Other"}
+    # Kinder
+    - {id: 102, cat: Movies, desc: "Kinder - Alles"}
+    # XXX
+    - {id: 113, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 76, cat: XXX, desc: "XXX - HD-SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX - Pack"}
+    # Request
+    - {id: 151, cat: Other, desc: "Request - spritti01"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+    loggiin: "einloggen"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+download:
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: thanks
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    search: "{{ .Keywords }}"
+    blah: "0"
+    orderby: "added"
+    sort: "desc"
+  rows:
+    selector: div.selection_wrap
+  fields:
+    title:
+      selector: a.selection_a
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a.selection_a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    category:
+      selector: div.kat_cat_pic
+      case:
+        # Movie
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "28"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "32"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "130"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "155"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "154"
+        # Serien
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "60"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "157"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/SD\"))": "57"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/720p\"))": "59"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
+        # Doku
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "15"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "14"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "13"
+        # App
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": "9"
+        # Game
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": "131"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "24"
+        # Music
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "53"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": "109"
+        # Sport
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
+        # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Tutorial\"))": "69"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
+        # Kinder
+        ":has(div.kat_cat_pic_name:contains(\"Kinder\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "102"
+        # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "113"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": "76"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
+        # Request
+        ":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": "151"
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ag
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    grabs:
+      text: 0
+    seeders:
+      selector: div.selection_unter_aa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    leechers:
+      selector: div.selection_unter_aaa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    date:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+    date:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    description:
+      selector: selection_unter_af
+      optional: true
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine tbd
--- a/src/Jackett.Common/Definitions/concertos.yml
+++ b/src/Jackett.Common/Definitions/concertos.yml
@@ -74,7 +74,7 @@ search:
    - path: torrents
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    title: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    title: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    imdb: "{{ .Query.IMDBIDShort }}"
    freeleech: "{{ if .Config.freeleech }}on{{ else }}{{ end }}"
    order_by: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/cooltorrent.yml
+++ b/src/Jackett.Common/Definitions/cooltorrent.yml
@@ -1,136 +0,0 @@
---
-id: cooltorrent
-name: cool-torrent
-description: "cool-torrent is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: semi-private
-encoding: UTF-8
-links:
-  - http://cool-torrent.pl/
-legacylinks:
-  - https://cool-torrent.pl/ # NET::ERR_CERT_COMMON_NAME_INVALID
-
-caps:
-  categorymappings:
-    - {id: "Filmy XviD", cat: Movies/SD, desc: "Filmy XviD/DivX"}
-    - {id: "BluRay", cat: Movies/HD, desc: "BluRay/x264 720p"}
-    - {id: "Filmy x264", cat: Movies/HD, desc: "Filmy x264/h264"}
-    - {id: "Filmy HD 1080p AVC", cat: Movies/HD, desc: "Filmy HD 1080p AVC"}
-    - {id: "Filmy x265", cat: Movies/HD, desc: "Filmy x265/h265"}
-    - {id: "Filmy 4K UHD", cat: Movies/UHD, desc: "Filmy 4K UHD"}
-    - {id: "Filmy DVD", cat: Movies/DVD, desc: "Filmy DVD"}
-    - {id: "Filmy 3D", cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: "Filmy RMVB", cat: Movies, desc: "Filmy RMVB"}
-    - {id: "Filmy IVO", cat: Movies, desc: "Filmy IVO"}
-    - {id: "Filmy TS", cat: Movies/SD, desc: "Filmy TS/CAM"}
-    - {id: "TV", cat: TV, desc: "TV/Seriale"}
-    - {id: "Erotyka", cat: XXX, desc: "Erotyka"}
-    - {id: "Muzyka", cat: Audio, desc: "Muzyka"}
-    - {id: "Programy", cat: PC, desc: "Programy"}
-    - {id: "GSM", cat: PC/Mobile-Other, desc: "GSM/PDA"}
-    - {id: "Konsole", cat: Console, desc: "Konsole"}
-    - {id: "Gry PC", cat: PC/Games, desc: "Gry PC"}
-    - {id: "Dla Dzieci", cat: Movies, desc: "Dla Dzieci"}
-    - {id: "Książki", cat: Books, desc: "Książki"}
-    - {id: "Linux", cat: PC, desc: "Linux"}
-    - {id: "Mac", cat: PC/Mac, desc: "Mac"}
-    - {id: "Sport", cat: TV/Sport, desc: "Sport"}
-    - {id: "Inne", cat: Other, desc: "Inne"}
-    - {id: "Anime", cat: TV/Anime, desc: "Anime"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: /
-  error:
-    - selector: table[class="main-2"][cellpadding="10"]:has(b:contains("Błąd"))
-  test:
-    path: /
-    selector: a[href$="logout.php"]
-
-search:
-  paths:
-    # http://cool-torrent.pl/szukaj.php?form-display-time=1&search=&cat=0
-    - path: szukaj.php
-  inputs:
-    form-display-time: 1
-    # does not support multi cat search
-    cat: 0
-    search: "{{ .Keywords }}"
-    # does not support imdbid searching and does not display imdb links in results
-
-  rows:
-    selector: table.test5 > tbody > tr > td > div[id]:has(a[href*="/download/"])
-
-  fields:
-    category:
-      selector: a[href^="files/"]
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 1]
-    title:
-      selector: a[href^="/torrent/"]
-      attribute: title
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    poster:
-      selector: img.browse_poster
-      attribute: src
-    date:
-      selector: td.descr3
-      remove: br
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: (\d{1,4}\.\d{2}\s[K|M|G][B])
-    seeders:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Seedów: (\\d+)"
-    leechers:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Peerów: (\\d+)"
-    grabs:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Pobrano: (\\d+)"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/src/Jackett.Common/Definitions/cpabien.yml
@@ -66,6 +66,10 @@ settings:
    type: info
    label: How to get the User-Agent
    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
  - name: info_8000
    type: info
    label: About cpasbien Categories
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -165,10 +165,10 @@ login:
 download:
  before:
    path: thanks.php
-    method: "get"
+    method: get
    inputs:
      id: "{{ .DownloadUri.Query.id }}"
-      to: "give"
+      to: give
      torrent: "{{ .DownloadUri.Query.id }}"
  selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]"
  attribute: href
--- a/src/Jackett.Common/Definitions/darktracker.yml
+++ b/src/Jackett.Common/Definitions/darktracker.yml
@@ -667,7 +667,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
@@ -682,9 +682,9 @@ search:
    prev_df: 1
    prev_ds: 0
    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
+    # 1=asc, 2=desc
    s: "{{ .Config.type }}"
    # show category
    dc: 0
--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/src/Jackett.Common/Definitions/datascene.yml
@@ -103,8 +103,8 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    # 1 active, 2 incldead, 3 onlydead, 4 free
    # note: searching with 4 (freeleech) does not return any results!
    # incldead: "{{ if .Config.freeleech }}4{{ else }}2{{ end }}"
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -10,7 +10,8 @@ links:
  - https://www.demonoid.is/
  - https://www.dnoid.to/
  - https://www.dnoid.pw/
-  - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.dev/
+  - https://demonoid.torrentbay.to/
 legacylinks:
  - https://demonoid.unblockit.pro/
  - https://demonoid.unblockit.one/
@@ -25,6 +26,7 @@ legacylinks:
  - https://demonoid.unblockit.win/
  - https://demonoid.unblockit.top/
  - https://demonoid.unblockit.lat/
+  - https://demonoid.unblockit.app/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/desireleasers.yml
+++ b/src/Jackett.Common/Definitions/desireleasers.yml
@@ -68,7 +68,7 @@ search:
  paths:
    - path: torrents/filter
  inputs:
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -76,10 +76,13 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
-    view: list
    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -103,8 +106,12 @@ search:
      selector: img.tps
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -79,7 +79,7 @@ search:
  paths:
    - path: browse
  inputs:
-    $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
    s_alapjan: 7
    s_sorrend: desc
@@ -89,20 +89,20 @@ search:
    after: 1

  fields:
-    download:
-      selector: div.box_download > a
-      attribute: href
-    title:
-      selector: a.box_name_a > span
-    details:
-      selector: a.box_name_a
-      attribute: href
    category:
      selector: div.box_category > img
      attribute: onclick
      filters:
        - name: regexp
          args: "category\\((\\d+),\\d+\\);"
+    title:
+      selector: a.box_name_a > span
+    details:
+      selector: a.box_name_a
+      attribute: href
+    download:
+      selector: div.box_download > a
+      attribute: href
    seeders:
      selector: div.box_seeders
    leechers:
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -20,6 +20,10 @@ caps:
    - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"}
    - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"}
    - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"}
+    - {id: 91, cat: Movies/HD, desc: "BDRip x264"}
+    - {id: 89, cat: Movies/HD, desc: "BDRemux"}
+    - {id: 88, cat: Movies/HD, desc: "Full HD"}
+    - {id: 90, cat: Movies/UHD, desc: "UHD Full"}
    - {id: 23, cat: TV/Sport, desc: "Deportes"}
    - {id: 20, cat: TV/HD, desc: "Series"}
    - {id: 31, cat: TV/HD, desc: "Series VOSE"}
@@ -31,25 +35,15 @@ caps:
    - {id: 74, cat: Movies, desc: "Saga Crepúsculo"}
    - {id: 75, cat: Movies, desc: "Saga The Purge"}
    - {id: 79, cat: Movies, desc: "Saga Star Wars"}
-    - {id: 18, cat: Movies/BluRay, desc: "Video Full & Remux"}
    - {id: 76, cat: Movies, desc: "x-men saga"}
+    - {id: 85, cat: Movies, desc: "Sean Connery"}
    - {id: 6, cat: Books/EBook, desc: "EBooks"}
    - {id: 58, cat: Books/EBook, desc: "Kiosko"}
    - {id: 24, cat: TV/Documentary, desc: "Documentales"}
    - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"}
    - {id: 49, cat: Books/EBook, desc: "eLearning"}
-    - {id: 68, cat: TV, desc: "eLearning Multimedia"}
-    - {id: 16, cat: Movies/DVD, desc: "DVD-Rip"}
-    - {id: 48, cat: Movies/BluRay, desc: "BR-Rip/HD-Rip"}
-    - {id: 17, cat: Movies/BluRay, desc: "BD-Rip"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 34, cat: PC/Games, desc: "Juegos PC"}
-    - {id: 7, cat: PC/0day, desc: "Software PC"}
-    - {id: 35, cat: Console, desc: "Juegos Sony"}
-    - {id: 36, cat: PC/Games, desc: "Juegos Microsoft"}
-    - {id: 37, cat: Console/NDS, desc: "Juegos Nintendo"}
-    - {id: 45, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 44, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 68, cat: Books/EBook, desc: "eLearning Multimedia"}
+    - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/dmhy.yml
+++ b/src/Jackett.Common/Definitions/dmhy.yml
@@ -29,14 +29,23 @@ caps:
    - {id: 21, cat: Console, desc: "遊戲周邊 (game periphery)"}
    - {id: 12, cat: Other/Misc, desc: "特攝 (special photo)"}
    - {id: 1, cat: Other, desc: "其他 (other)"}
+    # Anime as Movies (Radarr uses t=movie):
+    - {id: 2, cat: Movies/Other, desc: "動畫 (Anime)"}
+    - {id: 31, cat: Movies/Other, desc: "季度全集 (Quarterly Complete)"}
+    - {id: 7, cat: Movies/Other, desc: "RAW"}

  modes:
    search: [q]
    tv-search: [q]
+    movie-search: [q]
    music-search: [q]
    book-search: [q]

-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.

 search:
  paths:
@@ -47,14 +56,11 @@ search:
    sort_id: 0
    order: date-desc
    team_id: 0
+
  rows:
    selector: table tbody tr:has(a[href^="magnet:?"])
+
  fields:
-    date:
-      selector: td:nth-child(1) span
-      filters:
-        - name: dateparse
-          args: "2006/01/02 15:04"
    category:
      selector: td:nth-child(2) a
      attribute: href
@@ -69,6 +75,13 @@ search:
    download:
      selector: a[href^="magnet:?"]
      attribute: href
+    date:
+      selector: td:nth-child(1) span
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006/01/02 15:04 -07:00"
    size:
      selector: td:nth-child(5)
    seeders:
--- a/src/Jackett.Common/Definitions/documentarytorrents.yml
+++ b/src/Jackett.Common/Definitions/documentarytorrents.yml
@@ -1,177 +0,0 @@
---
-id: documentarytorrents
-name: DocumentaryTorrents
-description: "Documentary Torrents (DT) is a Private Torrent Tracker for E-LEARNING MOVIES / TV"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - http://www.documentarytorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 128, cat: TV/HD, desc: "Adventure: HD"}
-    - {id: 129, cat: TV/SD, desc: "Adventure: Xvid / x264"}
-    - {id: 85, cat: TV/SD, desc: "Biography: Xvid / x264"}
-    - {id: 86, cat: TV/HD, desc: "Biography: HD"}
-    - {id: 60, cat: TV/HD, desc: "Computers: HD"}
-    - {id: 58, cat: TV/SD, desc: "Computers: Xvid / x264"}
-    - {id: 103, cat: TV/SD, desc: "Crime: Xvid / x264"}
-    - {id: 105, cat: TV/HD, desc: "Crime: HD"}
-    - {id: 64, cat: TV/SD, desc: "Culture: Xvid / x264"}
-    - {id: 66, cat: TV/HD, desc: "Culture: HD"}
-    - {id: 122, cat: TV/SD, desc: "Discovery: Xvid / x264"}
-    - {id: 123, cat: TV/HD, desc: "Discovery: HD"}
-    - {id: 98, cat: TV/HD, desc: "Drugs: HD"}
-    - {id: 97, cat: TV/SD, desc: "Drugs: Xvid / x264"}
-    - {id: 92, cat: TV/HD, desc: "Economy: HD"}
-    - {id: 91, cat: TV/SD, desc: "Economy: Xvid / x264"}
-    - {id: 83, cat: TV/HD, desc: "Food: HD"}
-    - {id: 82, cat: TV/SD, desc: "Food: Xvid / x264"}
-    - {id: 124, cat: TV/HD, desc: "HBO: HD"}
-    - {id: 125, cat: TV/SD, desc: "HBO: Xvid / x264"}
-    - {id: 76, cat: TV/SD, desc: "Health: Xvid / x264"}
-    - {id: 78, cat: TV/HD, desc: "Health: HD"}
-    - {id: 67, cat: TV/SD, desc: "History: Xvid / x264"}
-    - {id: 69, cat: TV/HD, desc: "History: HD"}
-    - {id: 79, cat: TV/SD, desc: "Humor: Xvid / x264"}
-    - {id: 80, cat: TV/HD, desc: "Humor: HD"}
-    - {id: 116, cat: TV/HD, desc: "Music: HD"}
-    - {id: 115, cat: TV/SD, desc: "Music: Xvid / x264"}
-    - {id: 118, cat: TV/HD, desc: "NatGeo: HD"}
-    - {id: 119, cat: TV/SD, desc: "NatGeo: Xvid / x264"}
-    - {id: 63, cat: TV/HD, desc: "Nature: HD"}
-    - {id: 61, cat: TV/SD, desc: "Nature: Xvid / x264"}
-    - {id: 109, cat: TV/SD, desc: "New World Order: Xvid / x264"}
-    - {id: 111, cat: TV/HD, desc: "New World Order: HD"}
-    - {id: 48, cat: TV/HD, desc: "Other: HD"}
-    - {id: 50, cat: TV/HD, desc: "Other: DVD"}
-    - {id: 9, cat: TV/SD, desc: "Other: Xvid / x264"}
-    - {id: 126, cat: TV/HD, desc: "PBS: HD"}
-    - {id: 127, cat: TV/SD, desc: "PBS: Xvid / x264"}
-    - {id: 72, cat: TV/HD, desc: "Politics: HD"}
-    - {id: 112, cat: Books/EBook, desc: "Politics: Ebook"}
-    - {id: 70, cat: TV/SD, desc: "Politics: Xvid / x264"}
-    - {id: 114, cat: Books/EBook, desc: "Reference: Ebook"}
-    - {id: 117, cat: Audio/Audiobook, desc: "Reference: Audio Book"}
-    - {id: 56, cat: TV/HD, desc: "Religion: HD"}
-    - {id: 54, cat: TV/SD, desc: "Religion: Xvid / x264"}
-    - {id: 94, cat: TV/SD, desc: "Science: Xvid / x264"}
-    - {id: 95, cat: TV/HD, desc: "Science: HD"}
-    - {id: 75, cat: TV/HD, desc: "Space: HD"}
-    - {id: 73, cat: TV/SD, desc: "Space: Xvid / x264"}
-    - {id: 113, cat: TV/HD, desc: "Space: DVD"}
-    - {id: 100, cat: TV/SD, desc: "Sports: Xvid / x264"}
-    - {id: 102, cat: TV/HD, desc: "Sports: HD"}
-    - {id: 106, cat: TV/SD, desc: "Technology: Xvid / x264"}
-    - {id: 108, cat: TV/HD, desc: "Technology: HD"}
-    - {id: 121, cat: TV/SD, desc: "Transport: Xvid / x264"}
-    - {id: 120, cat: TV/HD, desc: "Transport: HD"}
-    - {id: 57, cat: TV/HD, desc: "Travel: HD"}
-    - {id: 52, cat: TV/SD, desc: "Travel: Xvid / x264"}
-    - {id: 89, cat: TV/HD, desc: "War: HD"}
-    - {id: 88, cat: TV/SD, desc: "War: Xvid / x264"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: form
-  form: form[action="account-login.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myBlock:has(font.error)
-  test:
-    path: index.php
-    selector: a[href$="/account-logout.php"]
-
-search:
-  paths:
-    # http://documentarytorrents.com/torrents.php?c123=1&c69=1&c67=1&c89=1&c88=1&search=grow+old&cat=0&incldead=1&freeleech=0&lang=0
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 english, 2 french, etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.ttable_headinner tr.t-row
-    filters:
-      - name: andmatch
-
-  fields:
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    title:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech_star.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.4
-# TorrentTrader v2-svn
--- a/src/Jackett.Common/Definitions/dragonworldreloaded.yml
+++ b/src/Jackett.Common/Definitions/dragonworldreloaded.yml
@@ -12,62 +12,45 @@ caps:
  categorymappings:
    # Kino
    - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
+    - {id: 141, cat: Movies/HD, desc: "Kino - Blu-Ray/ 4K"}
    - {id: 4, cat: Movies/SD, desc: "Kino - SD"}
    # Movies
-    - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
-    - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
-    - {id: 22, cat: Movies/DVD, desc: "Movies - DVD/HD2"}
-    - {id: 52, cat: Movies, desc: "Movies - Kids"}
+    - {id: 139, cat: Movies/3D, desc: "Movies - 3D"}
    - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray"}
+    - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray/ 4K"}
+    - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
    # Serien
-    - {id: 40, cat: TV/SD, desc: "Serien - SD"}
    - {id: 41, cat: TV/HD, desc: "Serien - HD"}
-    - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
+    - {id: 40, cat: TV/SD, desc: "Serien - SD"}
    - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
+    - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
    # Musik
    - {id: 119, cat: Audio, desc: "Musik - Alben"}
    - {id: 5, cat: Audio/MP3, desc: "Musik - Mp3"}
-    - {id: 6, cat: Audio, desc: "Musik - Mixe"}
    - {id: 92, cat: Audio, desc: "Musik - Discography"}
-    - {id: 114, cat: Audio, desc: "Musik - Musik Pack"}
-    - {id: 48, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 136, cat: Audio/Video, desc: "Musik - Videos"}
    # Doku
-    - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
    - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
-    - {id: 81, cat: TV/Documentary, desc: "Doku - Pack "}
-    # Anime
-    - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 74, cat: TV/Anime, desc: "Anime - Serien"}
+    - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
    # Games
+    - {id: 140, cat: Console, desc: "Games - Nintendo/Sonstige"}
    - {id: 16, cat: PC/Games, desc: "Games - PC"}
    - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
-    - {id: 7, cat: Console/PSP, desc: "Games - PSP"}
-    - {id: 17, cat: Console/PS3, desc: "Games - PS2/PS3"}
-    - {id: 29, cat: Console/NDS, desc: "Games - NDS/3DS"}
-    - {id: 15, cat: Console/Wii, desc: "Games - Wii"}
-    - {id: 8, cat: Console/XBox, desc: "Games - XboX "}
    # Appz
    - {id: 30, cat: PC/0day, desc: "Appz - Windows"}
-    - {id: 31, cat: PC/0day, desc: "Appz - Linux"}
-    - {id: 32, cat: PC/Mac, desc: "Appz - Mac"}
    - {id: 106, cat: PC/Mobile-Android, desc: "Appz - Android"}
+    - {id: 138, cat: PC/0day, desc: "Appz - Sonstiges"}
    # Sport
    - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
    - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
    # Sonstiges
-    - {id: 34, cat: Books, desc: "Sonstiges - E-Books"}
+    - {id: 36, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 34, cat: Books/EBook, desc: "Sonstiges - E-Books"}
    - {id: 35, cat: Audio/Audiobook, desc: "Sonstiges - Audiobook"}
-    - {id: 36, cat: Other, desc: "Sonstiges - Diverses"}
    # XXX
-    - {id: 46, cat: XXX, desc: "XXX - SD"}
-    - {id: 47, cat: XXX, desc: "XXX - HD"}
-    - {id: 45, cat: XXX, desc: "XXX - Pack"}
+    - {id: 47, cat: XXX, desc: "XXX - SD/HD"}
    - {id: 49, cat: XXX, desc: "XXX - Sonstiges"}
-    - {id: 110, cat: XXX, desc: "XXX - Hentai Serie"}
-    - {id: 111, cat: XXX, desc: "XXX - Hentai Movie"}
-    - {id: 116, cat: XXX, desc: "XXX - SexBooks"}

  modes:
    search: [q]
@@ -109,11 +92,11 @@ login:
 download:
  before:
    path: ajax_det_poll.php
-    method: "post"
+    method: post
    inputs:
-      set_thanks: "thanks"
+      set_thanks: thanks
      det_id: "{{ .DownloadUri.Query.torrent }}"
-      ajax: "yes"
+      ajax: yes

 search:
  paths:
@@ -126,78 +109,61 @@ search:
  rows:
    selector: div.selection_wrap
  fields:
+    title:
+      selector: a.selection_a
+    details:
+      selector: a.selection_a
+      attribute: href
    download:
      selector: a.selection_a
      attribute: href
      filters:
        - name: replace
          args: ["details.php?id=", "download.php?torrent="]
-    title:
-      selector: a.selection_a
-    details:
-      selector: a.selection_a
-      attribute: href
    category:
      selector: div.kat_cat_pic
      case:
        # Kino
        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "118"
+        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray/ 4K\"))": "141"
        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "4"
        # Movies
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"DVD/HD2\"))": "22"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Kids\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "139"
        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "19"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "25"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray\"))": "26"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray/ 4K\"))": "26"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
        # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "41"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": "80"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
        # Musik
        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Alben\"))": "119"
        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mp3\"))": "5"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "6"
        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": "92"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Musik Pack\"))": "114"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "136"
        # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "38"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack \"))": "81"
-        # Anime
-        ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Movies\"))": "73"
-        ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Serien\"))": "74"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
        # Games
+        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo/Sonstige\"))": "140"
        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "16"
        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "14"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PSP\"))": "7"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PS2/PS3\"))": "17"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"NDS/3DS\"))": "29"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wii\"))": "15"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"XboX \"))": "8"
        # Appz
        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": "30"
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Linux\"))": "31"
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "32"
        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": "106"
+        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "138"
        # Sport
        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "43"
        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "50"
        # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "36"
        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Books\"))": "34"
        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Audiobook\"))": "35"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": "36"
        # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "46"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "47"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "45"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD/HD\"))": "47"
        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "49"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Serie\"))": "110"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Movie\"))": "111"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SexBooks\"))": "116"
    poster:
      selector: div[id^="details"] img
      attribute: src
@@ -231,13 +197,6 @@ search:
          args: [".", ""]
        - name: replace
          args: [",", "."]
-    downloadvolumefactor:
-      case:
-        ":root:has(div.onlyup)": "0"
-        "*": "1"
-    uploadvolumefactor:
-      case:
-        "*": "1"
    date:
      # Heute 13:30:04
      # Gestern 09:10:10
@@ -255,8 +214,22 @@ search:
      filters:
        - name: replace
          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "02.01.2006 15:04:05"
+          args: "02.01.2006 15:04:05 -07:00"
    description:
      selector: selection_unter_af
      optional: true
+    downloadvolumefactor:
+      case:
+        ":root:has(div.onlyup)": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
+# engine tbd
--- a/src/Jackett.Common/Definitions/dxdhd.yml
+++ b/src/Jackett.Common/Definitions/dxdhd.yml
@@ -25,8 +25,8 @@ caps:

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
    music-search: [q]
    book-search: [q]

@@ -81,18 +81,21 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -117,8 +120,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -133,6 +140,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
--- a/src/Jackett.Common/Definitions/dxp.yml
+++ b/src/Jackett.Common/Definitions/dxp.yml
@@ -16,22 +16,18 @@ caps:
    - {id: 12, cat: Movies/Other, desc: "Мультфильмы"}
    - {id: 9, cat: TV/Documentary, desc: "Документальные"}
    - {id: 11, cat: TV, desc: "Сериалы"}
-
    - {id: 10, cat: Audio, desc: "Музыка"}
    - {id: 16, cat: Books, desc: "Книги"}
    - {id: 22, cat: Other, desc: "Картинки"}
-
    - {id: 1, cat: PC, desc: "Приложения Windows"}
    - {id: 3, cat: PC, desc: "Приложения Unix/Linux"}
    - {id: 4, cat: PC/Mac, desc: "Приложения Mac"}
    - {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"}
-
    - {id: 5, cat: PC/Games, desc: "Игры PC"}
    - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"}
    - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"}
    - {id: 7, cat: Console/XBox, desc: "Игры X-Box"}
    - {id: 8, cat: Console/PSP, desc: "Игры PSP"}
-
    - {id: 18, cat: Other, desc: "Эксклюзивы"}
    - {id: 21, cat: Other, desc: "Лавка субтитров"}
    - {id: 20, cat: Other, desc: "DEMO"}
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -314,7 +314,7 @@ search:
  paths:
    - path: torrents-search.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
    # 0 only active 1 incl dead 2 only dead
    incldead: 0
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -93,7 +93,7 @@ search:
  paths:
    - path: torrents.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    searchtext: ""
    title: "{{ .Keywords }}"
    order_by: time
@@ -112,6 +112,7 @@ search:
      selector: a[href^="/torrents.php?action=download&id="]
      attribute: href
    description:
+      optional: true
      selector: div.tags
    title:
      selector: a[href^="/torrents.php?id="]
--- a/src/Jackett.Common/Definitions/empornium2fa.yml
+++ b/src/Jackett.Common/Definitions/empornium2fa.yml
@@ -89,7 +89,7 @@ search:
  paths:
    - path: torrents.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    searchtext: ""
    title: "{{ .Keywords }}"
    order_by: time
@@ -108,6 +108,7 @@ search:
      selector: a[href^="/torrents.php?action=download&id="]
      attribute: href
    description:
+      optional: true
      selector: div.tags
    title:
      selector: a[href^="/torrents.php?id="]
--- a/src/Jackett.Common/Definitions/emtrek.yml
+++ b/src/Jackett.Common/Definitions/emtrek.yml
@@ -10,6 +10,7 @@ links:

 caps:
  categorymappings:
+    # when refreshing categories remember to use the list on the tracker.php page and not the search.php page.
    # Игры для PC (pc games)
    - {id: 317, cat: PC/Games, desc: "Игры для Linux"}
    - {id: 174, cat: PC/Games, desc: " |- Патчи"}
@@ -192,6 +193,9 @@ caps:
    - {id: 121, cat: Other, desc: "Обои / Рисунки / Картинки"}
    # Корзина (other)
    - {id: 2, cat: Other, desc: "Для пробных раздач"}
+    # the following forums are not in the tracker pull down list.
+    # Архив (archive)
+    - {id: 20, cat: Other, desc: "Архив"}

  modes:
    search: [q]
@@ -221,7 +225,7 @@ search:
  paths:
    - path: tracker.php
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
@@ -236,9 +240,9 @@ search:
    prev_df: 1
    prev_ds: 0
    prev_tor_type: 0
-    # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
    o: "{{ .Config.sort }}"
-    # 1=asc 2=desc
+    # 1=asc, 2=desc
    s: "{{ .Config.type }}"
    # show category
    dc: 0
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -90,7 +90,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 0
    prev_a: 0
    prev_dla: 0
--- a/src/Jackett.Common/Definitions/epizod.yml
+++ b/src/Jackett.Common/Definitions/epizod.yml
@@ -45,6 +45,10 @@ settings:
    type: checkbox
    label: Replace VOSTFR with ENGLISH
    default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.

 download:
  selector: a[href^="magnet:?xt="]
@@ -57,28 +61,49 @@ search:
  inputs:
    s: "{{ .Keywords }}"

+  headers:
+    # Windows User-Agent is required, Linux is blocked
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
+
  rows:
-    selector: article:not(:has(a[title="DMCA"]))
+    selector: li[class^="ilovewp-post"]:not(:has(a[title="DMCA"]))

  fields:
-    category:
-      text: other
-    category|noappend:
+    category1:
      selector: a[href*="/category/"]
      attribute: href
      optional: true
      filters:
        - name: split
          args: ["/", 4]
+    category2:
+      selector: li[class^="ilovewp-post"]
+      attribute: class
+      optional: true
+      filters:
+        - name: regexp
+          args: "category-(.+?) "
+    category3:
+      selector: img[src*="img"]
+      attribute: src
+      optional: true
+      filters:
+        - name: regexp
+          args: "img/(.+?)_"
+        - name: replace
+          args: ["ebooks", "ebook"]
+    category:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
+    sizecat:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
    site_date:
-      selector: div.post-cover > a
-      attribute: title
+      selector: time > a
      filters:
        # year can be at the end of the title, so we get it and name it site_date
        - name: regexp
          args: "(19|20\\d{2})$"
    title_phase1:
-      selector: div.post-cover > a
+      selector: time > a
      attribute: title
      filters:
        # now we put the date at the right place according scene naming rules using .Result.site_date
@@ -112,10 +137,10 @@ search:
    title:
      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
    details:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
      attribute: href
    download:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
      attribute: href
    poster:
      selector: img[data-lazy-src]
@@ -128,17 +153,8 @@ search:
          args: ["T", " "]
        - name: dateparse
          args: "2006-01-02 15:04:05-07:00"
-    cat:
-      selector: a[href*="/category/"]
-      attribute: href
-      optional: true
-      filters:
-        - name: split
-          args: ["/", 4]
-    cat:
-      text: "{{ if .Result.cat }}{{ .Result.cat }}{{ else }}other{{ end }}"
    size:
-      text: "{{ if eq .Result.cat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.cat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.cat \"series\") (eq .Result.cat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.cat \"films\" }}2 GB{{ else }}{{ end }}"
+      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
    seeders:
      text: 1
    leechers:
--- a/src/Jackett.Common/Definitions/erzsebet.yml
+++ b/src/Jackett.Common/Definitions/erzsebet.yml
@@ -124,7 +124,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
--- a/src/Jackett.Common/Definitions/erzsebetpl.yml
+++ b/src/Jackett.Common/Definitions/erzsebetpl.yml
@@ -250,7 +250,7 @@ search:
    - name: re_replace # S01E01 to сезон 1 серии 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
    prev_allw: 1
    prev_a: 0
    prev_dla: 0
--- a/src/Jackett.Common/Definitions/esharenet.yml
+++ b/src/Jackett.Common/Definitions/esharenet.yml
@@ -42,8 +42,8 @@ caps:

  modes:
    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
    music-search: [q]

 settings:
@@ -97,18 +97,21 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 50
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
@@ -133,8 +136,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -149,6 +156,9 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
@@ -204,6 +214,8 @@ search:
        i[class*="fa-globe text-green"]: 2 # Global Double Upload
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
+    minimumratio:
+      text: 0.4
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
--- a/src/Jackett.Common/Definitions/ethor.yml
+++ b/src/Jackett.Common/Definitions/ethor.yml
@@ -1,167 +0,0 @@
---
-id: ethor
-name: Ethor.net (Thor's Land)
-description: "A French gerneral tracker"
-language: fr-fr
-type: private
-encoding: UTF-8
-links:
-  - https://ethor.net/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: PC, desc: "Applications/Divers"}
-    - {id: 1, cat: PC, desc: "Applications/PC ISO"}
-    - {id: 44, cat: PC, desc: "Applications/Portable"}
-    - {id: 47, cat: Movies/BluRay, desc: "Films/Bluray"}
-    - {id: 20, cat: Movies/DVD, desc: "Films/DVDr"}
-    - {id: 42, cat: Movies/HD, desc: "Films/HD Rip"}
-    - {id: 19, cat: Movies/SD, desc: "Films/SD Rip"}
-    - {id: 5, cat: Movies/SD, desc: "Films/VCD"}
-    - {id: 4, cat: PC/Games, desc: "Jeux/PC"}
-    - {id: 41, cat: Console, desc: "Jeux/Portable"}
-    - {id: 34, cat: Console/PS4, desc: "Jeux/PS2-PS3"}
-    - {id: 38, cat: Console/Wii, desc: "Jeux/Wii-GC"}
-    - {id: 40, cat: Console/XBox, desc: "Jeux/Xbox360"}
-    - {id: 6, cat: Audio, desc: "Musique"}
-    - {id: 37, cat: Audio/Video, desc: "Musique/Video"}
-    - {id: 48, cat: TV/HD, desc: "Série-Télé/Bluray"}
-    - {id: 45, cat: TV/SD, desc: "Série-Télé/DVDr"}
-    - {id: 43, cat: TV/HD, desc: "Série-Télé/HD Rip"}
-    - {id: 7, cat: TV/SD, desc: "Série-Télé/SD Rip"}
-    - {id: 23, cat: Books, desc: "E-Books"}
-    - {id: 46, cat: Other, desc: "Évé. sportif"}
-    - {id: 36, cat: Other, desc: "Kidz"}
-    - {id: 25, cat: Other, desc: "Misc"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: multilang
-    type: checkbox
-    label: Replace VFQ/MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: MULTI.FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-
-login:
-  path: login3.php
-  method: form
-  form: form[action="login3.php?takelogin=1"]
-  captcha:
-    type: image
-    selector: img#validationimage
-    input: validationcode
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    secure_cookie: "0"
-  error:
-    - selector: :contains("\"status\":\"error\"")
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    advcat: 0
-    incldead: 1
-    stype: b
-    dp: 0
-    isUserClick: 0
-
-  rows:
-    selector: p + table > tbody > tr:has(a[href^="/details.php"])
-
-  fields:
-    download:
-      selector: a[href^="/details.php"]:has(b)
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/details.php", "/download.php"]
-    _title_original_b:
-      selector: a[href^="/details.php"] b
-    _title_original_title: # long titles (shortened with ...)
-      selector: a[href^="/details.php"][title]
-      attribute: title
-      optional: true
-    _title_original:
-      text: "{{ if .Result._title_original_title }}{{ .Result._title_original_title }}{{ else }}{{ .Result._title_original_b }}{{ end }}"
-    _title_normalized:
-      text: "{{ .Result._title_original }}"
-      filters:
-        - name: re_replace
-          args: ["S(\\d{2}) E(\\d{2})", "S$1E$2"]
-        - name: re_replace
-          args: ["S(\\d{1}) E(\\d{2})", "S0$1E$2"]
-    _title_multilang:
-      text: "{{ .Result._title_normalized }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)[\\.\\s\\[\\-]MULTI[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
-        - name: re_replace
-          args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
-    title:
-      text: "{{if .Config.multilang }}{{ .Result._title_multilang }}{{else}}{{ .Result._title_normalized }}{{end}}"
-    category:
-      selector: a[href^="/browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="/details.php"]:has(b)
-      attribute: href
-    files:
-      selector: a[href*="#filelist"]
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: "(\\d+)"
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " -05:00" # timezone offset
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    downloadvolumefactor:
-      case:
-        "img[title^=\"Freeleech: \"]": 0
-        "img[title^=\"Half Freeleech: \"]": 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -9,8 +9,8 @@ followredirect: true
 links:
  - https://www.ettvcentral.com/
  - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.lat/
-  - https://ettv.unblocked.rest/
+  - https://ettv.unblockit.dev/
+  - https://ettv.unblocked.monster/
 legacylinks:
  - https://www.ettv.tv/
  - https://www.ettv.to/
@@ -29,9 +29,12 @@ legacylinks:
  - https://ettv.unblocked.bar/
  - https://ettv.proxyportal.pw/
  - https://ettv.uk-unblock.pro/
-  - https://ettv.root.yt/ # currently redirects to ettvcentral.com
+  - https://ettv.root.yt/
  - https://www.ettv.be/
  - https://ettv.unblockit.top/
+  - https://ettv.unblockit.lat/
+  - https://ettv.unblockit.app/
+  - https://ettv.unblocked.rest/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/exkinoray.yml
+++ b/src/Jackett.Common/Definitions/exkinoray.yml
@@ -100,7 +100,7 @@ login:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
    autologin: 1
-    returnto: "index.php"
+    returnto: index.php
  error:
    - selector: td.embedded:contains("Ошибка входа")
  test:
@@ -118,8 +118,8 @@ search:
    - name: re_replace # strip S01E01
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
-    # 0 active 1 incldead 2 onlydead 4 noseeds (isn't this == onlydead?)
+    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead, 4 noseeds (how is this different from onlydead?)
    incldead: 1
    search: "{{ .Keywords }}"
    sort: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/extratorrent-it.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-it.yml
@@ -0,0 +1,983 @@
+---
+id: extratorrent-it
+name: ExtraTorrent.it
+description: "ExtraTorrent.it is a Public tracker, a popular alternative to the original ET site, providing Movie / TV / General magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://extratorrents.it/
+  - https://extratorrent.unblockit.dev/
+  - https://extratorrent2.unblockninja.com/
+legacylinks:
+  - https://extratorrent.ag/
+  - https://extratorrent.unblockit.app/
+
+caps:
+  categorymappings:
+    # Anime
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+    - {id: 963, cat: TV/Anime, desc: "Anime - Absolute Duo"}
+    - {id: 951, cat: TV/Anime, desc: "Anime - Akame ga Kill"}
+    - {id: 959, cat: TV/Anime, desc: "Anime - Aldnoah Zero"}
+    - {id: 99, cat: TV/Anime, desc: "Anime - Anime - Other"}
+    - {id: 86, cat: TV/Anime, desc: "Anime - Battle Programer Shirase"}
+    - {id: 87, cat: TV/Anime, desc: "Anime - Big O"}
+    - {id: 960, cat: TV/Anime, desc: "Anime - Binan Koukou Chikyuu Bouei-bu Love"}
+    - {id: 267, cat: TV/Anime, desc: "Anime - Bleach"}
+    - {id: 88, cat: TV/Anime, desc: "Anime - Cardcaptor Sakura"}
+    - {id: 89, cat: TV/Anime, desc: "Anime - Chobits"}
+    - {id: 142, cat: TV/Anime, desc: "Anime - Comics"}
+    - {id: 962, cat: TV/Anime, desc: "Anime - Death Parade"}
+    - {id: 151, cat: TV/Anime, desc: "Anime - Dragon ball"}
+    - {id: 90, cat: TV/Anime, desc: "Anime - Dragonball GT"}
+    - {id: 91, cat: TV/Anime, desc: "Anime - Dragonball Z"}
+    - {id: 156, cat: TV/Anime, desc: "Anime - DVD-R"}
+    - {id: 950, cat: TV/Anime, desc: "Anime - Fairy Tail"}
+    - {id: 92, cat: TV/Anime, desc: "Anime - Flame of Recca"}
+    - {id: 93, cat: TV/Anime, desc: "Anime - Full Metal Alchemist"}
+    - {id: 95, cat: TV/Anime, desc: "Anime - Ghost In The Shell SAC"}
+    - {id: 94, cat: TV/Anime, desc: "Anime - Gundam"}
+    - {id: 620, cat: TV/Anime, desc: "Anime - Hentai"}
+    - {id: 145, cat: TV/Anime, desc: "Anime - Hunter X Hunter"}
+    - {id: 949, cat: TV/Anime, desc: "Anime - Inou Battle wa Nichijou-kei no Naka de"}
+    - {id: 96, cat: TV/Anime, desc: "Anime - InuYasha"}
+    - {id: 524, cat: TV/Anime, desc: "Anime - Kiba"}
+    - {id: 97, cat: TV/Anime, desc: "Anime - Konkiki No Gash Bell"}
+    - {id: 961, cat: TV/Anime, desc: "Anime - Kuroko No Basuke"}
+    - {id: 98, cat: TV/Anime, desc: "Anime - Last Exile"}
+    - {id: 964, cat: TV/Anime, desc: "Anime - Log Horizon"}
+    - {id: 952, cat: TV/Anime, desc: "Anime - Nanatsu no Taizai"}
+    - {id: 101, cat: TV/Anime, desc: "Anime - Naruto"}
+    - {id: 508, cat: TV/Anime, desc: "Anime - One Piece"}
+    - {id: 100, cat: TV/Anime, desc: "Anime - Onegai Twins"}
+    - {id: 523, cat: TV/Anime, desc: "Anime - Ouran High School Host Club"}
+    - {id: 102, cat: TV/Anime, desc: "Anime - PlanetES"}
+    - {id: 146, cat: TV/Anime, desc: "Anime - Prince of Tennis"}
+    - {id: 103, cat: TV/Anime, desc: "Anime - Ranma 1/2"}
+    - {id: 104, cat: TV/Anime, desc: "Anime - Ruroni Kenshin"}
+    - {id: 105, cat: TV/Anime, desc: "Anime - Samurai Champloo"}
+    - {id: 107, cat: TV/Anime, desc: "Anime - Scrapped Princess"}
+    - {id: 997, cat: TV/Anime, desc: "Anime - Spider-man"}
+    - {id: 106, cat: TV/Anime, desc: "Anime - Stellvia of the Universe"}
+    - {id: 525, cat: TV/Anime, desc: "Anime - Strawberry Panic"}
+    - {id: 953, cat: TV/Anime, desc: "Anime - Sword Art Online II"}
+    - {id: 958, cat: TV/Anime, desc: "Anime - Tokyo Ghoul"}
+    # Audio
+    - {id: 5, cat: Audio, desc: "Music"}
+    - {id: 54, cat: Audio, desc: "Music - Alternative"}
+    - {id: 990, cat: Audio, desc: "Music - Ambient"}
+    - {id: 160, cat: Audio, desc: "Music - Anime"}
+    - {id: 55, cat: Audio, desc: "Music - Asian"}
+    - {id: 56, cat: Audio, desc: "Music - Blues"}
+    - {id: 809, cat: Audio, desc: "Music - Bollywood"}
+    - {id: 57, cat: Audio, desc: "Music - Christian"}
+    - {id: 58, cat: Audio, desc: "Music - Classic"}
+    - {id: 515, cat: Audio, desc: "Music - Compilation/Various Artists (VA)"}
+    - {id: 59, cat: Audio, desc: "Music - Country/Western"}
+    - {id: 971, cat: Audio, desc: "Music - Discography"}
+    - {id: 60, cat: Audio, desc: "Music - Drum N Bass"}
+    - {id: 61, cat: Audio, desc: "Music - Electronic"}
+    - {id: 850, cat: Audio/Lossless, desc: "Music - FLAC"}
+    - {id: 519, cat: Audio, desc: "Music - Folk"}
+    - {id: 62, cat: Audio, desc: "Music - Game Music"}
+    - {id: 233, cat: Audio, desc: "Music - Gothic"}
+    - {id: 63, cat: Audio, desc: "Music - Hardcore"}
+    - {id: 78, cat: Audio, desc: "Music - HardHouse/Old School Radio Mixes"}
+    - {id: 512, cat: Audio, desc: "Music - Hardrock"}
+    - {id: 724, cat: Audio, desc: "Music - Hardstyle"}
+    - {id: 306, cat: Audio, desc: "Music - Heavy/Death Metal"}
+    - {id: 64, cat: Audio, desc: "Music - Hip Hop"}
+    - {id: 511, cat: Audio, desc: "Music - Indie/Britpop"}
+    - {id: 65, cat: Audio, desc: "Music - Industrial"}
+    - {id: 66, cat: Audio, desc: "Music - Jazz"}
+    - {id: 67, cat: Audio, desc: "Music - Karaoke"}
+    - {id: 521, cat: Audio, desc: "Music - Latin"}
+    - {id: 68, cat: Audio, desc: "Music - Metal"}
+    - {id: 526, cat: Audio, desc: "Music - Motown"}
+    - {id: 79, cat: Audio, desc: "Music - Music - Other"}
+    - {id: 69, cat: Audio/Video, desc: "Music - Music Videos"}
+    - {id: 522, cat: Audio, desc: "Music - Non-English"}
+    - {id: 507, cat: Audio, desc: "Music - Now That's What I Call Music"}
+    - {id: 70, cat: Audio, desc: "Music - Pop"}
+    - {id: 852, cat: Audio, desc: "Music - Progressive"}
+    - {id: 71, cat: Audio, desc: "Music - Punk"}
+    - {id: 72, cat: Audio, desc: "Music - R&B"}
+    - {id: 851, cat: Audio, desc: "Music - Rai"}
+    - {id: 73, cat: Audio, desc: "Music - Rap"}
+    - {id: 74, cat: Audio, desc: "Music - Reggae"}
+    - {id: 75, cat: Audio, desc: "Music - Rock"}
+    - {id: 527, cat: Audio, desc: "Music - Rock 'n' Roll"}
+    - {id: 514, cat: Audio, desc: "Music - Singer Songwriter"}
+    - {id: 230, cat: Audio, desc: "Music - Ska"}
+    - {id: 505, cat: Audio, desc: "Music - Soul"}
+    - {id: 77, cat: Audio, desc: "Music - Soundtracks"}
+    - {id: 161, cat: Audio, desc: "Music - Techno"}
+    - {id: 420, cat: Audio, desc: "Music - Trance/House/Dance"}
+    - {id: 76, cat: Audio, desc: "Music - Unsigned/Amateur"}
+    - {id: 1002, cat: Audio, desc: "Music - AAC"}
+    - {id: 1003, cat: Audio, desc: "Music - Album"}
+    - {id: 1004, cat: Audio, desc: "Music - Box Set"}
+    - {id: 1005, cat: Audio, desc: "Music - Concerts"}
+    - {id: 1006, cat: Audio, desc: "Music - Discography"}
+    - {id: 1007, cat: Audio/Video, desc: "Music - DVD"}
+    - {id: 1008, cat: Audio/Lossless, desc: "Music - Lossless"}
+    - {id: 1009, cat: Audio/MP3, desc: "Music - MP3"}
+    - {id: 1011, cat: Audio, desc: "Music - Radio"}
+    - {id: 1012, cat: Audio, desc: "Music - Single"}
+    # Movies
+    - {id: 4, cat: Movies, desc: "Movies"}
+    - {id: 419, cat: Movies, desc: "Movies - Action"}
+    - {id: 28, cat: Movies, desc: "Movies - Adventure"}
+    - {id: 29, cat: Movies, desc: "Movies - Animation"}
+    - {id: 30, cat: Movies, desc: "Movies - Asian"}
+    - {id: 32, cat: Movies, desc: "Movies - Automotive/Cars"}
+    - {id: 628, cat: Movies, desc: "Movies - Biography"}
+    - {id: 977, cat: Movies, desc: "Movies - Black and White"}
+    - {id: 558, cat: Movies, desc: "Movies - Bollywood/Desi"}
+    - {id: 976, cat: Movies, desc: "Movies - Classic"}
+    - {id: 33, cat: Movies, desc: "Movies - Comedy"}
+    - {id: 34, cat: Movies, desc: "Movies - Concerts"}
+    - {id: 600, cat: Movies, desc: "Movies - Crime"}
+    - {id: 35, cat: Movies, desc: "Movies - Documentary"}
+    - {id: 37, cat: Movies, desc: "Movies - Drama"}
+    - {id: 742, cat: Movies, desc: "Movies - Dubbed/Dual Audio"}
+    - {id: 36, cat: Movies, desc: "Movies - DVD/Film Extras"}
+    - {id: 149, cat: Movies, desc: "Movies - Family"}
+    - {id: 38, cat: Movies, desc: "Movies - Fantasy"}
+    - {id: 39, cat: Movies, desc: "Movies - Gore Flicks"}
+    - {id: 602, cat: Movies, desc: "Movies - History"}
+    - {id: 40, cat: Movies, desc: "Movies - Horror"}
+    - {id: 41, cat: Movies, desc: "Movies - Kids"}
+    - {id: 150, cat: Movies/SD, desc: "Movies - KVCD"}
+    - {id: 974, cat: Movies, desc: "Movies - Lollywood"}
+    - {id: 42, cat: Movies, desc: "Movies - Martial Arts"}
+    - {id: 44, cat: Movies/Other, desc: "Movies - Other"}
+    - {id: 805, cat: Movies/3D, desc: "Movies - 3D"}
+    - {id: 975, cat: Movies/UHD, desc: "Movies - 4K"}
+    - {id: 947, cat: Movies, desc: "Movies - Musical"}
+    - {id: 43, cat: Movies, desc: "Movies - Mystery"}
+    - {id: 603, cat: Movies/Foreign, desc: "Movies - non English"}
+    - {id: 978, cat: Movies, desc: "Movies - Rarities"}
+    - {id: 45, cat: Movies, desc: "Movies - Romance"}
+    - {id: 46, cat: Movies, desc: "Movies - Samples/Trailers"}
+    - {id: 47, cat: Movies, desc: "Movies - Sci-Fi"}
+    - {id: 48, cat: Movies, desc: "Movies - Sports related"}
+    - {id: 779, cat: Movies, desc: "Movies - Stand-up comedy"}
+    - {id: 49, cat: Movies, desc: "Movies - Thriller"}
+    - {id: 671, cat: Movies, desc: "Movies - Travel"}
+    - {id: 307, cat: Movies, desc: "Movies - War"}
+    - {id: 601, cat: Movies, desc: "Movies - Western"}
+    - {id: 1024, cat: Movies/HD, desc: "Movies - HEVC/x265"}
+    - {id: 1030, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
+    - {id: 1031, cat: Movies/HD, desc: "Movies - h.264/x264"}
+    - {id: 1032, cat: Movies/HD, desc: "Movies - HD"}
+    - {id: 1033, cat: Movies/HD, desc: "Movies - MP4"}
+    - {id: 1034, cat: Movies/SD, desc: "Movies - SVCD/VCD"}
+    - {id: 1035, cat: Movies, desc: "Movies - YIFY"}
+    # TV
+    - {id: 8, cat: TV, desc: "TV"}
+    - {id: 986, cat: TV, desc: "TV - 12 Monkeys"}
+    - {id: 598, cat: TV, desc: "TV - 19-2"}
+    - {id: 795, cat: TV, desc: "TV - 2 Broke Girls"}
+    - {id: 435, cat: TV, desc: "TV - 24"}
+    - {id: 169, cat: TV, desc: "TV - 30 Days"}
+    - {id: 561, cat: TV, desc: "TV - 30 Rock"}
+    - {id: 274, cat: TV, desc: "TV - 60 Minutes"}
+    - {id: 862, cat: TV, desc: "TV - 666 Park Avenue"}
+    - {id: 273, cat: TV, desc: "TV - 'Allo 'Allo!"}
+    - {id: 310, cat: TV, desc: "TV - A-Team"}
+    - {id: 797, cat: TV, desc: "TV - About a Boy"}
+    - {id: 998, cat: TV, desc: "TV - Above Suspicion"}
+    - {id: 966, cat: TV, desc: "TV - Adam - E.V.A"}
+    - {id: 573, cat: TV, desc: "TV - Alaska State Troopers"}
+    - {id: 821, cat: TV, desc: "TV - Alcatraz"}
+    - {id: 118, cat: TV, desc: "TV - Alias"}
+    - {id: 810, cat: TV, desc: "TV - Almost Human"}
+    - {id: 771, cat: TV, desc: "TV - Alphas"}
+    - {id: 818, cat: TV, desc: "TV - American Chopper"}
+    - {id: 234, cat: TV, desc: "TV - American Dad"}
+    - {id: 194, cat: TV, desc: "TV - American Horror Story"}
+    - {id: 634, cat: TV, desc: "TV - American Idol"}
+    - {id: 674, cat: TV, desc: "TV - Americas Got Talent"}
+    - {id: 675, cat: TV, desc: "TV - Americas Next Top Model"}
+    - {id: 894, cat: TV, desc: "TV - Ancient Aliens"}
+    - {id: 170, cat: TV, desc: "TV - Angel"}
+    - {id: 911, cat: TV, desc: "TV - Anger Management"}
+    - {id: 659, cat: TV, desc: "TV - Archer"}
+    - {id: 275, cat: TV, desc: "TV - Arrested Development"}
+    - {id: 872, cat: TV, desc: "TV - Arrow"}
+    - {id: 984, cat: TV, desc: "TV - Ash vs Evil Dead"}
+    - {id: 171, cat: TV, desc: "TV - Attack Of The Show"}
+    - {id: 837, cat: TV, desc: "TV - Awake"}
+    - {id: 902, cat: TV, desc: "TV - Awkward"}
+    - {id: 916, cat: TV, desc: "TV - Baby Daddy"}
+    - {id: 165, cat: TV, desc: "TV - Babylon 5"}
+    - {id: 309, cat: TV, desc: "TV - Back In The Game"}
+    - {id: 460, cat: TV, desc: "TV - Band Of Brothers"}
+    - {id: 329, cat: TV, desc: "TV - Banshee"}
+    - {id: 891, cat: TV, desc: "TV - Bates Motel"}
+    - {id: 802, cat: TV, desc: "TV - Batman The Brave and The Bold"}
+    - {id: 163, cat: TV, desc: "TV - Battlestar Galactica"}
+    - {id: 794, cat: TV, desc: "TV - BBC"}
+    - {id: 886, cat: TV, desc: "TV - Beauty and the Beast"}
+    - {id: 172, cat: TV, desc: "TV - Beauty And The Geek"}
+    - {id: 782, cat: TV, desc: "TV - Beavis and Butt-Head"}
+    - {id: 584, cat: TV, desc: "TV - Being Erica"}
+    - {id: 669, cat: TV, desc: "TV - Being Human"}
+    - {id: 683, cat: TV, desc: "TV - Believe"}
+    - {id: 335, cat: TV, desc: "TV - Bellator FC"}
+    - {id: 979, cat: TV, desc: "TV - Better Call Saul"}
+    - {id: 173, cat: TV, desc: "TV - Big Brother"}
+    - {id: 666, cat: TV, desc: "TV - Big Love"}
+    - {id: 774, cat: TV, desc: "TV - Bigg Boss"}
+    - {id: 989, cat: TV, desc: "TV - Billions"}
+    - {id: 174, cat: TV, desc: "TV - Bitten"}
+    - {id: 396, cat: TV, desc: "TV - Black Sails"}
+    - {id: 981, cat: TV, desc: "TV - Blindspot"}
+    - {id: 717, cat: TV, desc: "TV - Blue Bloods"}
+    - {id: 754, cat: TV, desc: "TV - Boardwalk Empire"}
+    - {id: 709, cat: TV, desc: "TV - Bobs Burgers"}
+    - {id: 767, cat: TV, desc: "TV - Body of Proof"}
+    - {id: 175, cat: TV, desc: "TV - Bold and the beautiful"}
+    - {id: 969, cat: TV, desc: "TV - Bollywood TV Shows"}
+    - {id: 269, cat: TV, desc: "TV - Bones"}
+    - {id: 235, cat: TV, desc: "TV - Boston Legal"}
+    - {id: 676, cat: TV, desc: "TV - Breaking Bad"}
+    - {id: 707, cat: TV, desc: "TV - Breakout Kings"}
+    - {id: 409, cat: TV, desc: "TV - Brickleberry"}
+    - {id: 680, cat: TV, desc: "TV - Brooklyn Nine-Nine"}
+    - {id: 560, cat: TV, desc: "TV - Brothers And Sisters"}
+    - {id: 147, cat: TV, desc: "TV - Buffy"}
+    - {id: 677, cat: TV, desc: "TV - Burn Notice"}
+    - {id: 619, cat: TV, desc: "TV - Californication"}
+    - {id: 883, cat: TV, desc: "TV - Call of the Wildman"}
+    - {id: 719, cat: TV, desc: "TV - Camelot"}
+    - {id: 921, cat: TV, desc: "TV - Camp"}
+    - {id: 661, cat: TV, desc: "TV - Caprica"}
+    - {id: 928, cat: TV, desc: "TV - Capture"}
+    - {id: 128, cat: TV, desc: "TV - Carnivale"}
+    - {id: 736, cat: TV, desc: "TV - Cartoon"}
+    - {id: 658, cat: TV, desc: "TV - Castle"}
+    - {id: 941, cat: TV, desc: "TV - Cedar Cove"}
+    - {id: 846, cat: TV, desc: "TV - Celebrity Juice"}
+    - {id: 141, cat: TV, desc: "TV - Charmed"}
+    - {id: 900, cat: TV, desc: "TV - Chicago Fire"}
+    - {id: 324, cat: TV, desc: "TV - Chicago PD"}
+    - {id: 315, cat: TV, desc: "TV - Chopped"}
+    - {id: 184, cat: TV, desc: "TV - Chozen"}
+    - {id: 657, cat: TV, desc: "TV - Chuck"}
+    - {id: 133, cat: TV, desc: "TV - Cold Case"}
+    - {id: 629, cat: TV, desc: "TV - Community"}
+    - {id: 178, cat: TV, desc: "TV - Conan O'Brien"}
+    - {id: 946, cat: TV, desc: "TV - Constantine"}
+    - {id: 879, cat: TV, desc: "TV - Continuum"}
+    - {id: 861, cat: TV, desc: "TV - Copper"}
+    - {id: 322, cat: TV, desc: "TV - Cops"}
+    - {id: 186, cat: TV, desc: "TV - Cosmos A Space Time Odyssey"}
+    - {id: 670, cat: TV, desc: "TV - Cougar Town"}
+    - {id: 729, cat: TV, desc: "TV - Covert Affairs"}
+    - {id: 651, cat: TV, desc: "TV - Craig Ferguson"}
+    - {id: 280, cat: TV, desc: "TV - Criminal Minds"}
+    - {id: 788, cat: TV, desc: "TV - Crisis"}
+    - {id: 279, cat: TV, desc: "TV - Criss Angel BeLIEve"}
+    - {id: 323, cat: TV, desc: "TV - Crossing Jordan"}
+    - {id: 926, cat: TV, desc: "TV - Crossing Lines"}
+    - {id: 108, cat: TV, desc: "TV - CSI"}
+    - {id: 325, cat: TV, desc: "TV - Curb Your Enthusiasm"}
+    - {id: 882, cat: TV, desc: "TV - Da Vincis Demons"}
+    - {id: 282, cat: TV, desc: "TV - Dallas"}
+    - {id: 678, cat: TV, desc: "TV - Damages"}
+    - {id: 798, cat: TV, desc: "TV - Dancing with the Stars US"}
+    - {id: 652, cat: TV, desc: "TV - David Letterman"}
+    - {id: 994, cat: TV, desc: "TV - Days of Our Lives"}
+    - {id: 985, cat: TV, desc: "TV - DCs Legends of Tomorrow"}
+    - {id: 181, cat: TV, desc: "TV - Dead Like Me"}
+    - {id: 679, cat: TV, desc: "TV - Deadliest Catch"}
+    - {id: 182, cat: TV, desc: "TV - Deadwood"}
+    - {id: 890, cat: TV, desc: "TV - Defiance"}
+    - {id: 281, cat: TV, desc: "TV - Democracy Now!"}
+    - {id: 183, cat: TV, desc: "TV - Desperate Housewives"}
+    - {id: 939, cat: TV, desc: "TV - Devious Maids"}
+    - {id: 585, cat: TV, desc: "TV - Dexter"}
+    - {id: 644, cat: TV, desc: "TV - Dirty Jobs"}
+    - {id: 122, cat: TV, desc: "TV - Discovery Channel"}
+    - {id: 167, cat: TV, desc: "TV - Doctor Who"}
+    - {id: 968, cat: TV/Documentary, desc: "TV - Documentary"}
+    - {id: 606, cat: TV, desc: "TV - Dollhouse"}
+    - {id: 839, cat: TV, desc: "TV - Dont Trust the Bitch in Apartment"}
+    - {id: 326, cat: TV, desc: "TV - Dr Who"}
+    - {id: 925, cat: TV, desc: "TV - Dracula"}
+    - {id: 328, cat: TV, desc: "TV - Drawn Together"}
+    - {id: 732, cat: TV, desc: "TV - Drop Dead"}
+    - {id: 820, cat: TV, desc: "TV - Eastbound and Down"}
+    - {id: 875, cat: TV, desc: "TV - Elementary"}
+    - {id: 283, cat: TV, desc: "TV - Ellen DeGeneres"}
+    - {id: 330, cat: TV, desc: "TV - Enlisted"}
+    - {id: 187, cat: TV, desc: "TV - Entourage"}
+    - {id: 270, cat: TV, desc: "TV - ER"}
+    - {id: 765, cat: TV, desc: "TV - Eureka"}
+    - {id: 238, cat: TV, desc: "TV - Everybody Loves Raymond"}
+    - {id: 571, cat: TV, desc: "TV - Extant"}
+    - {id: 840, cat: TV, desc: "TV - Fact or Faked Paranormal Files"}
+    - {id: 828, cat: TV, desc: "TV - Fairly Legeal"}
+    - {id: 876, cat: TV, desc: "TV - Faking It"}
+    - {id: 917, cat: TV, desc: "TV - Falling Skies"}
+    - {id: 188, cat: TV, desc: "TV - Family Guy"}
+    - {id: 855, cat: TV, desc: "TV - Family Tools"}
+    - {id: 411, cat: TV, desc: "TV - Fargo"}
+    - {id: 331, cat: TV, desc: "TV - Farscape"}
+    - {id: 983, cat: TV, desc: "TV - Fear the Walking Dead"}
+    - {id: 332, cat: TV, desc: "TV - Fifth Gear"}
+    - {id: 672, cat: TV, desc: "TV - Flashforward"}
+    - {id: 753, cat: TV, desc: "TV - Flashpoint"}
+    - {id: 831, cat: TV, desc: "TV - Foreign Series/Non English"}
+    - {id: 266, cat: TV, desc: "TV - Forever"}
+    - {id: 922, cat: TV, desc: "TV - Franklin and Bash"}
+    - {id: 140, cat: TV, desc: "TV - Friends"}
+    - {id: 612, cat: TV, desc: "TV - Fringe"}
+    - {id: 277, cat: TV, desc: "TV - From Dusk Till Dawn"}
+    - {id: 681, cat: TV, desc: "TV - Futurama"}
+    - {id: 728, cat: TV, desc: "TV - Game of Thrones"}
+    - {id: 334, cat: TV, desc: "TV - Gang Related"}
+    - {id: 996, cat: TV, desc: "TV - General Hospital"}
+    - {id: 954, cat: TV, desc: "TV - Geordie Shore"}
+    - {id: 574, cat: TV, desc: "TV - Ghost Adventures"}
+    - {id: 704, cat: TV, desc: "TV - Ghost Hunters"}
+    - {id: 642, cat: TV, desc: "TV - Ghost Mine"}
+    - {id: 338, cat: TV, desc: "TV - Ghost Whisperer"}
+    - {id: 284, cat: TV, desc: "TV - Gilmore Girls"}
+    - {id: 682, cat: TV, desc: "TV - Glee"}
+    - {id: 865, cat: TV, desc: "TV - Go On"}
+    - {id: 276, cat: TV, desc: "TV - Gold Rush"}
+    - {id: 339, cat: TV, desc: "TV - Good Eats"}
+    - {id: 599, cat: TV, desc: "TV - Gossip Girl"}
+    - {id: 580, cat: TV, desc: "TV - Gotham"}
+    - {id: 919, cat: TV, desc: "TV - Graceland"}
+    - {id: 955, cat: TV, desc: "TV - Gracepoint"}
+    - {id: 285, cat: TV, desc: "TV - Greys Anatomy"}
+    - {id: 819, cat: TV, desc: "TV - Grimm"}
+    - {id: 237, cat: TV, desc: "TV - Growing Up Fisher"}
+    - {id: 340, cat: TV, desc: "TV - Guiding Light"}
+    - {id: 866, cat: TV, desc: "TV - Guys With Kids"}
+    - {id: 880, cat: TV, desc: "TV - Hannibal"}
+    - {id: 813, cat: TV, desc: "TV - Happily Divorced"}
+    - {id: 769, cat: TV, desc: "TV - Happy Endings"}
+    - {id: 190, cat: TV, desc: "TV - Harald Schmidt"}
+    - {id: 713, cat: TV, desc: "TV - Harrys Law"}
+    - {id: 832, cat: TV, desc: "TV - Hart of Dixie"}
+    - {id: 341, cat: TV, desc: "TV - Haunted"}
+    - {id: 773, cat: TV, desc: "TV - Haven"}
+    - {id: 712, cat: TV, desc: "TV - Hawaii Five-0"}
+    - {id: 781, cat: TV, desc: "TV - Helix"}
+    - {id: 853, cat: TV, desc: "TV - Hell on Wheels"}
+    - {id: 191, cat: TV, desc: "TV - Hells Kitchen"}
+    - {id: 884, cat: TV, desc: "TV - Hemlock Grove"}
+    - {id: 342, cat: TV, desc: "TV - Hercules"}
+    - {id: 556, cat: TV, desc: "TV - Heroes"}
+    - {id: 343, cat: TV, desc: "TV - Hex"}
+    - {id: 192, cat: TV, desc: "TV - Hogans Heroes"}
+    - {id: 588, cat: TV, desc: "TV - Hollands Hoop"}
+    - {id: 755, cat: TV, desc: "TV - Homeland"}
+    - {id: 812, cat: TV, desc: "TV - Hostages"}
+    - {id: 684, cat: TV, desc: "TV - Hot in Cleveland"}
+    - {id: 286, cat: TV, desc: "TV - House"}
+    - {id: 913, cat: TV, desc: "TV - House Of Cards"}
+    - {id: 287, cat: TV, desc: "TV - How I Met Your Mother"}
+    - {id: 568, cat: TV, desc: "TV - How Its Made"}
+    - {id: 893, cat: TV, desc: "TV - How to Live with Your Parents"}
+    - {id: 288, cat: TV, desc: "TV - Howard Stern"}
+    - {id: 132, cat: TV, desc: "TV - Huff"}
+    - {id: 345, cat: TV, desc: "TV - Humor Amarillo"}
+    - {id: 756, cat: TV, desc: "TV - Hung"}
+    - {id: 637, cat: TV, desc: "TV - Hustle"}
+    - {id: 346, cat: TV, desc: "TV - In Justice"}
+    - {id: 685, cat: TV, desc: "TV - In Plain Sight"}
+    - {id: 582, cat: TV, desc: "TV - Ink Master"}
+    - {id: 347, cat: TV, desc: "TV - Inked"}
+    - {id: 965, cat: TV, desc: "TV - Inside MMA"}
+    - {id: 873, cat: TV, desc: "TV - Intelligence US"}
+    - {id: 240, cat: TV, desc: "TV - Into the West"}
+    - {id: 166, cat: TV, desc: "TV - Iron Chef"}
+    - {id: 289, cat: TV, desc: "TV - Invasion"}
+    - {id: 817, cat: TV, desc: "TV - Ironside"}
+    - {id: 772, cat: TV, desc: "TV - Its Always Sunny in Philadelphia"}
+    - {id: 988, cat: TV, desc: "TV - iZombie"}
+    - {id: 991, cat: TV, desc: "TV - Jane the Virgin"}
+    - {id: 290, cat: TV, desc: "TV - Jay Leno"}
+    - {id: 763, cat: TV, desc: "TV - Jersey Shore"}
+    - {id: 177, cat: TV, desc: "TV - Joe Rogan Questions Everything"}
+    - {id: 110, cat: TV, desc: "TV - Joey"}
+    - {id: 196, cat: TV, desc: "TV - Justice League Unlimited"}
+    - {id: 686, cat: TV, desc: "TV - Justified"}
+    - {id: 412, cat: TV, desc: "TV - kabachitare!"}
+    - {id: 738, cat: TV, desc: "TV - Killer Contact"}
+    - {id: 349, cat: TV, desc: "TV - Killer Instinct"}
+    - {id: 197, cat: TV, desc: "TV - Kim Possible"}
+    - {id: 741, cat: TV, desc: "TV - King"}
+    - {id: 933, cat: TV, desc: "TV - King and Maxwel"}
+    - {id: 350, cat: TV, desc: "TV - King Of The Hill"}
+    - {id: 351, cat: TV, desc: "TV - Kitchen Confidential"}
+    - {id: 790, cat: TV, desc: "TV - Kitchen Nightmares US"}
+    - {id: 348, cat: TV, desc: "TV - Kolchak The Night Stalker"}
+    - {id: 241, cat: TV, desc: "TV - Koot en Bie"}
+    - {id: 198, cat: TV, desc: "TV - Kung Fu"}
+    - {id: 199, cat: TV, desc: "TV - La Femme Nikita"}
+    - {id: 570, cat: TV, desc: "TV - LA Ink"}
+    - {id: 242, cat: TV, desc: "TV - Laguna Beach"}
+    - {id: 130, cat: TV, desc: "TV - Las Vegas"}
+    - {id: 843, cat: TV, desc: "TV - Last Man Standing"}
+    - {id: 867, cat: TV, desc: "TV - Last Resort"}
+    - {id: 200, cat: TV, desc: "TV - Late Night with Conan O'Brien"}
+    - {id: 115, cat: TV, desc: "TV - Law And Order"}
+    - {id: 591, cat: TV, desc: "TV - Law and Order UK"}
+    - {id: 243, cat: TV, desc: "TV - Le Cameleon"}
+    - {id: 578, cat: TV, desc: "TV - Legend of the Seeker"}
+    - {id: 590, cat: TV, desc: "TV - Legends"}
+    - {id: 898, cat: TV, desc: "TV - Legit"}
+    - {id: 638, cat: TV, desc: "TV - Level3"}
+    - {id: 656, cat: TV, desc: "TV - Leverage"}
+    - {id: 618, cat: TV, desc: "TV - Lie To Me"}
+    - {id: 650, cat: TV, desc: "TV - Life"}
+    - {id: 353, cat: TV, desc: "TV - Life on Mars"}
+    - {id: 716, cat: TV, desc: "TV - Lights Out"}
+    - {id: 244, cat: TV, desc: "TV - Line Of Fire"}
+    - {id: 504, cat: TV, desc: "TV - Little Britain"}
+    - {id: 665, cat: TV, desc: "TV - Little Mosque on the Prairie"}
+    - {id: 148, cat: TV, desc: "TV - Long Island Medium"}
+    - {id: 914, cat: TV, desc: "TV - Longmire"}
+    - {id: 354, cat: TV, desc: "TV - Los Serrano"}
+    - {id: 111, cat: TV, desc: "TV - Lost"}
+    - {id: 314, cat: TV, desc: "TV - Lost Girl"}
+    - {id: 858, cat: TV, desc: "TV - Louie"}
+    - {id: 726, cat: TV, desc: "TV - Love Bites"}
+    - {id: 937, cat: TV, desc: "TV - Low Winter Sun"}
+    - {id: 956, cat: TV, desc: "TV - Lucha Underground"}
+    - {id: 980, cat: TV, desc: "TV - Lucifer"}
+    - {id: 503, cat: TV, desc: "TV - Lucky Louie"}
+    - {id: 687, cat: TV, desc: "TV - Luther"}
+    - {id: 157, cat: TV, desc: "TV - MacGyver"}
+    - {id: 705, cat: TV, desc: "TV - Mad Love"}
+    - {id: 826, cat: TV, desc: "TV - Mad Men"}
+    - {id: 869, cat: TV, desc: "TV - Made in Jersey"}
+    - {id: 355, cat: TV, desc: "TV - MADtv"}
+    - {id: 871, cat: TV, desc: "TV - Major Crimes"}
+    - {id: 667, cat: TV, desc: "TV - Make It or Break It"}
+    - {id: 357, cat: TV, desc: "TV - Malcolm In The Middle"}
+    - {id: 662, cat: TV, desc: "TV - Man vs Wild"}
+    - {id: 759, cat: TV, desc: "TV - Marvels Agents of S.H.I.E.L.D"}
+    - {id: 910, cat: TV, desc: "TV - MasterChef US"}
+    - {id: 358, cat: TV, desc: "TV - Masters Of Horror"}
+    - {id: 824, cat: TV, desc: "TV - Masters of Sex"}
+    - {id: 291, cat: TV, desc: "TV - Medium"}
+    - {id: 617, cat: TV, desc: "TV - Melrose Place"}
+    - {id: 688, cat: TV, desc: "TV - Memphis Beat"}
+    - {id: 905, cat: TV, desc: "TV - Men at Work"}
+    - {id: 645, cat: TV, desc: "TV - Men of a Certain Age"}
+    - {id: 633, cat: TV, desc: "TV - Mercy"}
+    - {id: 579, cat: TV, desc: "TV - Merlin"}
+    - {id: 359, cat: TV, desc: "TV - Miami Ink"}
+    - {id: 825, cat: TV, desc: "TV - Midsomer Murders"}
+    - {id: 783, cat: TV, desc: "TV - Mike and Molly"}
+    - {id: 823, cat: TV, desc: "TV - Mind Games"}
+    - {id: 246, cat: TV, desc: "TV - Mind of Mencia"}
+    - {id: 313, cat: TV, desc: "TV - Misfits"}
+    - {id: 842, cat: TV, desc: "TV - Missing"}
+    - {id: 647, cat: TV, desc: "TV - Mistresses US"}
+    - {id: 179, cat: TV, desc: "TV - Mixology"}
+    - {id: 632, cat: TV, desc: "TV - Modern Family"}
+    - {id: 245, cat: TV, desc: "TV - Modern Marvels"}
+    - {id: 398, cat: TV, desc: "TV - Mom"}
+    - {id: 201, cat: TV, desc: "TV - Monk"}
+    - {id: 361, cat: TV, desc: "TV - Monty Pythons Flying Circus"}
+    - {id: 907, cat: TV, desc: "TV - Motive"}
+    - {id: 247, cat: TV, desc: "TV - Mr Bean"}
+    - {id: 992, cat: TV, desc: "TV - Mr. Robot"}
+    - {id: 356, cat: TV, desc: "TV - MST3K"}
+    - {id: 292, cat: TV, desc: "TV - My Favorite Martian"}
+    - {id: 792, cat: TV, desc: "TV - My Ghost Story"}
+    - {id: 999, cat: TV, desc: "TV - My Little Pony - Friendship is Magic"}
+    - {id: 362, cat: TV, desc: "TV - My Name Is Earl"}
+    - {id: 202, cat: TV, desc: "TV - My Restaurant Rules"}
+    - {id: 193, cat: TV, desc: "TV - Mythbusters"}
+    - {id: 940, cat: TV, desc: "TV - Naked And Afraid"}
+    - {id: 203, cat: TV, desc: "TV - NASA 50 Years Of Space Exploration"}
+    - {id: 899, cat: TV, desc: "TV - Nashville"}
+    - {id: 636, cat: TV/Documentary, desc: "TV - National Geographic"}
+    - {id: 120, cat: TV, desc: "TV - NCIS"}
+    - {id: 920, cat: TV, desc: "TV - Necessary Roughness"}
+    - {id: 841, cat: TV, desc: "TV - New Girl"}
+    - {id: 957, cat: TV, desc: "TV - New Japan Pro Wrestling"}
+    - {id: 311, cat: TV, desc: "TV - NewGamePlus"}
+    - {id: 363, cat: TV, desc: "TV - Night Stalker"}
+    - {id: 722, cat: TV, desc: "TV - Nikita"}
+    - {id: 293, cat: TV, desc: "TV - Nip Tuck"}
+    - {id: 710, cat: TV, desc: "TV - No Ordinary Family"}
+    - {id: 294, cat: TV, desc: "TV - Numb3rs"}
+    - {id: 689, cat: TV, desc: "TV - Nurse Jackie"}
+    - {id: 703, cat: TV, desc: "TV - Off the Map"}
+    - {id: 833, cat: TV, desc: "TV - Once Upon a Time Once"}
+    - {id: 364, cat: TV, desc: "TV - One Tree Hill"}
+    - {id: 424, cat: TV, desc: "TV - Only Fools And Horses"}
+    - {id: 935, cat: TV, desc: "TV - Orange Is The New Black"}
+    - {id: 881, cat: TV, desc: "TV - Orphan Black"}
+    - {id: 113, cat: TV/Other, desc: "TV - Other"}
+    - {id: 365, cat: TV, desc: "TV - Out of Practice S01E"}
+    - {id: 248, cat: TV, desc: "TV - Outer Limits"}
+    - {id: 646, cat: TV, desc: "TV - Outer Space Astronauts"}
+    - {id: 336, cat: TV, desc: "TV - Outlander"}
+    - {id: 723, cat: TV, desc: "TV - Outsourced"}
+    - {id: 249, cat: TV, desc: "TV - Over There"}
+    - {id: 757, cat: TV, desc: "TV - Pan Am"}
+    - {id: 640, cat: TV, desc: "TV - Paradox"}
+    - {id: 778, cat: TV, desc: "TV - Parenthood"}
+    - {id: 613, cat: TV, desc: "TV - Parks and Recreation"}
+    - {id: 250, cat: TV, desc: "TV - Passions"}
+    - {id: 414, cat: TV, desc: "TV - PBS NOW"}
+    - {id: 690, cat: TV, desc: "TV - Penn and Teller Bullshit"}
+    - {id: 945, cat: TV, desc: "TV - Penny Dreadful"}
+    - {id: 927, cat: TV, desc: "TV - Perception"}
+    - {id: 785, cat: TV, desc: "TV - Person of Interest"}
+    - {id: 366, cat: TV, desc: "TV - Phil of the Future"}
+    - {id: 204, cat: TV, desc: "TV - Pimp My Ride"}
+    - {id: 967, cat: TV, desc: "TV - Player Attack"}
+    - {id: 427, cat: TV, desc: "TV - Poker"}
+    - {id: 691, cat: TV, desc: "TV - Pretty Little Liars"}
+    - {id: 784, cat: TV, desc: "TV - Prime Suspect US"}
+    - {id: 734, cat: TV, desc: "TV - Primeval"}
+    - {id: 229, cat: TV, desc: "TV - Prison Break"}
+    - {id: 692, cat: TV, desc: "TV - Private Practice"}
+    - {id: 368, cat: TV, desc: "TV - Project Runway"}
+    - {id: 663, cat: TV, desc: "TV - Psych"}
+    - {id: 205, cat: TV, desc: "TV - Punkd"}
+    - {id: 803, cat: TV, desc: "TV - QI"}
+    - {id: 982, cat: TV, desc: "TV - Quantico"}
+    - {id: 251, cat: TV, desc: "TV - Quantum Leap"}
+    - {id: 993, cat: TV, desc: "TV - Queen of the South"}
+    - {id: 252, cat: TV, desc: "TV - Queer as Folk"}
+    - {id: 714, cat: TV, desc: "TV - Raising Hope"}
+    - {id: 317, cat: TV, desc: "TV - Ravenswood"}
+    - {id: 936, cat: TV, desc: "TV - Ray Donovan"}
+    - {id: 594, cat: TV, desc: "TV - Ray Mears Northern Wilderness"}
+    - {id: 822, cat: TV, desc: "TV - Real Time with Bill Maher"}
+    - {id: 369, cat: TV, desc: "TV - Reba"}
+    - {id: 885, cat: TV, desc: "TV - Rectify"}
+    - {id: 206, cat: TV, desc: "TV - Red Dwarf"}
+    - {id: 906, cat: TV, desc: "TV - Red Widow"}
+    - {id: 117, cat: TV, desc: "TV - ReGenesis"}
+    - {id: 854, cat: TV, desc: "TV - Reign"}
+    - {id: 370, cat: TV, desc: "TV - Related"}
+    - {id: 327, cat: TV, desc: "TV - Remedy"}
+    - {id: 253, cat: TV, desc: "TV - Remington Steele"}
+    - {id: 254, cat: TV, desc: "TV - Reno 911"}
+    - {id: 207, cat: TV, desc: "TV - Rescue Me"}
+    - {id: 576, cat: TV, desc: "TV - Resurrection"}
+    - {id: 295, cat: TV, desc: "TV - Reunion"}
+    - {id: 208, cat: TV, desc: "TV - Revelations"}
+    - {id: 760, cat: TV, desc: "TV - Revenge"}
+    - {id: 859, cat: TV, desc: "TV - Revolution"}
+    - {id: 312, cat: TV, desc: "TV - Rewind"}
+    - {id: 768, cat: TV, desc: "TV - Ringer"}
+    - {id: 604, cat: TV, desc: "TV - Rip Off Britain"}
+    - {id: 693, cat: TV, desc: "TV - River Monsters"}
+    - {id: 929, cat: TV, desc: "TV - Rizzoli and Isles"}
+    - {id: 209, cat: TV, desc: "TV - Robot Chicken"}
+    - {id: 888, cat: TV, desc: "TV - Rogue"}
+    - {id: 944, cat: TV/Sport, desc: "TV - ROH-Wrestling"}
+    - {id: 255, cat: TV, desc: "TV - Rome"}
+    - {id: 849, cat: TV, desc: "TV - Rookie Blue"}
+    - {id: 694, cat: TV, desc: "TV - Royal Pains"}
+    - {id: 695, cat: TV, desc: "TV - Rubicon"}
+    - {id: 807, cat: TV, desc: "TV - Rules of Engagement"}
+    - {id: 372, cat: TV, desc: "TV - Ruri no Shima"}
+    - {id: 892, cat: TV, desc: "TV - Rush"}
+    - {id: 555, cat: TV, desc: "TV - Russian TV programs"}
+    - {id: 789, cat: TV, desc: "TV - Salem"}
+    - {id: 605, cat: TV, desc: "TV - Sanctuary"}
+    - {id: 776, cat: TV, desc: "TV - Satisfaction US"}
+    - {id: 373, cat: TV, desc: "TV - Saturday Night Live"}
+    - {id: 915, cat: TV, desc: "TV - Save Me"}
+    - {id: 696, cat: TV, desc: "TV - Saving Grace"}
+    - {id: 931, cat: TV, desc: "TV - Saving Hope"}
+    - {id: 844, cat: TV, desc: "TV - Scandal"}
+    - {id: 344, cat: TV, desc: "TV - Scorpion"}
+    - {id: 987, cat: TV, desc: "TV - Scream"}
+    - {id: 138, cat: TV, desc: "TV - Scrubs"}
+    - {id: 304, cat: TV, desc: "TV - Sean Saves The World"}
+    - {id: 715, cat: TV, desc: "TV - Secret Diary Of A Call Girl"}
+    - {id: 210, cat: TV, desc: "TV - Seinfeld"}
+    - {id: 296, cat: TV, desc: "TV - Sex and The City"}
+    - {id: 708, cat: TV, desc: "TV - Shameless"}
+    - {id: 375, cat: TV, desc: "TV - Sin Rastro"}
+    - {id: 737, cat: TV, desc: "TV - Single Ladies"}
+    - {id: 211, cat: TV, desc: "TV - Six Feet Under"}
+    - {id: 697, cat: TV, desc: "TV - Skins"}
+    - {id: 376, cat: TV, desc: "TV - Sleeper Cell"}
+    - {id: 112, cat: TV, desc: "TV - Sleepy Hollow"}
+    - {id: 256, cat: TV, desc: "TV - Sliders"}
+    - {id: 137, cat: TV, desc: "TV - Smallville"}
+    - {id: 830, cat: TV, desc: "TV - Smash"}
+    - {id: 649, cat: TV, desc: "TV - So You Think You Can Dance"}
+    - {id: 569, cat: TV, desc: "TV - Sons of Anarchy"}
+    - {id: 815, cat: TV, desc: "TV - Sons of Guns"}
+    - {id: 212, cat: TV, desc: "TV - South Park"}
+    - {id: 718, cat: TV, desc: "TV - Southland"}
+    - {id: 257, cat: TV, desc: "TV - Space 1999"}
+    - {id: 297, cat: TV, desc: "TV - Space Above and Beyond"}
+    - {id: 631, cat: TV, desc: "TV - Spartacus"}
+    - {id: 845, cat: TV, desc: "TV - Spike TV"}
+    - {id: 607, cat: TV, desc: "TV - Spooks"}
+    - {id: 131, cat: TV, desc: "TV - Sports Illustrated"}
+    - {id: 159, cat: TV/Sport, desc: "TV - Sports related"}
+    - {id: 378, cat: TV, desc: "TV - Stacked"}
+    - {id: 379, cat: TV, desc: "TV - Star Trek"}
+    - {id: 563, cat: TV, desc: "TV - Star Wars The Clone Wars"}
+    - {id: 615, cat: TV, desc: "TV - Star-Crossed"}
+    - {id: 139, cat: TV, desc: "TV - Star-Trek Enterprise"}
+    - {id: 144, cat: TV, desc: "TV - Star-Trek The Next Generation"}
+    - {id: 380, cat: TV, desc: "TV - Stargate"}
+    - {id: 123, cat: TV, desc: "TV - Stargate Atlantis"}
+    - {id: 124, cat: TV, desc: "TV - StarGate SG1"}
+    - {id: 562, cat: TV, desc: "TV - Stargate Universe"}
+    - {id: 258, cat: TV, desc: "TV - Starved"}
+    - {id: 213, cat: TV, desc: "TV - Stella"}
+    - {id: 614, cat: TV, desc: "TV - Steven Seagal Lawman"}
+    - {id: 381, cat: TV, desc: "TV - Still Standing"}
+    - {id: 857, cat: TV, desc: "TV - Strike Back"}
+    - {id: 528, cat: TV, desc: "TV - Studio 60 on the Sunset Strip"}
+    - {id: 838, cat: TV, desc: "TV - Suburgatory"}
+    - {id: 761, cat: TV, desc: "TV - Suits"}
+    - {id: 214, cat: TV, desc: "TV - Summerland"}
+    - {id: 400, cat: TV, desc: "TV - Super Fun Night"}
+    - {id: 298, cat: TV, desc: "TV - Supernatural"}
+    - {id: 299, cat: TV, desc: "TV - Surface"}
+    - {id: 382, cat: TV, desc: "TV - Survivor"}
+    - {id: 215, cat: TV, desc: "TV - Survivors"}
+    - {id: 847, cat: TV, desc: "TV - Swamp People"}
+    - {id: 863, cat: TV, desc: "TV - Switched at Birth"}
+    - {id: 153, cat: TV, desc: "TV - Tattoo Nightmares"}
+    - {id: 217, cat: TV, desc: "TV - Teen Titans"}
+    - {id: 731, cat: TV, desc: "TV - Teen Wolf"}
+    - {id: 764, cat: TV, desc: "TV - Terra Nova"}
+    - {id: 119, cat: TV, desc: "TV - That 70s Show"}
+    - {id: 316, cat: TV, desc: "TV - The 100"}
+    - {id: 168, cat: TV, desc: "TV - The 4400"}
+    - {id: 300, cat: TV, desc: "TV - The Adventures of Sherlock Holmes"}
+    - {id: 185, cat: TV, desc: "TV - The After"}
+    - {id: 383, cat: TV, desc: "TV - The Amazing Race"}
+    - {id: 887, cat: TV, desc: "TV - The Americans"}
+    - {id: 301, cat: TV, desc: "TV - The Apprentice"}
+    - {id: 384, cat: TV, desc: "TV - The Bernie Mac Show"}
+    - {id: 583, cat: TV, desc: "TV - The Big Bang Theory"}
+    - {id: 829, cat: TV, desc: "TV - The Big C"}
+    - {id: 572, cat: TV, desc: "TV - The Biggest Loser"}
+    - {id: 581, cat: TV, desc: "TV - The Blacklist"}
+    - {id: 410, cat: TV, desc: "TV - The Boondocks"}
+    - {id: 608, cat: TV, desc: "TV - The Border"}
+    - {id: 775, cat: TV, desc: "TV - The Borgias"}
+    - {id: 923, cat: TV, desc: "TV - The Bridge US"}
+    - {id: 711, cat: TV, desc: "TV - The Cape"}
+    - {id: 730, cat: TV, desc: "TV - The Carrie Diaries"}
+    - {id: 586, cat: TV, desc: "TV - The Cleveland Show"}
+    - {id: 896, cat: TV, desc: "TV - The Client List"}
+    - {id: 218, cat: TV, desc: "TV - The Closer"}
+    - {id: 272, cat: TV, desc: "TV - The Colbert Report"}
+    - {id: 219, cat: TV, desc: "TV - The Comeback"}
+    - {id: 510, cat: TV, desc: "TV - The Contender"}
+    - {id: 758, cat: TV, desc: "TV - The Crazy Ones"}
+    - {id: 114, cat: TV, desc: "TV - The Daily Show"}
+    - {id: 856, cat: TV, desc: "TV - The Dead Files"}
+    - {id: 220, cat: TV, desc: "TV - The Dead Zone"}
+    - {id: 189, cat: TV, desc: "TV - The Divide"}
+    - {id: 386, cat: TV, desc: "TV - The Dog Whisperer"}
+    - {id: 702, cat: TV, desc: "TV - The Event"}
+    - {id: 610, cat: TV, desc: "TV - The F Word"}
+    - {id: 639, cat: TV, desc: "TV - The Family"}
+    - {id: 835, cat: TV, desc: "TV - The Finder"}
+    - {id: 834, cat: TV, desc: "TV - The Firm"}
+    - {id: 973, cat: TV, desc: "TV - The Flash"}
+    - {id: 877, cat: TV, desc: "TV - The Following"}
+    - {id: 635, cat: TV, desc: "TV - The Forgotten"}
+    - {id: 932, cat: TV, desc: "TV - The Fosters"}
+    - {id: 816, cat: TV, desc: "TV - The Game"}
+    - {id: 766, cat: TV, desc: "TV - The Gates"}
+    - {id: 259, cat: TV, desc: "TV - The Girls Next Door"}
+    - {id: 740, cat: TV, desc: "TV - The Glades"}
+    - {id: 587, cat: TV, desc: "TV - The Goldbergs"}
+    - {id: 648, cat: TV, desc: "TV - The Good Wife"}
+    - {id: 912, cat: TV, desc: "TV - The Goodwin Games"}
+    - {id: 278, cat: TV, desc: "TV - The Haunting Of"}
+    - {id: 903, cat: TV, desc: "TV - The Hero"}
+    - {id: 655, cat: TV, desc: "TV - The Hills"}
+    - {id: 221, cat: TV, desc: "TV - The Inside"}
+    - {id: 595, cat: TV, desc: "TV - The Jeff Dunham Show"}
+    - {id: 387, cat: TV, desc: "TV - The Jetsons"}
+    - {id: 827, cat: TV, desc: "TV - The Killing"}
+    - {id: 388, cat: TV, desc: "TV - The King Of Queens"}
+    - {id: 321, cat: TV, desc: "TV - The Knick"}
+    - {id: 271, cat: TV, desc: "TV - The L Word"}
+    - {id: 609, cat: TV, desc: "TV - The League"}
+    - {id: 897, cat: TV, desc: "TV - The Leftovers"}
+    - {id: 808, cat: TV, desc: "TV - The Life and Times of Tim"}
+    - {id: 924, cat: TV, desc: "TV - The Listener"}
+    - {id: 222, cat: TV, desc: "TV - The Lone Gunmen"}
+    - {id: 152, cat: TV, desc: "TV - The Lost World"}
+    - {id: 643, cat: TV, desc: "TV - The Mentalist"}
+    - {id: 878, cat: TV, desc: "TV - The Michael J Fox"}
+    - {id: 630, cat: TV, desc: "TV - The Middle"}
+    - {id: 405, cat: TV, desc: "TV - The Millers"}
+    - {id: 901, cat: TV, desc: "TV - The Mindy Project"}
+    - {id: 860, cat: TV, desc: "TV - The Mob Doctor"}
+    - {id: 870, cat: TV, desc: "TV - The Musketeers"}
+    - {id: 239, cat: TV, desc: "TV - The Mysteries Of Laura"}
+    - {id: 938, cat: TV, desc: "TV - The Newsroom"}
+    - {id: 109, cat: TV, desc: "TV - The O.C."}
+    - {id: 308, cat: TV, desc: "TV - The Office"}
+    - {id: 319, cat: TV, desc: "TV - The Originals"}
+    - {id: 392, cat: TV, desc: "TV - The Others"}
+    - {id: 390, cat: TV, desc: "TV - The O`Reilly Factor"}
+    - {id: 698, cat: TV, desc: "TV - The Pacific"}
+    - {id: 302, cat: TV, desc: "TV - The PJs"}
+    - {id: 567, cat: TV, desc: "TV - The Practice"}
+    - {id: 260, cat: TV, desc: "TV - The Real World"}
+    - {id: 176, cat: TV, desc: "TV - The Red Road"}
+    - {id: 597, cat: TV, desc: "TV - The Replacements"}
+    - {id: 664, cat: TV, desc: "TV - The Sci Fi Guys"}
+    - {id: 393, cat: TV, desc: "TV - The Secret Adventures of Jules Verne"}
+    - {id: 786, cat: TV, desc: "TV - The Secret Circle"}
+    - {id: 668, cat: TV, desc: "TV - The Secret Life of the American Teenager"}
+    - {id: 735, cat: TV, desc: "TV - The Shadow Line"}
+    - {id: 223, cat: TV, desc: "TV - The Shield"}
+    - {id: 125, cat: TV, desc: "TV - The Simpsons"}
+    - {id: 423, cat: TV, desc: "TV - The Sopranos"}
+    - {id: 333, cat: TV, desc: "TV - The Strain"}
+    - {id: 236, cat: TV, desc: "TV - The Tomorrow People US"}
+    - {id: 699, cat: TV, desc: "TV - The Tudors"}
+    - {id: 611, cat: TV, desc: "TV - The Ultimate Fighter"}
+    - {id: 320, cat: TV, desc: "TV - The Unexplained Files"}
+    - {id: 721, cat: TV, desc: "TV - The Vampire Diaries"}
+    - {id: 654, cat: TV, desc: "TV - The Venture Bros"}
+    - {id: 725, cat: TV, desc: "TV - The Voice"}
+    - {id: 720, cat: TV, desc: "TV - The Walking Dead"}
+    - {id: 394, cat: TV, desc: "TV - The War At Home"}
+    - {id: 116, cat: TV, desc: "TV - The West Wing"}
+    - {id: 577, cat: TV, desc: "TV - The X Factor"}
+    - {id: 425, cat: TV, desc: "TV - Thief"}
+    - {id: 268, cat: TV, desc: "TV - Threshold"}
+    - {id: 796, cat: TV, desc: "TV - Thundercats"}
+    - {id: 216, cat: TV, desc: "TV - TLC Connections"}
+    - {id: 904, cat: TV/Sport, desc: "TV - TNA-Wrestling"}
+    - {id: 399, cat: TV, desc: "TV - Tonight Show With Jay Leno"}
+    - {id: 616, cat: TV, desc: "TV - Top Chef"}
+    - {id: 224, cat: TV, desc: "TV - Top Gear"}
+    - {id: 942, cat: TV, desc: "TV - Top Shot"}
+    - {id: 762, cat: TV, desc: "TV - Torchwood"}
+    - {id: 836, cat: TV, desc: "TV - Touch"}
+    - {id: 225, cat: TV, desc: "TV - Trailer Park Boys"}
+    - {id: 1001, cat: TV, desc: "TV - Transformers Prime"}
+    - {id: 733, cat: TV, desc: "TV - Treme"}
+    - {id: 303, cat: TV, desc: "TV - Tripping the Rift"}
+    - {id: 787, cat: TV, desc: "TV - Trophy Wife"}
+    - {id: 565, cat: TV, desc: "TV - True Blood"}
+    - {id: 180, cat: TV, desc: "TV - True Detective"}
+    - {id: 727, cat: TV, desc: "TV - Turn"}
+    - {id: 261, cat: TV, desc: "TV - Twin Peaks"}
+    - {id: 930, cat: TV, desc: "TV - Twisted"}
+    - {id: 401, cat: TV, desc: "TV - Two And A Half Men"}
+    - {id: 337, cat: TV, desc: "TV - Tyrant"}
+    - {id: 793, cat: TV/Sport, desc: "TV - UFC"}
+    - {id: 814, cat: TV, desc: "TV - Ugly Americans"}
+    - {id: 559, cat: TV, desc: "TV - Ugly Betty"}
+    - {id: 155, cat: TV, desc: "TV - UK"}
+    - {id: 934, cat: TV, desc: "TV - Under the Dome"}
+    - {id: 791, cat: TV, desc: "TV - Underbelly"}
+    - {id: 706, cat: TV, desc: "TV - Undercover Boss"}
+    - {id: 777, cat: TV, desc: "TV - Unforgettable"}
+    - {id: 129, cat: TV, desc: "TV - Unscripted"}
+    - {id: 739, cat: TV, desc: "TV - Unsealed Alien Files"}
+    - {id: 226, cat: TV, desc: "TV - Unsolved Mysteries"}
+    - {id: 868, cat: TV, desc: "TV - Up All Night"}
+    - {id: 262, cat: TV, desc: "TV - Urgences"}
+    - {id: 566, cat: TV, desc: "TV - V"}
+    - {id: 895, cat: TV, desc: "TV - Veep"}
+    - {id: 864, cat: TV, desc: "TV - Vegas"}
+    - {id: 121, cat: TV, desc: "TV - Veronica Mars"}
+    - {id: 908, cat: TV, desc: "TV - Vice"}
+    - {id: 402, cat: TV, desc: "TV - Viewtiful Joe"}
+    - {id: 799, cat: TV, desc: "TV - Vikings"}
+    - {id: 227, cat: TV, desc: "TV - Viva La Bam"}
+    - {id: 263, cat: TV, desc: "TV - Wanted"}
+    - {id: 593, cat: TV, desc: "TV - Warehouse 13"}
+    - {id: 995, cat: TV, desc: "TV - Wayward Pines"}
+    - {id: 264, cat: TV, desc: "TV - Weeds"}
+    - {id: 404, cat: TV, desc: "TV - Weird U S"}
+    - {id: 909, cat: TV, desc: "TV - Wentworth"}
+    - {id: 596, cat: TV, desc: "TV - When Ghosts Attack"}
+    - {id: 575, cat: TV, desc: "TV - White Collar"}
+    - {id: 406, cat: TV, desc: "TV - Whose Line Is It Anyway"}
+    - {id: 918, cat: TV, desc: "TV - Wilfred US"}
+    - {id: 135, cat: TV, desc: "TV - Will And Grace"}
+    - {id: 673, cat: TV, desc: "TV - Witches of East End"}
+    - {id: 408, cat: TV, desc: "TV - Without A Trace"}
+    - {id: 800, cat: TV, desc: "TV - Workaholics"}
+    - {id: 127, cat: TV/Sport, desc: "TV - WWE - Wrestling"}
+    - {id: 228, cat: TV, desc: "TV - X Files"}
+    - {id: 770, cat: TV, desc: "TV - X-Men"}
+    - {id: 265, cat: TV, desc: "TV - Young and the Restless"}
+    - {id: 801, cat: TV, desc: "TV - Young Justice"}
+    - {id: 889, cat: TV, desc: "TV - Zero Hour US"}
+    - {id: 1025, cat: TV/HD, desc: "TV - HEVC/x265"}
+    - {id: 1026, cat: TV/SD, desc: "TV - Divx/Xvid"}
+    - {id: 1027, cat: TV/SD, desc: "TV - DVD"}
+    - {id: 1028, cat: TV/HD, desc: "TV - HD"}
+    - {id: 1029, cat: TV/SD, desc: "TV - SVCD/VCD"}
+    # Apps
+    - {id: 7, cat: PC, desc: "Software"}
+    - {id: 532, cat: PC, desc: "Software - KeyGen / Tools"}
+    - {id: 17, cat: PC, desc: "Software - Linux"}
+    - {id: 27, cat: PC/Mac, desc: "Software - Mac"}
+    - {id: 232, cat: PC/Mobile-Other, desc: "Software - Mobile phones"}
+    - {id: 18, cat: PC, desc: "Software - Other operating systems"}
+    - {id: 19, cat: PC, desc: "Software - Palm, PocketPC and IPAQ"}
+    - {id: 20, cat: PC, desc: "Software - Windows - CD/DVD Tools"}
+    - {id: 25, cat: PC, desc: "Software - Windows - Other"}
+    - {id: 21, cat: PC, desc: "Software - Windows - Photo Editing"}
+    - {id: 22, cat: PC, desc: "Software - Windows - Security"}
+    - {id: 23, cat: PC, desc: "Software - Windows - Sound Editing"}
+    - {id: 24, cat: PC, desc: "Software - Windows - Video Apps"}
+    # Games
+    - {id: 3, cat: PC/Games, desc: "Games"}
+    - {id: 136, cat: PC/Games, desc: "Games - fixes/patches"}
+    - {id: 422, cat: PC/Games, desc: "Games - Other"}
+    - {id: 26, cat: PC/Games, desc: "Games - Mac"}
+    - {id: 231, cat: Console, desc: "Games - Mobile phones"}
+    - {id: 627, cat: Console/NDS, desc: "Games - Nintendo DS"}
+    - {id: 11, cat: Console, desc: "Games - PS 2"}
+    - {id: 700, cat: Console/PS3, desc: "Games - PS 3"}
+    - {id: 12, cat: Console, desc: "Games - PS X"}
+    - {id: 158, cat: Console/PSP, desc: "Games - PSP"}
+    - {id: 13, cat: Console, desc: "Games - ROMS/Retro"}
+    - {id: 15, cat: Console, desc: "Games - Sega Saturn"}
+    - {id: 14, cat: PC/Games, desc: "Games - Video Demonstrations"}
+    - {id: 701, cat: Console/Wii, desc: "Games - Wii"}
+    - {id: 421, cat: PC/Games, desc: "Games - Windows"}
+    - {id: 10, cat: PC/Games, desc: "Games - Windows Kids Games"}
+    - {id: 16, cat: Console/XBox, desc: "Games - XBox"}
+    - {id: 1017, cat: Console, desc: "Games - PS 1"}
+    - {id: 1018, cat: Console/XBox 360, desc: "Games - Xbox 360"}
+    - {id: 1014, cat: Console/3DS, desc: "Games - Nintendo 3DS"}
+    - {id: 1015, cat: Console, desc: "Games - Dreamcast"}
+    - {id: 1016, cat: Console, desc: "Games - GameCube"}
+    # XXX
+    - {id: 533, cat: XXX, desc: "XXX"}
+    - {id: 943, cat: XXX, desc: "XXX - Animation/Hentai"}
+    - {id: 553, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 536, cat: XXX, desc: "XXX - Games"}
+    - {id: 948, cat: XXX/x264, desc: "XXX - HD Video"}
+    - {id: 535, cat: XXX/ImageSet, desc: "XXX - Pictures"}
+    - {id: 552, cat: XXX, desc: "XXX - Video"}
+    - {id: 804, cat: XXX, desc: "XXX - Video 3D"}
+    - {id: 970, cat: XXX, desc: "XXX - Virtual Reality"}
+    - {id: 806, cat: XXX, desc: "XXX - Wallpapers"}
+    - {id: 811, cat: XXX, desc: "XXX - Books"}
+    # Books
+    - {id: 2, cat: Books, desc: "Books"}
+    - {id: 625, cat: Books, desc: "Books - Adventure"}
+    - {id: 51, cat: Audio/Audiobook, desc: "Books - Audio books"}
+    - {id: 848, cat: Books/Comics, desc: "Books - Comics"}
+    - {id: 624, cat: Books, desc: "Books - Crime"}
+    - {id: 623, cat: Books, desc: "Books - Drama"}
+    - {id: 50, cat: Books/EBook, desc: "Books - Ebooks"}
+    - {id: 621, cat: Books, desc: "Books - Educational"}
+    - {id: 622, cat: Books, desc: "Books - Horror"}
+    - {id: 465, cat: Books/Mags, desc: "Books - Magazines"}
+    - {id: 1000, cat: Books, desc: "Books - Sexual Fitness and Education"}
+    - {id: 626, cat: Books, desc: "Books - True Stories"}
+    # Other
+    - {id: 6, cat: Other, desc: "Pictures"}
+    - {id: 9, cat: Other, desc: "Other"}
+    - {id: 53, cat: Other, desc: "Pictures - Other"}
+    - {id: 52, cat: Other, desc: "Pictures - Wallpapers"}
+    - {id: 80, cat: Other, desc: "Other - Articles"}
+    - {id: 143, cat: Other, desc: "Other - Comics"}
+    - {id: 85, cat: Other, desc: "Other - Funny clips"}
+    - {id: 81, cat: Other, desc: "Other - Manuals"}
+    - {id: 83, cat: Other, desc: "Other - Other"}
+    - {id: 413, cat: Other, desc: "Other - Radio shows"}
+    - {id: 82, cat: Other, desc: "Other - Religion"}
+    - {id: 874, cat: Other, desc: "Other - Subtitles"}
+    - {id: 557, cat: Other, desc: "Other - Training "}
+    - {id: 1021, cat: Other, desc: "Other - Tutorials"}
+    - {id: 1022, cat: Other, desc: "Other - Sounds"}
+    - {id: 1023, cat: Other, desc: "Other - Nulled Scripts"}
+    # Mobile
+    - {id: 416, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 752, cat: PC/Mobile-Other, desc: "Mobile - Games for Android"}
+    - {id: 746, cat: PC/Mobile-Other, desc: "Mobile - Games for Apple iPod, iPod Touch, iPad, iPhone"}
+    - {id: 745, cat: PC/Mobile-Other, desc: "Mobile - Games for Java"}
+    - {id: 744, cat: PC/Mobile-Other, desc: "Mobile - Games for Symbian"}
+    - {id: 743, cat: PC/Mobile-Other, desc: "Mobile - Games for Windows Mobile"}
+    - {id: 517, cat: PC/Mobile-Other, desc: "Mobile - Music"}
+    - {id: 554, cat: PC/Mobile-Other, desc: "Mobile - Other"}
+    - {id: 748, cat: PC/Mobile-Other, desc: "Mobile - Software - Other"}
+    - {id: 972, cat: PC/Mobile-Other, desc: "Mobile - Software for Android"}
+    - {id: 749, cat: PC/Mobile-Other, desc: "Mobile - Software for Apple iPad, iPhone, iPod Touch"}
+    - {id: 747, cat: PC/Mobile-Other, desc: "Mobile - Software for Windows Mobile"}
+    - {id: 428, cat: PC/Mobile-Other, desc: "Mobile - Tv"}
+    - {id: 417, cat: PC/Mobile-Other, desc: "Mobile - Video"}
+    - {id: 750, cat: PC/Mobile-Other, desc: "Mobile - Video for Apple iPad, iPhone, iPod Touch"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings: []
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}{{ else }}/home{{ end }}"
+
+  rows:
+    selector: tr[class^="tl"]
+
+  fields:
+    title:
+      selector: td.tli a
+    category:
+      selector: td a[href^="/category/"]
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 2]
+    details:
+      selector: td.tli a
+      attribute: href
+    download:
+      selector: td a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: replace
+          args: [";", "&"]
+    date:
+      selector: td:nth-last-of-type(5)
+      filters:
+        - name: timeago
+    size:
+      selector: td:nth-last-of-type(4)
+    seeders:
+      text: 0
+    leechers:
+      text: 0
+    seeders:
+      optional: true
+      selector: td.sy
+    leechers:
+      optional: true
+      selector: td.ly
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/extremetorrents.yml
+++ b/src/Jackett.Common/Definitions/extremetorrents.yml
@@ -157,8 +157,10 @@ search:
          args: ["december", "December"]
        - name: re_replace
          args: ["\\s*om\\s*", " "]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "2 January 2006 15:04:05"
+          args: "2 January 2006 15:04:05 -07:00"
    seeders:
      text: 0
    seeders:
--- a/src/Jackett.Common/Definitions/exttorrents.yml
+++ b/src/Jackett.Common/Definitions/exttorrents.yml
@@ -8,8 +8,9 @@ encoding: UTF-8
 links:
  - https://ext.to/
  - https://torrent.extto.com/
+  - https://ext.torrentbay.to/
 legacylinks:
-  - https://ext.unblockninja.com/ # currently redirects to https://ext.to/
+  - https://ext.unblockninja.com/ # currently redirects to https://ext.torrentbay.to/
  - https://t.extto.com/ # redirects to https://torrent.extto.com/

 caps:
@@ -34,12 +35,15 @@ caps:
    - {id: "/games/ps3/", cat: Console/PS3, desc: "Games PS3"}
    - {id: "/games/ps4/", cat: Console/PS4, desc: "Games PS4"}
    - {id: "/games/psp/", cat: Console/PSP, desc: "Games PSP"}
+    - {id: "/games/switch/", cat: Console/Other, desc: "Games Switch"}
    - {id: "/games/wii/", cat: Console/Wii, desc: "Games Wii"}
    - {id: "/games/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
    - {id: "/movies/", cat: Movies, desc: Movies}
    - {id: "/movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
    - {id: "/movies/bollywood/", cat: Movies, desc: "Movies Bollywood"}
+    - {id: "/movies/documentary/", cat: Movies, desc: "Movies Documentary"}
    - {id: "/movies/dubbed-movies/", cat: Movies, desc: "Movies Dubbed"}
+    - {id: "/movies/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
    - {id: "/movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
    - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
    - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
@@ -51,6 +55,12 @@ caps:
    - {id: "/music/radio-shows/", cat: Audio, desc: "Music Radio Shows"}
    - {id: "/other/", cat: Other, desc: Other}
    - {id: "/tv/", cat: TV, desc: TV}
+    - {id: "/xxx/", cat: XXX, desc: XXX}
+    - {id: "/xxx/games/", cat: XXX/Other, desc: "XXX Games"}
+    - {id: "/xxx/hentai/", cat: XXX/Other, desc: "XXX Hentai"}
+    - {id: "/xxx/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
+    - {id: "/xxx/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
+    - {id: "/xxx/video/", cat: XXX, desc: "XXX Video"}

  modes:
    search: [q]
@@ -75,7 +85,10 @@ settings:
    options:
      desc: desc
      asc: asc
-
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.

 download:
  selector: a[href^="magnet:?xt="]
@@ -84,6 +97,9 @@ download:
 search:
  paths:
    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&{{ else }}latest/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/2/&{{ else }}latest/2/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/3/&{{ else }}latest/3/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/4/&{{ else }}latest/4/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"

  rows:
    selector: table.table-striped > tbody > tr
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -11,10 +11,9 @@ links:
  - https://eztv.wf/
  - https://eztv.tf/
  - https://eztv.yt/
-  - https://eztv.root.yt/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.app/
-  - https://eztv.unblocked.rest/
+  - https://eztv.unblockit.dev/
+  - https://eztv.unblocked.monster/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
@@ -36,6 +35,9 @@ legacylinks:
  - https://eztv.unblockit.top/
  - https://eztv.unblockit.lat/
  - https://eztv.io/
+  - https://eztv.unblockit.app/
+  - https://eztv.root.yt/
+  - https://eztv.unblocked.rest/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@@ -98,7 +98,7 @@ search:
    - path: browse_old.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    # 0 active 1 incldead 2 onlydead
    incldead: 1
    sort: "{{ .Config.sort }}"
--- a/src/Jackett.Common/Definitions/fantasticheaven.yml
+++ b/src/Jackett.Common/Definitions/fantasticheaven.yml
@@ -144,7 +144,7 @@ search:
  paths:
    - path: selection.php
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
    search: "{{ .Keywords }}"
    blah: 0
    orderby: "{{ .Config.sort }}"
@@ -154,8 +154,6 @@ search:
    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])

  fields:
-    title:
-      selector: a[href^="details.php?id="]
    category:
      selector: a[href^="selection.php?cat="]
      attribute: href
@@ -164,6 +162,8 @@ search:
          args: cat
        - name: replace
          args: ["#2", ""]
+    title:
+      selector: a[href^="details.php?id="]
    details:
      selector: a[href^="details.php?id="]
      attribute: href
@@ -187,10 +187,10 @@ search:
    date:
      selector: div.selection_unter_ab
      filters:
-        - name: append
-          args: " +01:00"
        - name: replace
          args: ["um ", ""]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
          args: "02.01.2006 15:04:05 -07:00"
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/femdomcult.yml
+++ b/src/Jackett.Common/Definitions/femdomcult.yml
@@ -78,12 +78,11 @@ search:
  paths:
    - path: torrents.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    title: "{{ .Keywords }}"
    order_by: "{{ .Config.sort }}"
    order_way: "{{ .Config.type }}"
-    action: basic
-    searchsubmit: 1
+    action: advanced

  rows:
    # exclude redbar torrents
@@ -117,12 +116,15 @@ search:
          args: ["/static/common/noartwork/noimage.png", ""]
    files:
      selector: td:nth-child(3)
+    date: # some torrents have "Never" date
+      text: 20 years ago
    date:
      selector: td:nth-child(5) > span
      attribute: title
+      optional: true
      filters:
        - name: append
-          args: " +00:00"
+          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "Jan 02 2006, 15:04 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/finvip.yml
+++ b/src/Jackett.Common/Definitions/finvip.yml
@@ -106,7 +106,7 @@ search:
  inputs:
    page: torrents
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
    # 0 title 1 title&descr 2 descr
    options: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
    # 0 all, 1 activeonly, 2 deadonly
--- a/src/Jackett.Common/Definitions/firebit.yml
+++ b/src/Jackett.Common/Definitions/firebit.yml
@@ -45,6 +45,7 @@ caps:
    - {id: "Музыка Видео", cat: Audio/Video, desc: "Музыка Видео"}
    - {id: "Другие категории", cat: Other, desc: "Другие категории"}
    - {id: "Сериалы", cat: TV, desc: "Сериалы"}
+    - {id: "-", cat: Other, desc: "Другие категории"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/focusx.yml
+++ b/src/Jackett.Common/Definitions/focusx.yml
@@ -213,6 +213,7 @@ search:
      selector: div.download a[href^="magnet:?"]
      attribute: href
    date:
+      # unix
      selector: abbr.DateTime
      optional: true
      attribute: data-time
@@ -248,8 +249,10 @@ search:
          args: ["ноя", "Nov"]
        - name: replace
          args: ["дек", "Dec"]
+        - name: append
+          args: " +03:00" # MSK
        - name: dateparse
-          args: "2 Jan 2006 15:04"
+          args: "2 Jan 2006 15:04 -07:00"
    size:
      selector: div.size
      filters:
--- a/src/Jackett.Common/Definitions/fouducinema.yml
+++ b/src/Jackett.Common/Definitions/fouducinema.yml
@@ -1,9 +1,9 @@
 ---
 id: fouducinema
 name: Fou-Du-Cinema
-description: "Fou-Du-Cinema (FdC) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Fou-Du-Cinema (FdC) is a FRENCH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-fr
-type: private
+type: semi-private
 encoding: UTF-8
 links:
  - https://fou-du-cinema.net/
@@ -13,27 +13,36 @@ caps:
    # when refreshing categories dont forget to update the category case block
    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
    - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 2, cat: Movies/DVD, desc: "Film DVD"}
-    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
-    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
-    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
+    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
+    - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
    - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 46, cat: TV/HD, desc: "Série 1080P"}
-    - {id: 48, cat: TV/HD, desc: "Série Bluray"}
-    - {id: 60, cat: TV/Other, desc: "Série Divers"}
-    - {id: 12, cat: TV/Other, desc: "Série DVDRip"}
-    - {id: 30, cat: TV/HD, desc: "Série 720P"}
-    - {id: 23, cat: TV/WEB-DL, desc: "Série Web"}
-    - {id: 44, cat: TV/HD, desc: "Pack Séries 1080P"}
-    - {id: 38, cat: TV/Other, desc: "Pack Séries intégrale"}
-    - {id: 41, cat: TV/WEB-DL, desc: "Pack Séries Web"}
-    - {id: 45, cat: TV/HD, desc: "Pack Séries 720P"}
-    - {id: 63, cat: TV/Other, desc: "Pack Séries Divers"}
-    - {id: 10, cat: XXX, desc: "XxX Film"}
+    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
+    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
+    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
+    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
+    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
+    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
+    - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
+    - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
+    - {id: 60, cat: TV/Other, desc: "Serie Divers"}
+    - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
+    - {id: 30, cat: TV/HD, desc: "Serie 720P"}
+    - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
+    - {id: 44, cat: TV/HD, desc: "Pack_Series 1080P"}
+    - {id: 38, cat: TV/Other, desc: "Pack_Series intégrale"}
+    - {id: 41, cat: TV/WEB-DL, desc: "Pack_Series Web"}
+    - {id: 45, cat: TV/HD, desc: "Pack_Series 720P"}
+    - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
+    - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
+    - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
+    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
    - {id: 13, cat: PC/0day, desc: "Apps Win"}
    - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
    - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
@@ -145,26 +154,35 @@ search:
      case:
        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
        ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Film\"):contains(\"DVD\")": 2
-        ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
-        ":contains(\"Film\"):contains(\"Web\")": 16
-        ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"720P\")": 19
-        ":contains(\"Film\"):contains(\"Divers\")": 59
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
+        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
+        ":contains(\"Film\"):contains(\"DVDRip\")": 2
        ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Série\"):contains(\"1080P\")": 46
-        ":contains(\"Série\"):contains(\"Bluray\")": 48
-        ":contains(\"Série\"):contains(\"Divers\")": 60
-        ":contains(\"Série\"):contains(\"DVDRip\")": 12
-        ":contains(\"Série\"):contains(\"720P\")": 30
-        ":contains(\"Série\"):contains(\"Web\")": 23
-        ":contains(\"Séries\"):contains(\"1080P\")": 44
-        ":contains(\"Séries\"):contains(\"intégrale\")": 38
-        ":contains(\"Séries\"):contains(\"Web\")": 41
-        ":contains(\"Séries\"):contains(\"720P\")": 45
-        ":contains(\"Séries\"):contains(\"Divers\")": 63
+        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"Divers\")": 59
+        ":contains(\"Film\"):contains(\"720P\")": 19
+        ":contains(\"Film\"):contains(\"Iso\")": 17
+        ":contains(\"Film\"):contains(\"Web\")": 16
+        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"1080P\")": 4
+        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
+        ":contains(\"Serie\"):contains(\"1080P\")": 46
+        ":contains(\"Serie\"):contains(\"Bluray\")": 48
+        ":contains(\"Serie\"):contains(\"Divers\")": 60
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"DVDRip\")": 12
+        ":contains(\"Serie\"):contains(\"720P\")": 30
+        ":contains(\"Serie\"):contains(\"Web\")": 23
+        ":contains(\"Pack_Series\"):contains(\"1080P\")": 44
+        ":contains(\"Pack_Series\"):contains(\"intégrale\")": 38
+        ":contains(\"Pack_Series\"):contains(\"Web\")": 41
+        ":contains(\"Pack_Series\"):contains(\"720P\")": 45
+        ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
+        ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
+        ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
        ":contains(\"XxX\"):contains(\"Film\")": 10
        ":contains(\"Apps\"):contains(\"Win\")": 13
        ":contains(\"Apps\"):contains(\"Mac\")": 14
@@ -199,6 +217,9 @@ search:
    details:
      selector: a[href^="details.php?id="]
      attribute: href
+    poster:
+      selector: img
+      attribute: src
    download:
      selector: a[href^="details.php?id="]
      attribute: href
--- a/src/Jackett.Common/Definitions/freetorrent.yml
+++ b/src/Jackett.Common/Definitions/freetorrent.yml
@@ -78,7 +78,7 @@ search:
    - path: torrents/filter
  inputs:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
@@ -86,10 +86,13 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
    qty: 100
+    page: 0
+    view: list

  rows:
    selector: table > tbody > tr
@@ -113,8 +116,12 @@ search:
      selector: div.torrent-poster img
      attribute: src
      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url=" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
--- a/src/Jackett.Common/Definitions/frozenlayer.yml
+++ b/src/Jackett.Common/Definitions/frozenlayer.yml
@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
  - https://www.frozen-layer.com/
+certificates:
+  - 5fc6a320560295f0d7589c9dd8738bfaed36c3aa # expired 20 December 2020

 settings:
  - name: category
@@ -43,17 +45,17 @@ caps:

 search:
  paths:
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{else}}descargas{{end}}"
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{else}}descargas{{end}}"
+    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{ else }}descargas{{ end }}"
+    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{ else }}descargas{{ end }}"
  keywordsfilters:
    - name: re_replace # remove first season from search string
-      args: ["(S1)", ""]
+      args: ["(?i)(S1)", ""]
    - name: re_replace # switch second season from search string
-      args: ["(S2)", "segunda temporada"]
+      args: ["(?i)(S2)", "segunda temporada"]
    - name: re_replace # switch third season from search string
-      args: ["(S3)", "tercera temporada"]
+      args: ["(?i)(S3)", "tercera temporada"]
    - name: re_replace # remove E from episode number from search string
-      args: ["E([0-9]+)", "$1"]
+      args: ["(?i)E([0-9]+)", "$1"]

  rows:
    selector: table#descargas > tbody > tr:has(td:has(a[href^="magnet:?"]))
@@ -73,7 +75,7 @@ search:
        - name: re_replace
          args: ["- Episodio ([0-9]*)", "$1"]
        - name: append
-          args: " [spanish]"
+          args: " Spanish"
    details:
      selector: td.tit a
      attribute: href
--- a/src/Jackett.Common/Definitions/fullmixmusic.yml
+++ b/src/Jackett.Common/Definitions/fullmixmusic.yml
@@ -33,54 +33,57 @@ search:
  paths:
    - path: browse.php
  inputs:
-    search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
-    showsearch: "1"
-    incldead: "1"
+    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+    showsearch: 1
+    incldead: 1
+
  rows:
    selector: table.tablak > tbody > tr:has(a[href^="details.php?id="])
+
  fields:
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
+    category:
+      text: 1
    title:
      selector: a[href^="details.php?id="][title]
      attribute: title
      filters:
        - name: regexp
          args: ^(.*?)<br />
+    details:
+      selector: a[href^="details.php?id="][title]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
    poster:
      selector: a[href^="details.php?id="][title]
      attribute: title
      filters:
        - name: regexp
          args: "src=\"(.*?)\">"
-    category:
-      text: "1"
-    details:
-      selector: a[href^="details.php?id="][title]
-      attribute: href
    description:
      selector: td:nth-child(2) > i > font
-    size:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(10)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
    date:
      selector: td:nth-child(6)
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    grabs:
+      selector: td:nth-child(10)
    downloadvolumefactor:
-      text: "0"
+      text: 0
    uploadvolumefactor:
      case:
-        font[title^="Dupla feltöltésű torrent!"]: "2"
-        font[title^="x3 feltöltésű torrent!"]: "3"
-        font[title^="x4 feltöltésű torrent!"]: "4"
-        "*": "1"
+        font[title^="Dupla feltöltésű torrent!"]: 2
+        font[title^="x3 feltöltésű torrent!"]: 3
+        font[title^="x4 feltöltésű torrent!"]: 4
+        "*": 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/funkytorrents.yml
+++ b/src/Jackett.Common/Definitions/funkytorrents.yml
@@ -72,11 +72,13 @@ search:
  paths:
    - path: browse.php
  inputs:
-    # $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
    incldead: 1
+
  rows:
    selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out
+
  fields:
    description:
      optional: true
@@ -84,6 +86,9 @@ search:
    title:
      selector: td:nth-child(2)
      remove: font
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
    category:
      selector: a[href^="browse.php?cat="]
      attribute: href
@@ -95,20 +100,11 @@ search:
      case:
        a[href="/browse.php?ext=1&bitrate=Lossless"]: 3040
        a[href="/browse.php?ext=1&format=MP3"]: 3010
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
    download:
      selector: a[href^="download.php"]
      attribute: href
    files:
      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(8)
-    seeders:
-      selector: td:nth-child(10)
-    leechers:
-      selector: td:nth-child(11)
    date:
      selector: td:nth-child(7)
      filters:
@@ -116,11 +112,20 @@ search:
          args: " +00:00" # GMT
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(8)
    grabs:
      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
    downloadvolumefactor:
      case:
        img[alt="Free Leech"]: 0
        "*": 1
    uploadvolumefactor:
      text: 1
+    minimumratio:
+      text: 0.6
+# engine tbd
--- a/src/Jackett.Common/Definitions/gay-torrents.yml
+++ b/src/Jackett.Common/Definitions/gay-torrents.yml
@@ -79,15 +79,17 @@ login:

 search:
  paths:
-    - path: "{{if .Query.Keywords}}search.php{{ else }}torrentslist.php{{ end }}"
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
  inputs:
-    $raw: "{{range .Categories}}type={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}type={{.}}&{{end}}"
    textsearch: "{{ .Keywords }}"
  keywordsfilters:
    - name: re_replace
      args: ["(\\w+)", " +$1"] # prepend + to each word
+
  rows:
    selector: ul.TorrentList
+
  fields:
    category:
      selector: .TorrentList1 > a
@@ -121,7 +123,7 @@ search:
          args: "02 Jan 06, 15:04 -07:00"
    downloadvolumefactor:
      case:
-        ".TorrentList2 > a:contains(\"[FFL]\")": "0"
+        ".TorrentList2 > a:contains(\"[FFL]\")": 0
        "*": 1
    uploadvolumefactor:
      text: 1
--- a/src/Jackett.Common/Definitions/gay-torrentsorg.yml
+++ b/src/Jackett.Common/Definitions/gay-torrentsorg.yml
@@ -85,7 +85,7 @@ search:
    - path: torrents_beta.php
      method: get
  inputs:
-    $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
    # 0 both, 1 active, 2 dead
    active: 0
--- a/src/Jackett.Common/Definitions/gaytorrentru.yml
+++ b/src/Jackett.Common/Definitions/gaytorrentru.yml
@@ -108,7 +108,7 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
    search: "{{ .Keywords }}"
    # 0 active, 1 both, 2 dead
    incldead: 1
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@@ -10,112 +10,66 @@ links:

 caps:
  categorymappings:
-    - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
-    - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
-    - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
-    - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEBRIP"}
-    - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
-    - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
-    - {id: 10, cat: TV/HD, desc: "Animation: HD720P"}
-    - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+    - {id: 106, cat: TV/Anime, desc: "Animation: FR"}
+    - {id: 13, cat: TV/Anime, desc: "Animation: VO"}
    - {id: 140, cat: PC, desc: "Applications: Noel"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
-    - {id: 40, cat: PC, desc: "Applications: Linux"}
-    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
    - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
    - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+    - {id: 40, cat: PC, desc: "Applications: Linux"}
    - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
+    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
    - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"}
-    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
    - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
-    - {id: 90, cat: Books/EBook, desc: "BD: Livres"}
-    - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"}
-    - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"}
-    - {id: 134, cat: TV/Documentary, desc: "Documentaires: Vostfr"}
-    - {id: 147, cat: TV/Documentary, desc: "Documentaires: Web Dl"}
-    - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
-    - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
+    - {id: 90, cat: Books/EBook, desc: "BD: Bande Dessinée"}
+    - {id: 76, cat: TV/Documentary, desc: "Documentaires: FR"}
    - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
+    - {id: 134, cat: TV/Documentary, desc: "Documentaires: VO"}
    - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"}
    - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
-    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
-    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
    - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"}
+    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
+    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
+    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
    - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
-    - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
-    - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"}
-    - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
-    - {id: 91, cat: Movies, desc: "Films: RemuX"}
-    - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
-    - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
    - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
-    - {id: 131, cat: Movies/3D, desc: "Films: Remux Bluray 3D"}
-    - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
-    - {id: 129, cat: Movies/BluRay, desc: "Films: Remux Bluray"}
-    - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEBRip"}
    - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
-    - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"}
-    - {id: 145, cat: Movies/SD, desc: "Films: VHS"}
-    - {id: 102, cat: Movies/WEB-DL, desc: "Films: WEB-DL 720P"}
-    - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
-    - {id: 130, cat: Movies/HD, desc: "Films: HD720P"}
-    - {id: 111, cat: Movies/WEB-DL, desc: "Films: WEBRip-720P"}
-    - {id: 1, cat: Movies/UHD, desc: "Films: Remux Bluray 4K"}
-    - {id: 112, cat: Movies/WEB-DL, desc: "Films: WEBrip-1080P"}
-    - {id: 101, cat: Movies/WEB-DL, desc: "Films: WEB-DL 1080P"}
-    - {id: 87, cat: XXX, desc: "Films: XXX"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
-    - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
-    - {id: 126, cat: Movies/HD, desc: "Films: HD X265"}
-    - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
-    - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
-    - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
-    - {id: 128, cat: Movies/UHD, desc: "Films: Webdl 4K"}
+    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
+    - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
+    - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
+    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
+    - {id: 2, cat: Movies/HD, desc: "Films: HD"}
+    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
+    - {id: 89, cat: Movies/SD, desc: "Films: SD"}
+    - {id: 70, cat: Movies/HD, desc: "Films: X265"}
    - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
    - {id: 135, cat: Movies, desc: "Films: Noel"}
-    - {id: 59, cat: TV, desc: "Films: Spectacle"}
-    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
+    - {id: 87, cat: XXX, desc: "Films: XXX"}
+    - {id: 4, cat: Movies, desc: "Films: ISO"}
+    - {id: 151, cat: TV, desc: "Films: .Série animation"}
+    - {id: 150, cat: TV, desc: "Films: .Film série"}
    - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"}
-    - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
-    - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
-    - {id: 137, cat: Audio, desc: "Musique: Noel"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
-    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
-    - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
    - {id: 97, cat: Audio, desc: "Musique: Podcast"}
+    - {id: 137, cat: Audio, desc: "Musique: Noel"}
+    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
+    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
    - {id: 98, cat: Audio, desc: "Musique: karaoké"}
-    - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
-    - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
-    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
+    - {id: 58, cat: Audio, desc: "Musique: Concert"}
+    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
    - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
    - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
-    - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
+    - {id: 153, cat: TV, desc: "Serie TV: Saison VO"}
+    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
    - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
-    - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
-    - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
-    - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
-    - {id: 144, cat: TV/WEB-DL, desc: "Serie TV: WEB-Rip"}
    - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 146, cat: TV/SD, desc: "Serie TV: VHSrip"}
-    - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
+    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+    - {id: 136, cat: TV, desc: "Serie TV: Noel"}

  modes:
    search: [q]
@@ -219,7 +173,7 @@ search:
        - name: re_replace
          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_original }}{{end}}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_original }}{{ end }}"
    category:
      selector: a[href^="torrents.php?cat="]
      attribute: href
--- a/src/Jackett.Common/Definitions/gfxpeers.yml
+++ b/src/Jackett.Common/Definitions/gfxpeers.yml
@@ -37,7 +37,7 @@ search:
  paths:
    - path: torrents.php
  inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
    searchstr: "{{ .Keywords }}"
    order_by: time
    order_way: desc
--- a/src/Jackett.Common/Definitions/gigatorrents.yml
+++ b/src/Jackett.Common/Definitions/gigatorrents.yml
@@ -165,6 +165,11 @@ search:
      filters:
        - name: trim
          args: "x"
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
    date:
      selector: td:nth-child(2)
      remove: a
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -50,13 +50,6 @@ caps:
    book-search: [q]

 settings:
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:?xt="
-    options:
-      "get_torrent": ".torrent"
-      "magnet:?xt=": "magnet"
  - name: multilang
    type: checkbox
    label: Replace MULTI by another language in release name
@@ -78,7 +71,7 @@ settings:
    default: false

 download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
+  selector: a[href*="magnet:?xt="]
  attribute: href

 search:
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -9,8 +9,8 @@ followredirect: true
 links:
  - https://www.gtdb.to/
  - https://glodls.to/
-  - https://glotorrents.unblockit.app/
-  - https://glodls.unblocked.rest/
+  - https://glotorrents.unblockit.dev/
+  - https://glodls.unblocked.monster/
 legacylinks:
  - https://glodls.rocks/
  - https://glotorrents.unblockit.pro/
@@ -30,6 +30,8 @@ legacylinks:
  - https://gtdb.to/
  - https://glotorrents.unblockit.top/
  - https://glotorrents.unblockit.lat/
+  - https://glotorrents.unblockit.app/
+  - https://glodls.unblocked.rest/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/greekdiamond.yml
+++ b/src/Jackett.Common/Definitions/greekdiamond.yml
@@ -144,29 +144,30 @@ search:
      filters:
        - name: regexp
          args: "src=(.*?) "
-    date: # some users will have a extra wait time column before the bookmark column, so use last-of-type
-      selector: td:nth-last-of-type(11)
+    # some users will have an extra wait time column before the bookmark column, so we count up from the bottom
+    date:
+      selector: td:nth-last-of-type(12)
      filters:
        - name: append
          args: " +00:00" # auto adjusted by site account profile
        - name: dateparse
          args: "02/01/2006 -07:00"
    seeders:
-      selector: td:nth-last-of-type(9)
+      selector: td:nth-last-of-type(10)
    leechers:
-      selector: td:nth-last-of-type(8)
+      selector: td:nth-last-of-type(9)
    grabs:
-      selector: td:nth-last-of-type(7)
+      selector: td:nth-last-of-type(8)
      filters:
        - name: replace
          args: ["---", "0"]
    size:
-      selector: td:nth-last-of-type(5)
+      selector: td:nth-last-of-type(6)
      filters:
        - name: replace
          args: [",", ""]
    description:
-      selector: td:nth-last-of-type(3) img
+      selector: td:nth-last-of-type(4) img
      attribute: title
      filters:
        - name: prepend
@@ -181,4 +182,7 @@ search:
      text: 1
    minimumratio:
      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # xbtit dt fm v20.0
--- a/src/Jackett.Common/Definitions/greekteam.yml
+++ b/src/Jackett.Common/Definitions/greekteam.yml
@@ -122,7 +122,7 @@ search:
      selector: td:has(a[href$="filelist=1"]) ~ td ~ td > nobr
      filters:
        - name: append
-          args: " +02:00"
+          args: " +02:00" # EET
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/hachede.yml
+++ b/src/Jackett.Common/Definitions/hachede.yml
@@ -1,301 +0,0 @@
---
-id: hachede
-name: HacheDe
-description: "HacheDe is a SPANISH site for HD content"
-language: es-es
-type: private
-encoding: UTF-8
-links:
-  - https://hachede.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 46, cat: Movies/3D, desc: "Películas 3D"}
-    - {id: 52, cat: Movies/BluRay, desc: "Películas Full Bluray"}
-    - {id: 33, cat: Movies/BluRay, desc: "Películas BDRemux"}
-    - {id: 120, cat: Movies/BluRay, desc: "Películas JMBD"}
-    - {id: 34, cat: Movies/HD, desc: "Películas BDrip 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Películas BDrip 720p"}
-    - {id: 140, cat: Movies/WEB-DL, desc: "Películas WEB-DL AMAZON"}
-    - {id: 141, cat: Movies/WEB-DL, desc: "Películas WEB-DL APPLE TV+"}
-    - {id: 142, cat: Movies/WEB-DL, desc: "Películas WEB-DL HBO"}
-    - {id: 143, cat: Movies/WEB-DL, desc: "Películas WEB-DL NETFLIX"}
-    - {id: 37, cat: Movies/Other, desc: "Películas HDTVrip"}
-    - {id: 119, cat: Movies/HD, desc: "Películas HDiTunes"}
-    - {id: 84, cat: Movies/HD, desc: "Películas MicroHD 1080p"}
-    - {id: 100, cat: Movies/HD, desc: "Películas MicroHD 720p"}
-    - {id: 16, cat: TV/HD, desc: "Series"}
-    - {id: 133, cat: TV/HD, desc: "Series WEB-DL AMAZON"}
-    - {id: 134, cat: TV/HD, desc: "Series WEB-DL HBO"}
-    - {id: 135, cat: TV/HD, desc: "Series WEB-DL NETFLIX"}
-    - {id: 136, cat: TV/HD, desc: "Series WEB-DL STARZ"}
-    - {id: 137, cat: TV/HD, desc: "Series WEB-DL DISNEY PLUS"}
-    - {id: 139, cat: TV/HD, desc: "Series WEB-DL APPLE TV+"}
-    - {id: 44, cat: TV/Other, desc: "Series HDTVrip"}
-    - {id: 144, cat: TV/HD, desc: "Series WEB-DL ATRESPLAYER PREMIUM"}
-    - {id: 89, cat: TV/HD, desc: "Series HDiTunes"}
-    - {id: 57, cat: TV/HD, desc: "Series Full Bluray"}
-    - {id: 40, cat: TV/HD, desc: "Series BDRemux"}
-    - {id: 121, cat: TV/HD, desc: "Series JMBD"}
-    - {id: 41, cat: TV/HD, desc: "Series BDrip 1080p"}
-    - {id: 101, cat: TV/HD, desc: "Series BDrip 720p"}
-    - {id: 45, cat: TV/HD, desc: "Series MicroHD 1080p"}
-    - {id: 102, cat: TV/HD, desc: "Series MicroHD 720p"}
-    - {id: 90, cat: Movies, desc: "Animación"}
-    - {id: 91, cat: Movies/3D, desc: "Animación 3D"}
-    - {id: 92, cat: Movies/BluRay, desc: "Animación Full Bluray"}
-    - {id: 93, cat: Movies/HD, desc: "Animación BDrip 1080p"}
-    - {id: 104, cat: Movies/HD, desc: "Animación BDrip 720p"}
-    - {id: 94, cat: Movies/BluRay, desc: "Animación BDRemux"}
-    - {id: 123, cat: Movies/BluRay, desc: "Animación JMBD"}
-    - {id: 96, cat: Movies/Other, desc: "Animación HDTVrip"}
-    - {id: 98, cat: Movies/HD, desc: "Animación MicroHD 1080p"}
-    - {id: 105, cat: Movies/HD, desc: "Animación MicroHD 720p"}
-    - {id: 32, cat: Movies, desc: "Documentales"}
-    - {id: 53, cat: Movies/BluRay, desc: "Documentales Full Bluray"}
-    - {id: 59, cat: Movies/3D, desc: "Documentales 3D"}
-    - {id: 64, cat: Movies/BluRay, desc: "Documentales BDremux"}
-    - {id: 138, cat: Movies/WEB-DL, desc: "Documentales WEB-DL"}
-    - {id: 122, cat: Movies/BluRay, desc: "Documentales JMBD"}
-    - {id: 68, cat: Movies/HD, desc: "Documentales BDrip 1080p"}
-    - {id: 106, cat: Movies/HD, desc: "Documentales BDrip 720p"}
-    - {id: 80, cat: Movies/Other, desc: "Documentales HDTVrip"}
-    - {id: 85, cat: Movies/HD, desc: "Documentales MicroHD 1080p"}
-    - {id: 107, cat: Movies/HD, desc: "Documentales MicroHD 720p"}
-    - {id: 114, cat: TV, desc: "TV"}
-    - {id: 115, cat: TV/Other, desc: "TV HDTVrip 1080p"}
-    - {id: 116, cat: TV/Other, desc: "TV HDTVrip 720p"}
-    - {id: 50, cat: Other, desc: "Deportes"}
-    - {id: 55, cat: Other/Misc, desc: "Deportes Full Bluray"}
-    - {id: 60, cat: Other/Misc, desc: "Deportes 3D"}
-    - {id: 65, cat: Other/Misc, desc: "Deportes BDremux"}
-    - {id: 69, cat: Other/Misc, desc: "Deportes BDrip 1080p"}
-    - {id: 108, cat: Other/Misc, desc: "Deportes BDrip 720p"}
-    - {id: 81, cat: Other/Misc, desc: "Deportes HDTVrip"}
-    - {id: 86, cat: Other/Misc, desc: "Deportes MicroHD 1080p"}
-    - {id: 109, cat: Other/Misc, desc: "Deportes MicroHD 720p"}
-    - {id: 51, cat: Movies, desc: "Conciertos"}
-    - {id: 56, cat: Movies/BluRay, desc: "Conciertos Full Bluray"}
-    - {id: 61, cat: Movies/3D, desc: "Conciertos 3D"}
-    - {id: 66, cat: Movies/HD, desc: "Conciertos BDremux"}
-    - {id: 70, cat: Movies/HD, desc: "Conciertos BDrip 1080p"}
-    - {id: 110, cat: Movies/HD, desc: "Conciertos BDrip 720p"}
-    - {id: 82, cat: Movies/Other, desc: "Conciertos HDTVrip"}
-    - {id: 87, cat: Movies/HD, desc: "Conciertos MicroHD 1080p"}
-    - {id: 111, cat: Movies/HD, desc: "Conciertos MicroHD 720p"}
-    - {id: 49, cat: XXX, desc: "Adultos"}
-    - {id: 54, cat: XXX/x264, desc: "Adultos Full Bluray"}
-    - {id: 62, cat: XXX/x264, desc: "Adultos 3D"}
-    - {id: 67, cat: XXX/x264, desc: "Adultos BDremux"}
-    - {id: 71, cat: XXX/x264, desc: "Adultos BDrip 1080p"}
-    - {id: 112, cat: XXX/x264, desc: "Adultos BDrip 720p"}
-    - {id: 83, cat: XXX/XviD, desc: "Adultos HDTVrip"}
-    - {id: 88, cat: XXX/x264, desc: "Adultos MicroHD 1080p"}
-    - {id: 113, cat: XXX/x264, desc: "Adultos MicroHD 720p"}
-    - {id: 124, cat: Movies, desc: "H265"}
-    - {id: 126, cat: Movies/HD, desc: "H265 Peliculas"}
-    - {id: 127, cat: TV/HD, desc: "H265 Series"}
-    - {id: 130, cat: Movies/3D, desc: "H265 3D"}
-    - {id: 128, cat: Movies/HD, desc: "H265 Animación"}
-    - {id: 129, cat: Movies/HD, desc: "H265 Documentales"}
-    - {id: 125, cat: Movies/UHD, desc: "UHD"}
-    - {id: 131, cat: Movies/UHD, desc: "UHD Películas"}
-    - {id: 132, cat: TV/UHD, desc: "UHD Series"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: ?p=home&pid=1
-    selector: div#member_info_bar
-
-search:
-  path: /
-  keywordsfilters:
-    - name: re_replace
-      args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-  inputs:
-    p: torrents
-    page: 1
-    pid: 10
-    $raw: "{{range .Categories}}&cid[]={{.}}{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name description both uploader
-    search_type: name
-    "sortOptions[sortBy]": "{{ .Config.sort }}"
-    "sortOptions[sortOrder]": "{{ .Config.type }}"
-
-  rows:
-    selector: "table#torrents_table_classic > tbody > tr:not(:first-child), .torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: td.torrent_image div.category_image a, .categoryImage a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cid
-    title:
-      selector: td.torrent_name > a, .newIndicator > a
-      filters:
-        - name: re_replace
-          args: ["(?i)full", "BRDISK."] # FULL(BR/UHD) -> BRDISK
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
-        - name: append
-          args: ".Spanish-HacheDe"
-        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
-        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: [".BR.", ".BDRip."] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m720p", "MicroHD.720p"] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m1080p", "MicroHD.1080p"] # Fix for Radarr
-    details:
-      selector: td.torrent_name > a, .newIndicator > a
-      attribute: href
-    download:
-      selector: .torrentImages > span:first-child a
-      attribute: href
-    poster:
-      selector: td.torrent_image div.relativeDiv div:not(.category_image) a, .previewImage a
-      attribute: href
-    imdb:
-      selector: .torrentFlags a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: td.torrent_name:contains("Subido"):contains("-"), .torrentOwner:contains("Subido"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: dateparse
-          args: "02-01-2006 15:04"
-    date:
-      selector: td.torrent_name:contains("Subido"):not(:contains("-")), .torrentOwner:contains("Subido"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: replace
-          args: ["Ayer a las", "Yesterday"]
-        - name: replace
-          args: ["Hoy en", "Today"]
-        - name: replace
-          args: ["Lunes a las", "Monday at"]
-        - name: replace
-          args: ["Martes a las", "Tuesday at"]
-        - name: replace
-          args: ["Miércoles a las", "Wednesday at"]
-        - name: replace
-          args: ["Jueves a las", "Thursday at"]
-        - name: replace
-          args: ["Viernes a las", "Friday at"]
-        - name: replace # WTF?
-          args: ["Friday a las", "Friday at"]
-        - name: replace
-          args: ["Sábado a las", "Saturday at"]
-        - name: replace
-          args: ["Domingo a las", "Sunday at"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    date:
-      selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: dateparse
-          args: "02-01-2006 15:04"
-    date:
-      selector: td.torrent_name:contains("Uploaded"):not(:contains("-")), .torrentOwner:contains("Uploaded"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: replace
-          args: ["Yesterday at", "Yesterday"]
-        - name: replace
-          args: ["Today at", "Today"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    size:
-      selector: td.size a, .torrentInfo a[rel="torrent_size"]
-    grabs:
-      selector: td.completed a, .torrentInfo a[rel="times_completed"]
-    seeders:
-      selector: td.seeders a, .torrentInfo a[rel="torrent_seeders"]
-    leechers:
-      selector: td.leechers a, .torrentInfo a[rel="torrent_leechers"]
-    downloadvolumefactor:
-      text: 1
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_free.png"]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["FREE LEECH!", "0"]
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_download.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    uploadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_upload.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      text: 259200 # 3 day (72h)
-# TSUE 2.2
--- a/src/Jackett.Common/Definitions/haidan.yml
+++ b/src/Jackett.Common/Definitions/haidan.yml
@@ -104,7 +104,7 @@ search:
    # supports search using imdbid, does not return imdb links in results

  rows:
-    selector: div.torrent_panel > div.torrent_group > div.group_content
+    selector: div.group_content

  fields:
    category:
@@ -137,12 +137,12 @@ search:
      attribute: data-src
    date:
      # time type: time elapsed (default)
-      selector: div.time_col > span[title]
+      selector: div.time_col span[title]
      attribute: title
      optional: true
      filters:
        - name: append
-          args: " +08:00" #CST
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -177,4 +177,6 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumratio:
+      text: 1.0
 # NexusPHP Standard v1.5 Beta 4 customised
--- a/Show More
+++ b/Show More