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 23:44:10 +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
566 changed files with 7860 additions and 7645 deletions
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@ Jackett works as a proxy server: it translates queries from apps ([Sonarr](https

 Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.

-
+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>
@@ -30,6 +30,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ACGsou (36DM)
 * Anidex
 * AniLibria
+ * AnimeClipse
 * Animedia
 * Anime Tosho
 * AniRena
@@ -44,7 +45,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Byrutor
 * CiliPro (LIAORENCILI)
 * ConCen
- * Corsaro.red
 * cpasbien
 * cpasbienClone
 * Demonoid
@@ -55,6 +55,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ETTV
 * EXT Torrents
 * ExtraTorrent.cd
+ * ExtraTorrent.it
 * EZTV
 * Filebase
 * FireBit
@@ -71,7 +72,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * KickAssTorrent (KATcr)
 * kickasstorrents (kickass.ws)
 * kickasstorrents.to
 * Legit Torrents
@@ -80,7 +80,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * LinuxTracker
 * MacTorrents
 * Magnet4You
- * MagnetDL
 * MejorTorrent
 * MixTapeTorrent
 * Monova
@@ -142,8 +141,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TorrentKitty
 * TorrentMafya
 * TorrentParadise
+ * TorrentProject
 * TorrentProject2
- * TorrentQuest
 * Torrents.csv
 * Torrentv
 * TorrentView (토렌트뷰)
@@ -154,7 +153,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * UnionDHT
 * VSTHouse
 * VST Torrents
- * XFSUB
 * xxxAdultTorrent
 * xxxtor
 * xxxtorrents
@@ -172,7 +170,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BookTracker
 * BootyTape
 * CasStudioTV
- * cool-torrent
 * Darmowe torrenty
 * Deildu
 * DimeADozen (EzTorrent)
@@ -188,8 +185,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * KinoNaVse100
 * Kinorun
 * Kinozal
- * Korsar
 * LostFilm.tv
+ * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
 * MVGroup Forum
 * MVGroup Main
 * Marine Tracker
@@ -221,7 +218,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 0day.kiev
 * 1ptbar
 * 2 Fast 4 You
- * 32Pages (32P)
 * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
 * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
 * 3evils
@@ -237,12 +233,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 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)
@@ -273,7 +268,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BroadCity [![(invite needed)][inviteneeded]](#)
 * BroadcasTheNet (BTN)
 * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BTGigs (TG) [![(invite needed)][inviteneeded]](#)
 * BTNext (BTNT)
 * BTSCHOOL
 * BWTorrents
@@ -287,11 +281,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ChannelX
 * ChileBT
 * Cinecalidad
- * CinemaMovies
+ * CinemaMovieS_ZT
 * CinemaZ (EuTorrents)
 * Cinemageddon
 * Cinematik
 * Classix
+ * Coastal-Crew
 * Concertos
 * CrazyHD
 * CrazySpirits
@@ -308,7 +303,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * DigitalCore
 * DivTeam
 * DivxTotal
- * DocumentaryTorrents (DT)
 * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
 * DXDHD
 * EbookParadijs
@@ -319,7 +313,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * EpubLibre
 * eShareNet
 * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
 * ExoticaZ (YourExotic)
 * ExtremeBits
 * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
@@ -351,7 +344,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * GreekDiamond
 * Greek Team
 * HaiDan
- * HacheDe
 * HD Dolby [![(invite needed)][inviteneeded]](#)
 * HD-Bits.com
 * HD-Forever (HDF)
@@ -367,7 +359,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * HDChina (HDWing)
 * HDC (HDCiTY)
 * HDCity
- * HDDisk (HDD)
 * HDHome (HDBigger)
 * HDME
 * HDRoute [![(invite needed)][inviteneeded]](#)
@@ -384,7 +375,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Horror Site
 * HQSource (HQS)
 * HuSh [![(invite needed)][inviteneeded]](#)
- * ICE Torrent
 * IPTorrents (IPT)
 * ImmortalSeed (iS)
 * Immortuos
@@ -398,7 +388,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * LatinoP2P
 * Le Saloon
 * LeChaudron
- * LeagueHD
+ * LemonHD
 * LearnFlakes
 * LegacyHD (HD4Free)
 * Libble
@@ -409,6 +399,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * MaDs Revolution
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
+ * MeseVilág (Fairytale World)
 * MicroBit (µBit)
 * Milkie
 * MMA-Torrents
@@ -455,6 +446,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * PThome
 * PTMSG
 * PTSBAO
+ * PTtime
 * PuntoTorrent
 * PuroVicio
 * Puur-Hollands
@@ -468,7 +460,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * RevolutionTT
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
 * RPTorrents
- * SceneFZ
 * SceneHD
 * ScenePalace (SP)
 * SceneRush
@@ -476,14 +467,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 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
@@ -492,14 +482,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 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)
@@ -560,11 +548,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * XWT-Classics
 * XWTorrents (XWT)
 * Xthor
- * XtreMeZone (MYXZ)
 * YDYPT
 * YingK
 * Zamunda.net
 * Zelka.org
+ * ZonaQ
 </details>

 Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.
@@ -590,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.

@@ -679,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:
 ```
@@ -703,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
@@ -728,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
@@ -759,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)
@@ -779,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
@@ -165,6 +165,14 @@ stages:
              contents: JackettService*
              targetFolder: $(Build.BinariesDirectory)/Jackett

+          - task: CopyFiles@2
+            displayName: Copy Windows Specific Scripts (Windows only)
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              SourceFolder: $(Build.SourcesDirectory)
+              contents: jackett_launcher.bat
+              targetFolder: $(Build.BinariesDirectory)/Jackett
+
          - task: CopyFiles@2
            displayName: Copy Mono Specific Scripts
            condition: and(succeeded(), startsWith(variables['buildDescription'], 'Mono'))
--- a/jackett_launcher.bat
+++ b/jackett_launcher.bat
@@ -0,0 +1,19 @@
+:: Helper script to fix
+:: https://github.com/Jackett/Jackett/issues/10068
+
+@echo off
+
+:: Wait until the updater ends
+:loop
+tasklist | find /i "JackettUpdater.exe" > nul 2>&1
+if errorlevel 1 (
+  goto continue
+) else (
+  echo JackettUpdater is still running
+  ping -n 2 127.0.0.1 > nul
+  goto loop
+)
+
+:: Start Jackett Tray
+:continue
+start "" "%0\..\JackettTray.exe" --UpdatedVersion yes
--- 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;
@@ -651,14 +660,14 @@ function updateReleasesRow(row)
    var labels = $(row).find("span.release-labels");
    var TitleLink = $(row).find("td.Title > a");
    var IMDBId = $(row).data("imdb");
-    var Banner = $(row).data("banner");
+    var Poster = $(row).data("poster");
    var Description = $(row).data("description");
    var DownloadVolumeFactor = parseFloat($(row).find("td.DownloadVolumeFactor").html());
    var UploadVolumeFactor = parseFloat($(row).find("td.UploadVolumeFactor").html());

    var TitleTooltip = "";
-    if (Banner)
-        TitleTooltip += "<img src='" + Banner + "' /><br />";
+    if (Poster)
+        TitleTooltip += "<img src='" + Poster + "' /><br />";
    if (Description)
        TitleTooltip += Description;

@@ -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
@@ -7,7 +7,7 @@
    <meta name="mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-capable" content="yes" />
    <meta charset="utf-8" />
-    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party ressources (E.g. Empornium banner images won't load) -->
+    <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
    <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
@@ -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="">
@@ -402,13 +418,13 @@
                            </thead>
                            <tbody>
                                {{#each releases}}
-                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-banner="{{BannerUrl}}" data-description="{{Description}}">
+                                <tr class="jackett-releases-row" data-imdb="{{Imdb}}" data-poster="{{Poster}}" data-description="{{Description}}">
                                    <td class="fit">{{PublishDate}}</td>
                                    <td class="fit">{{FirstSeen}}</td>
                                    <td class="fit">{{jacketTimespan PublishDate}}</td>
                                    <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                    <td class="fit">{{Tracker}}</td>
-                                    <td class="Title"><a href="{{Comments}}">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title"><a href="{{Details}}">{{Title}}</a> <span class="release-labels"></span></td>
                                    <td class="fit">{{Size}}</td>
                                    <td class="fit">{{jacketSize Size}}</td>
                                    <td class="fit">{{Files}}</td>
@@ -525,11 +541,11 @@
            </thead>
            <tbody>
                {{#each Results}}
-                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-banner="{{BannerUrl}}" data-description="{{Description}}">
+                <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-poster="{{Poster}}" data-description="{{Description}}">
                    <td>{{PublishDate}}</td>
                    <td>{{jacketTimespan PublishDate}}</td>
                    <td>{{Tracker}}</td>
-                    <td class="Title"><a href="{{Comments}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="Title"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                    <td>{{Size}}</td>
                    <td class="fit">{{jacketSize Size}}</td>
                    <td>{{Files}}</td>
@@ -680,6 +696,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201104"></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 }}"
@@ -149,7 +149,7 @@ search:
      selector: td:nth-child(2) i
      filters:
        - name: append
-          args: " +03:00"
+          args: " +03:00" # MSK
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    size:
--- 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/1ptbar.yml
+++ b/src/Jackett.Common/Definitions/1ptbar.yml
@@ -107,7 +107,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date:
@@ -126,7 +125,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- 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
@@ -203,7 +203,7 @@ search:
      filters:
        - name: replace
          args: ["torrents-details.php", "download.php"]
-    banner:
+    poster:
      selector: img.rounded-img
      attribute: src
    size:
--- a/src/Jackett.Common/Definitions/32pages.yml
+++ b/src/Jackett.Common/Definitions/32pages.yml
@@ -1,149 +0,0 @@
-# Because API is broken we use screen scraping instead of the generic Gazelle based approach
---
-id: 32pages
-name: 32Pages
-description: "32Pages (32P) is a Private Torrent Tracker for comic books/graphic novels"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://32pag.es/
-
-caps:
-  categories:
-    "Comics": Books/Comics
-
-  modes:
-    search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 2facode
-    type: text
-    label: 2FA code
-  - name: info_2fa
-    type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 32Pages Web Site. Otherwise just leave it empty."
-  - name: lockip
-    type: select
-    label: "Lock session to my IP address"
-    default: 1
-    options:
-      1: yes
-      0: no
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, your search query has to be <b>as specific as possible</b> (only <b>first 100</b> torrents will be displayed).
-
-login:
-  path: login
-  method: post
-  path: login.php
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    twostep_pub: "{{ .Config.2facode }}"
-    keeplogged: 1
-    lockip: "{{ .Config.lockip }}"
-  error:
-    - selector: "#formerror"
-  test:
-    path: torrents.php
-    selector: "#nav_userinfo"
-
-search:
-  paths:
-    - path: torrents.php
-    # site displays just 25 results per page, no profile options found to change this, so we attempt to fetch 4 pages
-    - path: torrents.php
-      inputs:
-        page: 2
-    - path: torrents.php
-      inputs:
-        page: 3
-    - path: torrents.php
-      inputs:
-        page: 4
-  inputs:
-    searchstr: "{{ .Keywords }}"
-    order_by: "{{ .Config.sort}}"
-    order_way: "{{ .Config.type}}"
-    disablegrouping: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr[class^="torrent"]
-
-  fields:
-    _grouptitle:
-      selector: a[href^="torrents.php?id="]
-    _language:
-      selector: img[class^="flag"]
-      attribute: alt
-      optional: true
-    title:
-      selector: a[title="View Torrent"]
-      filters:
-        - name: prepend
-          args: "{{.Result._grouptitle}} - "
-        - name: replace
-          args: ["/  /", "/"] # removes slash left after freeleech images
-        - name: append
-          args: "{{if .Result._language}} [{{.Result._language}}]{{else}}{{end}}"
-    category:
-      text: Comics
-    details:
-      selector: a[title="View Torrent"]
-      attribute: href
-    download:
-      selector: a[title="Download"]
-      attribute: href
-    size:
-      selector: td[headers="browse_size"]
-    files:
-      selector: td[headers="browse_files"]
-    grabs:
-      selector: td[headers="browse_snatches"]
-    seeders:
-      selector: td[headers="browse_seeders"]
-    leechers:
-      selector: td[headers="browse_leechers"]
-    date:
-      selector: td[headers="browse_time"] > span[title]
-      attribute: title
-      filters:
-        - name: dateparse
-          args: "Apr 04 2020, 16:24"
-    downloadvolumefactor:
-      case:
-        img.fl-diamond: 0
-        img.fl-sapphire: 0
-        img.fl-emerald: 0
-        img.fl-ruby: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# gazelle
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -130,7 +130,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +07:00"
+          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -139,7 +139,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +07:00"
+          args: " +07:00" # ICT
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- a/src/Jackett.Common/Definitions/3dtorrents.yml
+++ b/src/Jackett.Common/Definitions/3dtorrents.yml
@@ -100,13 +100,15 @@ search:
      selector: td:nth-last-child(4)
    seeders:
      selector: td:nth-last-child(3)
-    # leechers:
-    #   selector: td:nth-last-child(2)
+    leechers:
+      text: 0
    date:
      selector: td:nth-last-child(5)
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "02/01/2006"
+          args: "02/01/2006 -07:00"
    downloadvolumefactor:
      case:
        img[title^="You get 50% off download count on this torrent"]: 0.5
--- 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
@@ -132,10 +132,9 @@ search:
    download:
      selector: a[href^="download.php?torrent="]
      attribute: href
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
-      optional: true
      filters:
        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
        # <img src=\'./pic/noposter.png\'
--- 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
@@ -117,9 +118,8 @@ search:
      attribute: href
    description:
      selector: div.tags
-    banner:
+    poster:
      selector: td:nth-child(2) script
-      optional: true
      filters:
        - name: regexp
          args: "src=(.*?)>"
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -112,7 +112,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -122,7 +121,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -131,7 +130,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- 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/acgsou.yml
+++ b/src/Jackett.Common/Definitions/acgsou.yml
@@ -58,7 +58,7 @@ search:
  paths:
    # https://www.acgsou.com/1.html
    # https://www.acgsou.com/search.php?keyword=test
-    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{else}}1.html{{end}}"
+    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}1.html{{ end }}"

  rows:
    selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/src/Jackett.Common/Definitions/acidlounge.yml
@@ -81,11 +81,13 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
    search: "{{ .Keywords }}"
-    search_type: "title"
+    search_type: title
+
  rows:
    selector: table#browse_torrents_table > tbody > tr[id^="torrent_row_"]
+
  fields:
    title:
      selector: a.torrent_name
@@ -119,15 +121,15 @@ search:
          args: ([\d\.]+)
    downloadvolumefactor:
      case:
-        ":root div#notice_ratioBoostingMadness": "0"
-        "*": "1"
+        ":root div#notice_ratioBoostingMadness": 0
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
    date:
      selector: td.torrent_table_dateAdded
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
+# engine tbd
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -137,15 +137,14 @@ search:
      attribute: href
      filters:
        - name: urldecode
-    banner:
+    poster:
      selector: a[onmouseover]
      attribute: onmouseover
      filters:
        - name: regexp
          args: "src=(.*?) width="
    imdb:
-      optional: true
-      selector: a[href^="https://www.imdb.com/title"]
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
      selector: td:nth-last-child(6)
@@ -162,8 +161,10 @@ search:
      filters:
        - name: re_replace
          args: ["\\s", " "]
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "2006-01-02 15:04:05 -07:00"
    downloadvolumefactor:
      case:
        span.icon_gift: 0
--- 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:
@@ -111,16 +114,14 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          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:
@@ -133,49 +134,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
-      optional: true
      selector: a[href*="themoviedb.org/movie/"]
      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -192,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/animeclipse.yml
+++ b/src/Jackett.Common/Definitions/animeclipse.yml
@@ -0,0 +1,90 @@
+---
+id: animeclipse
+name: AnimeClipse
+description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - http://www.animeclipse.com/ # does not support https ERR_CONNECTION_REFUSED
+
+settings:
+  - 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
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+search:
+  paths:
+    # http://www.animeclipse.com/index.php?ind=btitracker&search=sword&category=0&active=0&tor_page=10
+    - path: index.php
+  inputs:
+    ind: btitracker
+    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
+    search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
+    # does not support multi cats searching so defaulting to all.
+    category: 0
+    # 0 all, 1 active, 2 dead
+    active: 0
+    tor_page: 100
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: tr.torrentRow
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: a[href*="/download/"]
+      filters:
+        # move group to the end
+        - name: re_replace
+          args: ["^(\\[.+?\\])(.+?)$", "$2 $1"]
+        - name: re_replace
+          args: ["(_|\\[|\\])", " "]
+    details:
+      text: "{{ .Config.sitelink }}"
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    size:
+      selector: td:contains("[size:") > span.torrentInfoData
+    date:
+      selector: td:contains("[Added:") > span.torrentInfoData
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "02/01/2006 15:04:05 -07:00"
+    grabs:
+      selector: td:contains("[Completed:") > span.torrentInfoData
+    seeders:
+      selector: td:contains("Seeders") > span.torrentInfoData
+    leechers:
+      selector: td:contains("Leechers") > span.torrentInfoData
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# btitracker
--- 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:
@@ -53,7 +55,7 @@ settings:
  - name: info
    type: info
    label: Results Per Page
-    default: For best results, change the 'Torrentliste' setting to "Platzsparendes Layout mit PopUp für zusätzliche Informationen" in your profile.
+    default: For best results, change the <b>Torrentliste</b> setting to <i>Platzsparendes Layout mit PopUp für zusätzliche Informationen</i> in your profile.

 login:
  path: takelogin.php
@@ -69,14 +71,15 @@ search:
  paths:
    - path: browse.php
  inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "0"
-    orderby: "added"
-    sort: "desc"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 0
+    orderby: added
+    sort: desc

  rows:
    selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+
  fields: # note: two alternative layouts available
    title:
      selector: a[href^="details.php"]
@@ -117,15 +120,15 @@ search:
        - name: replace
          args: [" ", ""]
        - name: append
-          args: " +2:00"
+          args: " +2:00" # EET
        - name: replace
          args: ["\xA0", ""]
        - name: dateparse
          args: "02.01.200615:04:05 -07:00"
    downloadvolumefactor:
      case:
-        img[src="/pic/free.gif"]: "0"
-        "*": "1"
+        img[src="/pic/free.gif"]: 0
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/src/Jackett.Common/Definitions/arabafenice.yml
@@ -19,7 +19,6 @@ caps:
    - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
    - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
    - {id: 39, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
-
    # VIDEO
    - {id: 1, cat: Movies, desc: "News Cinema"}
    - {id: 2, cat: Movies/SD, desc: "BD-DVDRip"}
@@ -41,24 +40,20 @@ caps:
    - {id: 40, cat: TV/UHD, desc: "2160p 4K UltraHD"}
    - {id: 38, cat: XXX, desc: "xXx"}
    - {id: 43, cat: Other, desc: "Arabic for social"}
-
    # MUSICA
    - {id: 17, cat: Audio, desc: "Italian music"}
    - {id: 45, cat: Audio, desc: "Discography"}
    - {id: 18, cat: Audio, desc: "MusicaInternazionale"}
    - {id: 19, cat: Audio, desc: "Compilation"}
-
    # PDF
    - {id: 21, cat: Books, desc: "Ebook"}
    - {id: 22, cat: Books/Comics, desc: "Comics"}
    - {id: 23, cat: Books, desc: "Newsstand"}
-
    # GAMES
    - {id: 25, cat: Console/PS4, desc: "Sony Games"}
    - {id: 26, cat: Console/XBox, desc: "XboX Games"}
    - {id: 27, cat: Console/Other, desc: "Nintendo Games"}
    - {id: 28, cat: PC/Games, desc: "PC Games"}
-
    # SOFTWARE
    - {id: 30, cat: PC/ISO, desc: "Windows APP"}
    - {id: 31, cat: PC/Mobile-iOS, desc: "Apple APP"}
@@ -140,10 +135,10 @@ search:
    - name: re_replace # S01E01 to 1 1
      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
  inputs:
-    search: "{{if .Query.IMDBID}}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
    page: torrents
    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    options: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
    active: 0
    order: "{{ .Config.sort }}"
    by: "{{ .Config.type }}"
@@ -172,7 +167,7 @@ search:
          args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
        - name: re_replace # Episodi 4 5 to E04-05
          args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
-    banner:
+    poster:
      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
      attribute: onmouseover
      filters:
@@ -193,7 +188,7 @@ search:
      selector: td:nth-last-child(9)
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "02/01/2006 -07:00"
    grabs:
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -116,7 +116,7 @@ search:
  inputs:
    page: torrents
    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
    # 0 all 1 activeonly 2 deadonly
    active: 0
    # 0 all 1 internal 2 external
--- 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"]
-    banner:
-      selector: td.filename div:nth-child(2) a
+    poster:
+      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,205 +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+)$
-    banner:
-      optional: true
-      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 }}"
@@ -103,16 +104,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      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", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -125,9 +126,11 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
@@ -149,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="])
@@ -205,7 +208,7 @@ search:
        - name: regexp
          args: "(\\d{2}\\/\\d{2}\\/\\d{2} \\d{2}:\\d{2}:\\d{2})"
        - name: append
-          args: " -03:00"
+          args: " -03:00" # BRT
        - name: dateparse
          args: "02/01/06 15:04:05 -07:00"
    size:
--- 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:
@@ -115,8 +116,7 @@ search:
    download:
      selector: div.postTitle h2 a
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: img
      attribute: src
    _date:
--- 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
@@ -141,7 +141,7 @@ search:
    download:
      selector: a[href^="download.php?torrent="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/img.php?"]
      attribute: src
    files:
--- 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/backups.yml
+++ b/src/Jackett.Common/Definitions/backups.yml
@@ -65,17 +65,25 @@ search:
    - name: re_replace
      args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
  inputs:
-    do: "search"
+    do: search
    keywords: "{{ .Keywords }}"
-    search_type: "t_name"
-    category: "0" # multi cat search not supported
-    include_dead_torrents: "yes"
+    search_type: t_name
+    category: 0 # multi cat search not supported
+    include_dead_torrents: yes
+
  rows:
    selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
    filters:
      - name: andmatch
        args: 66
+
  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
    title:
      selector: a[href*="/details.php?id="]
    title:
@@ -90,12 +98,6 @@ search:
    magnet:
      selector: a[href^="magnet:?xt="]
      attribute: href
-    category:
-      selector: a[href*="/browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
    size:
      selector: td:nth-child(5)
    grabs:
@@ -109,18 +111,18 @@ search:
      remove: span
      filters:
        - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
        - name: dateparse
          args: "02-01-2006 15:04 -07:00"
-    banner:
+    poster:
      optional: true
      selector: div.tooltip-content > img
      attribute: src
    downloadvolumefactor:
      case:
-        img[alt^="Free Torrent "]: "0"
-        img[alt^="Silver Torrent "]: "0.5"
-        "*": "1"
+        img[alt^="Free Torrent "]: 0
+        img[alt^="Silver Torrent "]: 0.5
+        "*": 1
    uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -112,7 +112,7 @@ search:
    details:
      selector: a[href^="details.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: img[src^="/posters/"]
      attribute: src
    download:
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -114,7 +114,6 @@ search:
      selector: a[href^="download.php?id="]
      attribute: href
    imdb:
-      optional: true
      selector: div.imdb_100 > a
      attribute: href
    date:
@@ -124,7 +123,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    date:
@@ -133,7 +132,7 @@ search:
      optional: true
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    size:
--- 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,19 +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
-    banner:
-      optional: true
-      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:
@@ -105,9 +97,11 @@ search:
    grabs:
      selector: a[href$="/history"]
    imdb:
-      optional: true
      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,19 +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
-    banner:
-      optional: true
-      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:
@@ -125,9 +117,11 @@ search:
    grabs:
      selector: a[href$="/history"]
    imdb:
-      optional: true
      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/bigfangroup.yml
+++ b/src/Jackett.Common/Definitions/bigfangroup.yml
@@ -91,7 +91,7 @@ search:
  inputs:
    search: "{{ .Keywords }}"
    cat: 0
-    # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver 7 BFG
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver, 7 BFG
    incldead: 1
    ajax: 1
    year: 0
--- 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/bigtower.yml
+++ b/src/Jackett.Common/Definitions/bigtower.yml
@@ -13,7 +13,6 @@ legacylinks:
 caps:
  categorymappings:

-    # Movies
    - {id: 11, cat: Movies/HD, desc: "DSS"}
    - {id: 1, cat: Movies, desc: "Screener"}
    - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
@@ -21,17 +20,11 @@ caps:
    - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
    - {id: 6, cat: TV, desc: "Serie TV"}
    - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-    # GAMES
    - {id: 7, cat: PC/Games, desc: "Giochi"}
-    # MUSIC
    - {id: 8, cat: Audio, desc: "Musica"}
-    # SOFTWARE
    - {id: 9, cat: PC/0day, desc: "Software"}
-    # PHONE
    - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
-    # OTHER
    - {id: 14, cat: Other, desc: "Varie & Altro"}
-    # EBOOK
    - {id: 13, cat: Books, desc: "Libri & Edicola"}

  modes:
@@ -80,42 +73,42 @@ search:
    active: 0

  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{if .Config.donor }}{{else}}:not(:has(img[src*="keditbookmarks.png"])){{end}}
+    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{ if .Config.donor }}{{ else }}:not(:has(img[src*="keditbookmarks.png"])){{ end }}

  fields:
-    download:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(\\[Richiesta\\])", ""]
-    banner:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
    category:
      selector: a[href^="index.php?page=torrents&category="]
      attribute: href
      filters:
        - name: querystring
          args: category
+    title:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      filters:
+        - name: re_replace # rimozioni varie
+          args: ["(?i)(\\[Richiesta\\])", ""]
    details:
      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
      attribute: href
+    download:
+      selector: a[href^="index.php?page=torrent-details&id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["index.php?page=torrent-details&id=", "download.php?id="]
+    poster:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
    size:
      selector: td:nth-last-child(2)
    date:
      selector: td:nth-last-child(8)
      filters:
        - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "02/01/2006 -07:00"
    grabs:
--- 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 freeleech yielded no results, using 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
-    banner:
-      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/bithorlo.yml
+++ b/src/Jackett.Common/Definitions/bithorlo.yml
@@ -120,8 +120,7 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: a[href^="torrent.php?id="][onmouseover]
      attribute: onmouseover
      filters:
--- 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:
@@ -97,7 +97,7 @@ search:
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    banner:
+    poster:
      selector: a[onmouseover^="bithumen.UI.images.coverShow"]
      attribute: onmouseover
      filters:
@@ -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
@@ -81,7 +80,7 @@ search:
      filters:
        - name: replace
          args: ["Присутствует реклама", "Contains Adverts"]
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
      filters:
--- 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"}
@@ -185,9 +189,8 @@ search:
      selector: a[rel="torrent_leechers"]
    grabs:
      selector: a[rel="times_completed"]
-    banner:
+    poster:
      selector: a[rel="fancybox"]
-      optional: true
      attribute: href
    downloadvolumefactor:
      case:
--- a/src/Jackett.Common/Definitions/bluebird.yml
+++ b/src/Jackett.Common/Definitions/bluebird.yml
@@ -80,7 +80,7 @@ search:
      selector: td:nth-child(5)
    leechers:
      selector: td:nth-child(6)
-    banner:
+    poster:
      selector: a.tname
      attribute: onmouseover
      filters:
--- 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:
@@ -110,16 +110,14 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: div.torrent-poster img
      attribute: src
      filters:
        - name: replace
-          args: ["https://via.placeholder.com/600x900", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          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:
@@ -132,49 +130,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
-      optional: true
      selector: a[href*="themoviedb.org/movie/"]
      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -194,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/bootytape.yml
+++ b/src/Jackett.Common/Definitions/bootytape.yml
@@ -103,10 +103,9 @@ search:
      attribute: href
    description:
      selector: div.specg
-    banner:
+    poster:
      selector: img[src*="/thbx/imgx/"]
      attribute: src
-      optional: true
    files:
      text: 1
    files:
--- a/src/Jackett.Common/Definitions/borgzelle.yml
+++ b/src/Jackett.Common/Definitions/borgzelle.yml
@@ -130,7 +130,7 @@ search:
    download:
      selector: a[href^="torrents.php?action=download&id="]
      attribute: href
-    banner:
+    poster:
      selector: a[href^="torrents.php?torrentid="] span img
      attribute: src
    date:
@@ -139,33 +139,33 @@ search:
      filters:
        - name: regexp
          args: "\\((.+?)\\)"
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
@@ -173,7 +173,8 @@ search:
        - name: re_replace
          args: ["(?i) (an)", "year"]
        - name: re_replace
-          args: ["(?i)(und)", ""]
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    size:
      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) b
      filters:
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/src/Jackett.Common/Definitions/boxingtorrents.yml
@@ -86,7 +86,7 @@ search:
    # https://tc-boxing.com/browse.php?search=tyson&cat=0&incldead=1
    - path: browse.php
  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
+    $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
    # 1 incldead, null active
    incldead: 1
    # 1 freeleech only, null all
--- a/src/Jackett.Common/Definitions/brasiltracker.yml
+++ b/src/Jackett.Common/Definitions/brasiltracker.yml
@@ -94,14 +94,12 @@ search:
      attribute: href
    description:
      selector: div.tags
-    banner:
+    poster:
      selector: img[alt="Cover"]
      attribute: src
-      optional: true
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-      optional: true
    files:
      selector: td:nth-child(3)
    date:
@@ -135,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/broadcity.yml
+++ b/src/Jackett.Common/Definitions/broadcity.yml
@@ -76,6 +76,12 @@ search:
    selector: table#sortabletable tbody tr:has(div[id^="port-target-"])

  fields:
+    category:
+      selector: a[href*="browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
    title:
      selector: div[id^="port-target-"] a
      filters:
@@ -84,13 +90,10 @@ search:
    details:
      selector: div[id^="port-target-"] a
      attribute: href
-    category:
-      selector: a[href*="browse.php?category="]
+    download:
+      selector: a[href*="download.php?id="]
      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    banner:
+    poster:
      selector: div[id^="port-content-"] img
      attribute: src
    date:
@@ -99,14 +102,10 @@ search:
        - name: regexp
          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
      filters:
+        - name: append
+          args: " +03:00" # TRT
        - name: dateparse
-          args: "02-01-2006 15:04"
-    download:
-      selector: a[href*="download.php?id="]
-      attribute: href
-    comments:
-      selector: td:nth-child(4) a
-      attribute: href
+          args: "02-01-2006 15:04 -07:00"
    size:
      selector: td:nth-child(5)
    grabs:
--- 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
@@ -83,7 +84,7 @@ search:
    magnet:
      selector: a[href^="magnet:?xt="]
      attribute: href
-    banner:
+    poster:
      selector: a.img-thumbnail img
      attribute: src
      filters:
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -55,9 +55,6 @@ search:
      attribute: href
    files:
      selector: td:nth-child(4)
-    comments:
-      selector: td:nth-child(5) a
-      attribute: href
    date:
      selector: td:nth-child(6)
      filters:
--- a/src/Jackett.Common/Definitions/btgigs.yml
+++ b/src/Jackett.Common/Definitions/btgigs.yml
@@ -1,144 +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/
-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
-
-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]
-
-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: "{{ .Query.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:
-    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
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    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:
-      optional: true
-      selector: a[href*="imdb.com/title/tt"]
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00"
-        - 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"
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/src/Jackett.Common/Definitions/btnext.yml
@@ -165,9 +165,9 @@ search:
    p: torrents
    pid: 32
    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
    # name, description, both, uploader
-    search_type: "{{ if .Query.IMDBID }}description{{else}}name{{end}}"
+    search_type: "{{ if .Query.IMDBID }}description{{ else }}name{{ end }}"
    "sortOptions[sortBy]": "{{ .Config.sort }}"
    "sortOptions[sortOrder]": "{{ .Config.type }}"
  error:
@@ -177,14 +177,14 @@ search:
    selector: table#torrents_table_classic > tbody > tr:has(td.torrent_name)

  fields:
-    title:
-      selector: a[href*="?p=torrents&pid=10&action=details"]
    category:
      selector: div.category_image > a
      attribute: href
      filters:
        - name: querystring
          args: cid
+    title:
+      selector: a[href*="?p=torrents&pid=10&action=details"]
    details:
      selector: a[href*="?p=torrents&pid=10&action=details"]
      attribute: href
@@ -199,13 +199,11 @@ search:
      selector: a[rel="torrent_leechers"]
    grabs:
      selector: a[rel="times_completed"]
-    banner:
+    poster:
      selector: a[rel="fancybox"]
-      optional: true
      attribute: href
    imdb:
      # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
-      optional: true
      selector: a[href*="/imdb/tt"]
      attribute: href
      filters:
@@ -240,8 +238,10 @@ search:
          args: ["às ", ""] # at
        - name: replace
          args: ["at ", ""]
+        - name: append
+          args: " +00:00" # WET
        - name: dateparse
-          args: "02-01-2006 15:04"
+          args: "02-01-2006 15:04 -07:00"
    date:
      selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
      optional: true
--- 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%
@@ -94,7 +98,7 @@ search:
      attribute: title
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    size:
@@ -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:
@@ -45,8 +48,10 @@ download:
 search:
  paths:
    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
  rows:
    selector: div.row:has(a[href*="/detail/hash/"])
+
  fields:
    category:
      text: Other
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -305,10 +305,9 @@ search:
    download:
      selector: div.short_titles > a
      attribute: href
-    banner:
+    poster:
      selector: img
      attribute: src
-      optional: true
    description:
      selector: div.shor_desc
      optional: true
--- 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
@@ -116,11 +114,9 @@ search:
      attribute: href
    imdb:
      selector: a[href*="imdb.com/title/tt"]
-      optional: true
      attribute: href
-    banner:
+    poster:
      selector: a[rel^="prettyPhoto["]
-      optional: true
      attribute: href
    files:
      selector: td:nth-child(4)
@@ -160,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/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -134,11 +134,9 @@ search:
        - name: replace
          args: ["/details", "/download"]
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: a[onmouseover]
      attribute: onmouseover
      filters:
@@ -151,7 +149,7 @@ search:
        - name: replace
          args: ["\u00a0", " "]
        - name: append
-          args: " +02:00"
+          args: " +01:00" # CET
        - name: dateparse
          args: "2006-01-02 15:04:05 -07:00"
    files:
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -85,7 +85,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 }}2{{ else }}0{{ end }}"
    # 0 all, 1 activeonly, 2 deadonly
@@ -97,22 +97,21 @@ search:
    selector: "table.lista tr td table.lista tr:has(a[href^=\"index.php?page=torrent-details\"]){{ if .Config.freeleech }}:has(img[src=\"gold/gold.gif\"]){{ else }}{{ end }}"

  fields:
-    title:
-      selector: td a[href^="index.php?page=torrent-details"]
-    details:
-      selector: td a[href^="index.php?page=torrent-details"]
-      attribute: href
    category:
      selector: td a[href^="index.php?page=torrents&category="]
      attribute: href
      filters:
        - name: querystring
          args: category
+    title:
+      selector: td a[href^="index.php?page=torrent-details"]
+    details:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: href
    download:
      selector: td a[href^="download.php"]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
      filters:
@@ -121,7 +120,7 @@ search:
          args: [" http://anonym.to?javascript:popdetails('", ""]
        - name: replace
          args: ["');", ""]
-    banner:
+    poster:
      selector: td a[href^="index.php?page=torrent-details"]
      attribute: onmouseover
      filters:
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/src/Jackett.Common/Definitions/casatorrent.yml
@@ -179,7 +179,7 @@ search:
    download:
      selector: a[href^="download.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: img[src*="/uploads/images/"]
      attribute: src
    grabs:
@@ -200,8 +200,10 @@ search:
      filters:
        - name: regexp
          args: "le: </b>(.*?)<br"
+        - name: append
+          args: " +01:00" # CET
        - name: dateparse
-          args: "02-01-2006"
+          args: "02-01-2006 -07:00"
    downloadvolumefactor:
      case:
        img[src="images/free.gif"]: 0
--- a/src/Jackett.Common/Definitions/casstudiotv.yml
+++ b/src/Jackett.Common/Definitions/casstudiotv.yml
@@ -272,7 +272,7 @@ search:
    - path: search.php
  inputs:
    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
    terms: all
    author: ""
    sc: 1
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/src/Jackett.Common/Definitions/ccfbits.yml
@@ -83,10 +83,10 @@ 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 }}"
    # 0 active 1 incldead 2 deadonly
    incldead: 1
-    fullsearch: "{{ if .Query.IMDBID }}1{{else}}{{end}}"
+    fullsearch: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
    sort: "{{ .Config.sort }}"
    d: "{{ .Config.sort }}"

@@ -113,7 +113,6 @@ search:
      selector: a[href^="download.php/"]
      attribute: href
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    files:
@@ -134,7 +133,7 @@ search:
      selector: td:nth-child(5)
      filters:
        - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
        - name: dateparse
          args: "2006-01-0215:04:05 -07:00"
    downloadvolumefactor:
--- 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:
@@ -105,16 +108,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      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", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -127,49 +130,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
-      optional: true
      selector: a[href*="themoviedb.org/movie/"]
      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
--- 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:
@@ -113,16 +114,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      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", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -135,45 +136,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
--- a/src/Jackett.Common/Definitions/cinemageddon.yml
+++ b/src/Jackett.Common/Definitions/cinemageddon.yml
@@ -55,7 +55,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 }}"

  rows:
    selector: table.torrenttable > tbody > tr:has(a[href*="browse.php?cat="])
@@ -76,14 +76,15 @@ search:
      selector: a[href*="download.php?id="]
      attribute: href
    imdb:
-      optional: true
-      selector: a[href*="www.imdb.com/title/"]
+      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    date:
      selector: td:nth-child(4)
      filters:
+        - name: append
+          args: " -07:00" # PDT
        - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
    size:
      selector: td:nth-child(5)
      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
@@ -118,14 +118,13 @@ search:
    download:
      selector: a[href^="download.php/"]
      attribute: href
-    banner:
+    poster:
      selector: a[href^="details.php?id="]
      attribute: onmouseover
      filters:
        - name: regexp
          args: "src=(.+?) "
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    description:
--- 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 }}"
@@ -112,7 +112,6 @@ search:
    grabs:
      selector: td:nth-last-child(1)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    downloadvolumefactor:
--- a/src/Jackett.Common/Definitions/cooltorrent.yml
+++ b/src/Jackett.Common/Definitions/cooltorrent.yml
@@ -1,137 +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
-    banner:
-      optional: true
-      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/crazyhd.yml
+++ b/src/Jackett.Common/Definitions/crazyhd.yml
@@ -140,7 +140,7 @@ search:
    options: 0
    # 0=all, 1=onlyactive, 2=onlydead
    active: 0
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
    search: "{{ .Keywords }}"

  rows:
@@ -161,9 +161,8 @@ search:
      filters:
        - name: querystring
          args: category
-    banner:
+    poster:
      selector: div.list-name a.tlink
-      optional: true
      attribute: onmouseover
      filters:
        - name: regexp
--- 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
@@ -235,7 +235,7 @@ search:
    download:
      selector: a[href^="torrents-details.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: a[onmouseover][href^="torrents-details.php?id="]
      attribute: onmouseover
      filters:
--- a/src/Jackett.Common/Definitions/dariustracker.yml
+++ b/src/Jackett.Common/Definitions/dariustracker.yml
@@ -128,14 +128,12 @@ search:
    download:
      selector: a[href^="download.php?torrent="]
      attribute: href
-    banner:
+    poster:
      selector: a.preview
      attribute: href
-      optional: true
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-      optional: true
    files:
      selector: td:nth-last-child(7)
      filters:
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -209,14 +209,12 @@ search:
      filters:
        - name: replace
          args: ["details.php?id=", "download.php?torrent="]
-    banner:
+    poster:
      selector: div[id^="details"] img
      attribute: src
-      optional: true
    imdb:
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
-      optional: true
    size:
      selector: div.selection_unter_ad
      filters:
--- 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 }}"
@@ -123,7 +123,7 @@ search:
    details:
      selector: a.tname
      attribute: href
-    banner:
+    poster:
      selector: a.tname
      attribute: onmouseover
      filters:
@@ -131,7 +131,6 @@ search:
          args: src=([^\s]+)
    imdb:
      selector: a[href*="imdb.com/title/tt"]
-      optional: true
      attribute: href
    category:
      selector: a[href^="browse.php?cat="]
--- 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
@@ -10,11 +10,7 @@ links:

 caps:
  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 5, cat: Console, desc: "Game"}
+    - {id: 1, cat: Other, desc: "Movies, TV, Music, MV, Game, Blockbuster"}

  modes:
    search: [q]
@@ -72,8 +68,7 @@ search:
  paths:
    - 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,95 +76,95 @@ search:
    tmdb: "{{ .Query.TMDBID }}"
    mal: ""
    igdb: ""
+    start_year: ""
+    end_year: ""
    sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
    direction: "{{ .Config.type }}"
-    qty: 50
+    qty: 100
+    page: 0
+    view: list
    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"

  rows:
-    selector: table > tbody > tr
+    selector: table > tbody > tr:has(a[href^="magnet:?dn="])

  fields:
    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
+      text: 1
    title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
+    details:
+      selector: a[href*="/torrents/"]
+      attribute: href
    download:
      selector: a[href*="/download/"]
      attribute: href
-    details:
-      selector: a.view-torrent
+    magnet:
+      selector: a[href^="magnet:?dn="]
      attribute: href
-    banner:
-      optional: true
-      selector: div.torrent-poster img
+    poster:
+      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", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    tmdbid:
-      optional: true
      selector: a[href*="themoviedb.org/movie/"]
      attribute: href
    date:
-      selector: time
+      selector: td:nth-last-child(6)
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
@@ -188,4 +183,4 @@ search:
        "*": 1
    minimumratio:
      text: 0.4
-# UNIT3D 2.7.0
+# UNIT3D 2.7.0 (Customised)
--- 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:
@@ -120,15 +120,13 @@ search:
          args: "2006-01-0215:04:05 -07:00"
    size:
      selector: div.box_size
-    banner:
-      optional: true
+    poster:
      selector: a.cover_a
      attribute: title
      filters:
        - name: regexp
          args: src='(.*?)'
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
    description:
--- 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]
@@ -139,7 +133,9 @@ search:
          args: ["\\.+", "."] # More than 1 dot -> .
        - name: re_replace
          args: ["^\\.", ""] # Delete first dot
-    banner:
+        - name: re_replace
+          args: ["UHDRip", "BDRip"] # Fix for Radarr
+    poster:
      selector: a[onmouseover][href^="index.php?page=torrent-details"]
      attribute: onmouseover
      filters:
--- 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,79 +109,62 @@ 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"
-    banner:
+    poster:
      selector: div[id^="details"] img
      attribute: src
    size:
@@ -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:
@@ -113,16 +116,16 @@ search:
    details:
      selector: a.view-torrent
      attribute: href
-    banner:
-      optional: true
+    poster:
      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", ""]
-    comments:
-      selector: a[href*="#comments"]
-      attribute: href
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -135,45 +138,50 @@ search:
        - name: regexp
          args: (\d+)
    imdb:
-      optional: true
      selector: a[href*="imdb.com/title/tt"]
      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
    date:
      selector: time
      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
        - name: re_replace
          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
        - name: re_replace
          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
        - name: re_replace
          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
        - name: re_replace
          args: ["(?i) (ay)", "month"]
        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
        - name: re_replace
          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
        - name: re_replace
          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
        - name: re_replace
          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
    downloadvolumefactor:
      case:
        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
--- 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/ebookparadijs.yml
+++ b/src/Jackett.Common/Definitions/ebookparadijs.yml
@@ -102,7 +102,7 @@ search:
      filters:
        - name: querystring
          args: cat
-    banner:
+    poster:
      selector: img[src*="/covers/"]
      attribute: src
    title:
--- 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/efectodoppler.yml
+++ b/src/Jackett.Common/Definitions/efectodoppler.yml
@@ -87,7 +87,7 @@ search:
    details:
      selector: a[href^="torrents.php?id="]
      attribute: href
-    banner:
+    poster:
      selector: div.group_image img
      attribute: src
    download:
--- 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="]
@@ -124,8 +125,7 @@ search:
    details:
      selector: a[href^="/torrents.php?id="]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: td:nth-child(2) > script
      filters:
        - name: regexp
--- 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="]
@@ -120,8 +121,7 @@ search:
    details:
      selector: a[href^="/torrents.php?id="]
      attribute: href
-    banner:
-      optional: true
+    poster:
      selector: td:nth-child(2) > script
      filters:
        - name: regexp
--- a/Show More
+++ b/Show More