btdigg: change keywordless search to current year

Rewrite shizaproject indexer to use graphql api without graphql client (#11715 )
hdcztorrent: prevent duplicates on the dark theme (#11800 )
2025-09-10 13:48:02 +02:00 · 2021-05-26 23:50:03 +01:00 · 2021-05-27 00:05:46 +02:00 · 2021-05-26 08:45:00 +12:00 · 2021-05-25 18:44:49 +01:00 · 2021-05-25 18:44:26 +01:00
275 changed files with 7442 additions and 5389 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,8 @@
+### Read and complete in full with information about your setup and issue before submitting.
+### Do not delete the template.
+
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue.
-Check closed issues as well, because your issue may have already been fixed.
+Check closed issues as well, because your issue may have already been fixed. Also check our [Troubleshooting](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for steps to resolve common issues.

 Please read our [Contributing Guidelines](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md) before submitting your issue to ensure a prompt response to your bug.

--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * BTSOW
 * Byrutor
 * CiliPro (LIAORENCILI)
+ * comicat
 * ConCen
 * cpasbien
 * cpasbienClone
@@ -52,7 +53,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * dmhy
 * E-Hentai
 * emtrek
- * Epizod
+ * Erai-Raws
 * ETTV
 * EXT Torrents
 * ExtraTorrent.cd
@@ -129,7 +130,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * sukebei-Pantsu
 * sukebei.Nyaa.si
 * The Pirate Bay (TPB)
- * Tjangto (짱토)
+ * TNTfork
 * Tokyo Tosho
 * Torlock
 * TOROS
@@ -147,7 +148,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TorrentMafya
 * TorrentMax (토렌트맥스)
 * TorrentParadise
- * TorrentProject
 * TorrentProject2
 * TorrentQQ (토렌트큐큐)
 * Torrents.csv
@@ -155,8 +155,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Torrentv
 * TorrentView (토렌트뷰)
 * TorrentWhiz ( 토렌트위즈)
- * Torrentz2
- * Torrentz2k
 * truPornolabs
 * Underverse
 * UnionDHT
@@ -186,12 +184,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DimeADozen (EzTorrent)
 * DXP (Deaf Experts)
 * EniaHD
- * Erzsebet
 * Erzsebet.pl
 * ExKinoRay
- * ExtremlymTorrents (XTR)
 * Genesis-Movement
 * HamsterStudio
+ * HD-CzTorrent
+ * HunTorrent
 * IV-Torrents
 * KinoNaVse100
 * Kinorun
@@ -215,6 +213,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * Sharewood
 * SkTorrent
 * SkTorrent-org
+ * themixingbowl (TMB)
 * Toloka.to
 * Torrent-Explosiv
 * Torrents-Local
@@ -253,6 +252,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * AsianCinema
 * Asylum Share
 * AudioNews (AN)
+ * Aussierul.es [![(invite needed)][inviteneeded]](#)
 * AvistaZ (AsiaTorrents)
 * Borgzelle
 * Back-ups
@@ -314,11 +314,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * DivTeam
 * DivxTotal
 * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
- * DXDHD
 * EbookParadijs
 * Ebooks-Shares
 * EfectoDoppler
- * Elite-Tracker
 * Empornium (EMP)
 * EpubLibre
 * eShareNet
@@ -339,10 +337,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * FreeTorrent
 * FunFile (FF)
 * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
- * FunReleases [![(invite needed)][inviteneeded]](#)
 * Fuzer (FZ)
 * GFXPeers
- * Galeriens (LaPauseTorrents)
 * Gay-Torrents.net
 * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
 * GAYtorrent.ru
@@ -406,6 +402,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * LosslessClub
 * M-Team TP (MTTP)
 * MaDs Revolution
+ * magic-heaven
 * Magico (Trellas)
 * Majomparádé (TurkDepo)
 * MeseVilág (Fairytale World)
@@ -423,8 +420,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * NetCosmo
 * NetLab
 * NorBits
- * notwhat.cd
+ * Nordic+
+ * Oasis
 * oMg[WtF]trackr
+ * OpenCD
 * Orpheus
 * OshenPT
 * Ourbits (HDPter)
@@ -442,6 +441,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * PolishTracker
 * PornBits (PB)
 * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PotUK
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
@@ -458,10 +458,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * R3V WTF! [![(invite needed)][inviteneeded]](#)
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
+ * RedBits
 * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
 * Redacted (PassTheHeadphones)
 * RetroFlix
 * RevolutionTT
+ * ROFD
 * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
 * RPTorrents
 * SceneHD
@@ -471,9 +473,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * SDBits [![(invite needed)][inviteneeded]](#)
 * Secret Cinema
 * SeedFile (SF)
+ * ShareFiles
 * Shareisland
 * Shazbat
- * Shellife (SL) [![(invite needed)][inviteneeded]](#)
 * SiamBIT
 * SnowPT (SSPT)
 * SoulVoice [![(invite needed)][inviteneeded]](#)
@@ -506,6 +508,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * TheAudioScene
 * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
 * TheLeachZone
+ * TheScenePlace (TSP)
 * TJUPT
 * TLFBits [![(invite needed)][inviteneeded]](#)
 * ToTheGlory (TTG)
@@ -557,7 +560,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 * XWTorrents (XWT)
 * Xthor
 * YDYPT
- * YingK
 * Zamunda.net
 * Zelka.org
 * ZonaQ
@@ -580,6 +582,28 @@ Using the all indexer has no advantages (besides reduced management overhead), o

 To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.

+### Filter indexers
+
+Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
+It will query the configured indexers that match the `<filter>` expression criterias and return the combined results as "all".
+
+Supported filters
+Filter | Condition
+-|-
+`type:<type>` | where the indexer type is equal to `<type>`
+`tag:<tag>` | where the indexer tags contains `<tag>`
+`lang:<tag>` | where the indexer language start with `<lang>`
+`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+
+Supported operators
+Operator | Condition
+-|-
+`!<expr>` | where not `<expr>`
+`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
+`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
+
+Example:
+The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)

 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
@@ -769,11 +793,13 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ### 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)
-* Right-click on the Jackett solution and click 'Rebuild Solution' to restore NuGet packages
-* Select Jackett.Server as the startup project
-* In the drop-down menu of the run button select "Jackett.Server" instead of "IIS Express"
+* Open PowerShell and from the `src` directory:
+* - run `dotnet msbuild /restore`
+* - then run `dotnet restore`
+* - and run `dotnet build`
+* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
+* Select **Jackett.Server** as the startup project
+* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
 * Build/Start the project

 ### OSX
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,7 +2,7 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
  majorVersion: 0
-  minorVersion: 17
+  minorVersion: 18
  patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
  jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
  buildConfiguration: Release
@@ -50,7 +50,7 @@ stages:
              runtime: osx-x64
              archiveType: tar
              artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
@@ -300,15 +300,9 @@ stages:
              workingDirectory: $(Build.SourcesDirectory)
              targetType: inline
              failOnStderr: true
-              script: |
-                dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Updater
+              # execute this command to format all files:
+              # dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src
+              script: dotnet-format --check --verbosity diagnostic --folder ./src

      - job: Linting_YAML
        displayName: Linting YAML
@@ -354,18 +348,13 @@ stages:
              imageName: macOS-latest
              framework: $(netCoreFramework)
              runtime: osx-x64
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
              runtime: linux-x64
-            LinuxARM32:
-              buildDescription: Linux ARM32
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm
-            LinuxARM64:
-              buildDescription: Linux ARM64
+            LinuxARM:
+              buildDescription: Linux ARM
              imageName: ubuntu-latest
              framework: $(netCoreFramework)
              runtime: linux-arm
@@ -461,7 +450,7 @@ stages:
              buildDescription: macOS
              imageName: macOS-latest
              artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
              buildDescription: Linux AMD x64
              imageName: ubuntu-latest
              artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
--- a/nuget.config
+++ b/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
--- a/src/Jackett.Common/Content/apple-touch-icon-114x114.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-114x114.png
--- a/src/Jackett.Common/Content/apple-touch-icon-120x120.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-120x120.png
--- a/src/Jackett.Common/Content/apple-touch-icon-144x144.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-144x144.png
--- a/src/Jackett.Common/Content/apple-touch-icon-152x152.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-152x152.png
--- a/src/Jackett.Common/Content/apple-touch-icon-180x180.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-180x180.png
--- a/src/Jackett.Common/Content/apple-touch-icon-57x57.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-57x57.png
--- a/src/Jackett.Common/Content/apple-touch-icon-72x72.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-72x72.png
--- a/src/Jackett.Common/Content/apple-touch-icon-76x76.png
+++ b/src/Jackett.Common/Content/apple-touch-icon-76x76.png
--- a/src/Jackett.Common/Content/apple-touch-icon.png
+++ b/src/Jackett.Common/Content/apple-touch-icon.png
--- a/src/Jackett.Common/Content/css/tagify.css
+++ b/src/Jackett.Common/Content/css/tagify.css
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -76,6 +76,10 @@ body {
    max-width: 255px;
 }

+.setup-item-inputtags {
+    max-width: 255px;
+}
+
 [data-type=hiddendata]{
    display: none;
 }
@@ -328,3 +332,21 @@ input#searchquery {
 #proxy-warning {
    color: red;
 }
+
+.label-tag {
+    text-transform: lowercase;
+    background-color: #777;
+}
+
+.tagify {
+    height: auto;
+}
+
+.tagify .tagify__input {
+    min-width: 0;
+    text-transform: lowercase;
+}
+
+.tagify .tagify__tag-text {
+    text-transform: lowercase;
+}
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -330,3 +330,21 @@ input#searchquery {
 #proxy-warning {
    color: red;
 }
+
+.label-tag {
+    text-transform: lowercase;
+    background-color: #777;
+}
+
+.tagify {
+    height: auto;
+}
+
+.tagify .tagify__input {
+    min-width: 0;
+    text-transform: lowercase;
+}
+
+.tagify .tagify__tag-text {
+    text-transform: lowercase;
+}
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -9,14 +9,6 @@
    <meta charset="utf-8" />
    <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" />
-    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
    <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
    <link rel="icon" type="image/ico" href="../favicon.ico" />
    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
@@ -30,11 +22,14 @@
    <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
    <script type="text/javascript" src="../libs/bootstrap-multiselect.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/tagify.min.js?changed=11662"></script>
+    <script type="text/javascript" src="../libs/jQuery.tagify.min.js?changed=11662"></script>

    <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=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/tagify.css?changed=11662">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=11662" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=11662" 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">
@@ -59,6 +54,8 @@
        </div>

        <div class="pull-right">
+            <div id="filters" class="btn-group btn-group-sm">
+            </div>
            <button id="jackett-add-indexer" class="btn btn-success btn-sm">
                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
            </button>
@@ -73,7 +70,7 @@
            </button>
        </div>
        <h3>Configured Indexers</h3>
-        <div id="indexers"> </div>
+        <div id="indexers"></div>
        <hr />

        <div class="input-area">
@@ -221,7 +218,7 @@
    <div id="modals"></div>

    <script id="setup-item" type="text/x-handlebars-template">
-        <div class="setup-item form-group" data-id="{{id}}" data-value="{{value}}" data-type="{{type}}">
+        <div class="setup-item form-filter" data-id="{{id}}" data-value="{{value}}" data-type="{{type}}">
            <div class="setup-item-label">{{name}}</div>
            <div class="setup-item-value">{{{value_element}}}</div>
        </div>
@@ -297,10 +294,14 @@
            Click on an URL to copy it to the Site Link field.
        </div>
    </script>
-
+    <script id="setup-item-inputtags" type="text/x-handlebars-template">
+      <div class="setup-item-inputtags">
+        <input class="form-control input-sm" type="text" value="{{{value}}}" {{#if pattern}} pattern="{{pattern}}"{{/if}}/>
+      </div>
+    </script>

    <script id="configured-indexer-table" type="text/x-handlebars-template">
-        <div class="configured-indexer-div">
+        <div class="tab-content configured-indexer-div">
            <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
                <thead>
                    <tr>
@@ -311,7 +312,7 @@
                <tbody>
                    {{#each indexers}}
                    <tr class="configured-indexer-row">
-                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
+                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span>{{#each tags}} <span title="{{this}}" class="label label-tag">{{this}}</span>{{/each}}</td>
                        <td class="fit">
                            <div class="indexer-buttons">
                                <a href="{{rss_host}}" title="{{rss_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy RSS Feed</i></a>
@@ -350,10 +351,11 @@
            <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
                <thead>
                    <tr>
+                        <th></th>
                        <th>Indexer</th>
                        <th>Categories</th>
                        <th>Type</th>
-                        <th>Type string</th>
+                        <th data-type="hiddendata">Type string</th>
                        <th>Language</th>
                        <th></th>
                    </tr>
@@ -361,10 +363,15 @@
                <tbody>
                    {{#each indexers}}
                    <tr class="unconfigured-indexer-row">
+                        <td class="checkboxColumn">
+                            {{#if_eq type "public"}}
+                            <input type="checkbox" id="select{{id}}" data-id="{{id}}" />
+                            {{/if_eq}}
+                        </td>
                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
                        <td>{{mains_cats}}</td>
                        <td class="fit"><span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
-                        <td>{{type}}</td>
+                        <td data-type="hiddendata">{{type}}</td>
                        <td class="fit">{{language}}</td>
                        <td class="fit">
                            <div class="indexer-buttons">
@@ -383,7 +390,13 @@
                </tbody>
                <tfoot>
                    <tr>
-                        <td colspan="6"></td>
+                        <th></th>
+                        <th>Indexer</th>
+                        <th>Categories</th>
+                        <th>Type</th>
+                        <th data-type="hiddendata">Type string</th>
+                        <th>Language</th>
+                        <th></th>
                    </tr>
                </tfoot>
            </table>
@@ -495,12 +508,17 @@
                        <p>You can search all configured indexers from this screen.</p>
                        <label for="text">Query</label>
                        <input class="form-control" type="text" name="query" id="searchquery" />
-                        <label for="tracker">Tracker</label>
-                        <select name="tracker" id="searchTracker" multiple="multiple">
-                            {{#each indexers}}
-                            <option value="{{id}}" selected>{{name}}</option>
-                            {{/each}}
+                        {{#if filters}}
+                        <label for="filter">Filter</label>
+                        <select name="filter" id="searchFilter">
+                          <option value="all">all</option>
+                          {{#each filters}}
+                          <option value="{{id}}">{{id}}</option>
+                          {{/each}}
                        </select>
+                        {{/if}}
+                        <label for="tracker">Tracker</label>
+                        <select name="tracker" id="searchTracker" multiple="multiple"></select>
                        <label for="category">Category</label>
                        <select name="category" id="searchCategory" multiple="multiple"></select>
                        <button id="jackett-search-perform" class="btn btn-success btn-sm"><span class="fa fa-search"></span></button>
@@ -607,7 +625,9 @@
                        </div>
                    </div>
                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="button" id="add-selected-indexers" class="btn btn-default">Add Selected</button>
+                        <button type="button" id="close-selected-indexers" class="btn btn-default"
+                            data-dismiss="modal">Close</button>
                    </div>
                </div>
            </div>
@@ -692,6 +712,17 @@
        </div>
    </script>

+    <script id="jackett-filters" type="text/x-handlebars-template">
+        <button id="jackett-filters-dropdown" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Filter <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="jackett-filters-dropdown">
+            <li class="{{#if_eq active null}}active{{/if_eq}}"><a href="#">All</a></li>
+            {{#each filters}}
+            <li class="{{#if_eq ../active id}}active{{/if_eq}}"><a href="#indexers&filter={{id}}" data-id="{{id}}">{{id}}</a></li>
+            {{/each}}
+        </ul>
+    </script>
+
    <script id="spinner" type="text/x-handlebars-template">
        <span class="spinner glyphicon glyphicon-refresh"></span>
    </script>
@@ -701,6 +732,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20210314"></script>
+    <script type="text/javascript" src="../custom.js?changed=PR11721"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Content/libs/jQuery.tagify.min.js
+++ b/src/Jackett.Common/Content/libs/jQuery.tagify.min.js
--- a/src/Jackett.Common/Content/libs/tagify.min.js
+++ b/src/Jackett.Common/Content/libs/tagify.min.js
--- a/src/Jackett.Common/Converters/StringToLongConverter.cs
+++ b/src/Jackett.Common/Converters/StringToLongConverter.cs
@@ -25,7 +25,7 @@ namespace Jackett.Common.Converters

            return long.TryParse((string)reader.Value, out var foo)
                ? foo
-                : (long?) null;
+                : (long?)null;
        }

        public override bool CanConvert(Type objectType) => objectType == typeof(string);
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -14,8 +14,8 @@ links:
  - https://x1337x.ws/
  - https://x1337x.eu/
  - https://x1337x.se/
-  - https://1337x.unblockit.buzz/
-  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.onl/
+  - https://1337x.nocensor.space/
 legacylinks:
  - https://1337x.unblocked.earth/
  - https://1337x.unblockit.pro/
@@ -41,6 +41,9 @@ legacylinks:
  - https://1337x.unblockit.dev/
  - https://1337x.unblockit.ltd/
  - https://1337x.unblockit.link/
+  - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.club/

 caps:
  categorymappings:
@@ -183,6 +186,7 @@ search:
      selector: td[class^="coll-1"] a[href^="/torrent/"]
      attribute: href
      filters:
+        - name: urldecode
        - name: split
          args: ["/", 3]
    title:
@@ -190,11 +194,28 @@ search:
      text: "{{ if .Result.title_href }}{{ .Result.title_href }}{{ else }}{{ .Result.title_text }}{{ end }}"
      filters:
        - name: re_replace
-          args: ["(-+)", " "]
+          args: ["-", " "]
        - name: replace
          args: ["Grey's Anatomy", "Greys Anatomy"]
        - name: replace
-          args: ["\u000f", ""] # get rid of unwanted character
+          args: ["\u000f", ""] # get rid of unwanted character #6582
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
    category:
      text: 40
    category|noappend:
--- a/src/Jackett.Common/Definitions/anaschcc.yml
+++ b/src/Jackett.Common/Definitions/anaschcc.yml
@@ -17,6 +17,7 @@ caps:
    - {id: 12, cat: XXX, desc: Porn}
    - {id: 29, cat: TV/Sport, desc: Sports}
    - {id: 37, cat: PC, desc: Software}
+    - {id: 38, cat: Console, desc: Games}

  modes:
    search: [q]
@@ -33,7 +34,7 @@ settings:
    label: Password
  - name: freeleech
    type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
    default: false
  - name: info_tpp
    type: info
@@ -90,11 +91,11 @@ search:

  fields:
    category:
-      selector: td a[href^="index.php?page=torrents&category="]
+      selector: td a[href^="index.php?page=torrents&category[]="]
      attribute: href
      filters:
        - name: querystring
-          args: category
+          args: category[]
    title:
      selector: td a[href^="index.php?page=torrent-details"]
    details:
@@ -126,13 +127,13 @@ search:
    size:
      selector: td:nth-child(5)
    date:
-      # 22/01/2021 01:28
+      # 22/01/21 01:28
      selector: td:nth-child(6)
      filters:
        - name: append
          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
        - name: dateparse
-          args: "02/01/2006 15:04 -07:00"
+          args: "02/01/06 15:04 -07:00"
    seeders:
      selector: td:nth-child(7)
    leechers:
--- a/src/Jackett.Common/Definitions/anime-free.yml
+++ b/src/Jackett.Common/Definitions/anime-free.yml
@@ -75,7 +75,7 @@ search:
    all_word_seach: 1
    # 0 article, 1 comments, 2 static pages, 3 article titles
    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchdate: 0
    searchuser: ""
    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
    sortby: date
--- a/src/Jackett.Common/Definitions/arabp2p.yml
+++ b/src/Jackett.Common/Definitions/arabp2p.yml
@@ -47,7 +47,7 @@ caps:
    - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
    - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
    - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
+    - {id: 110, cat: TV, desc: "رمضان 2021 (Ramadan 2021)"}
    # المرئيات الاجنبية Foreign Movies
    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
    - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -9,7 +9,7 @@ links:
  - http://audiobookbay.nl/ # site forces http, does not support https
  - http://audiobookbay.net/
  - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.onl/
 legacylinks:
  - https://audiobookbay.la/
  - https://audiobookbay.unblockit.lat/
@@ -17,6 +17,8 @@ legacylinks:
  - https://audiobookbay.unblockit.dev/
  - https://audiobookbay.unblockit.ltd/
  - https://audiobookbay.unblockit.link/
+  - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/aussierules.yml
+++ b/src/Jackett.Common/Definitions/aussierules.yml
@@ -0,0 +1,91 @@
+---
+id: aussierules
+name: Aussierul.es
+description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://aussierul.es/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: type
+    label: Search Type
+    type: select
+    default: t_name
+    options:
+      t_name: Torrent Name
+      t_description: Torrent Description
+      t_both: Name & Description
+      t_uploader: Uploader
+      t_genre: IMDB Genre
+  - name: dead
+    label: Include Dead Torrents
+    type: select
+    default: No
+    options:
+      yes: Yes
+      no: No
+
+login:
+  method: form
+  form: form
+  path: login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("An error has occured!")
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search_type: "{{ .Config.type }}"
+    include_dead_torrents: "{{ .Config.dead }}"
+    keywords: "{{ .Keywords }}"
+
+  rows:
+    selector: table#sortabletable > tbody > tr:not(:first-child)
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: td:nth-child(2) > div:nth-child(1) > a > strong
+    details:
+      selector: td:nth-child(2) > div:nth-child(1) > a
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date:
+      # 27-03-2021 18:34
+      selector: td:nth-child(2) > div:nth-child(2)
+      filters:
+        - name: dateparse
+          args: "2-01-2006 15:04"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+# TS Special Edition v.7.4
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/src/Jackett.Common/Definitions/bit-titan.yml
@@ -124,11 +124,11 @@ settings:
 login:
  path: login.php
  method: form
-  form: form[action="takelogin.php"]
+  form: form[action$="login.php"]
  cookies: ["JAVA=OK"] # avoid jscheck redirect
  captcha:
    type: image
-    selector: img[src^="cap/captcha_math.php"]
+    selector: img[src*="captcha_math.php"]
    input: stringCaptcha
  inputs:
    username: "{{ .Config.username }}"
@@ -150,7 +150,7 @@ search:
    allCats: ""
    search: "{{ .Keywords }}"
    # 1 25, 2 50, 3 75, 4 100
-    limit: 1
+    limit: 4
    # 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
@@ -184,6 +184,9 @@ search:
          args: (\d+)
        - name: prepend
          args: "download.php?torrent="
+    poster:
+      selector: div[data-image]
+      attribute: data-image
    seeders:
      selector: td.peers:has(i[title="Seeders"])
    leechers:
@@ -217,13 +220,6 @@ search:
          args: "02.01.2006 15:04:05 -07:00"
    size:
      selector: td.size
-      filters:
-        - name: replace
-          args: ["\u00a0", ""]
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
    downloadvolumefactor:
      case:
        "span:contains(\"OU\")": 0 # only upload is counted
@@ -234,9 +230,9 @@ search:
        "*": 1
    uploadvolumefactor:
      case:
-        "span:contains(\"2x\")": 2
-        "span:contains(\"5x\")": 5
-        "span:contains(\"10x\")": 10
+        "span:contains(\"x2\")": 2
+        "span:contains(\"x5\")": 5
+        "span:contains(\"x10\")": 10
        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
        "*": 1
    minimumseedtime:
--- a/src/Jackett.Common/Definitions/bitturk.yml
+++ b/src/Jackett.Common/Definitions/bitturk.yml
@@ -21,6 +21,8 @@ caps:
    - {id: 67, cat: XXX, desc: "XxX"}
    - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
    - {id: 71, cat: Movies, desc: "NFLIX"}
+    - {id: 78, cat: TV, desc: "EXXEN"}
+    - {id: 79, cat: TV, desc: "BLUTV"}
    - {id: 58, cat: Movies, desc: "Film"}
    - {id: 72, cat: Movies, desc: "Belgesel"}
    - {id: 60, cat: Movies/3D, desc: "3D"}
@@ -136,8 +138,9 @@ search:
    searchin: title
    "sortOptions[sortBy]": "{{ .Config.sort }}"
    "sortOptions[sortOrder]": "{{ .Config.type }}"
-  error:
-    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
+# Drop error trap to stop Sonarr disabling indexer, see https://github.com/Jackett/Jackett/issues/1415
+#  error:
+#    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))

  rows:
    selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
--- a/src/Jackett.Common/Definitions/blutopia.yml
+++ b/src/Jackett.Common/Definitions/blutopia.yml
@@ -193,4 +193,4 @@ search:
    minimumseedtime:
      # 7 days (as seconds = 7 x 24 x 60 x 60)
      text: 604800
-# UNIT3D 5.1.0b
+# UNIT3D 5.2.1b
--- a/src/Jackett.Common/Definitions/broadcity.yml
+++ b/src/Jackett.Common/Definitions/broadcity.yml
@@ -13,28 +13,29 @@ legacylinks:
 caps:
  categorymappings:
    - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BluRay"}
-    - {id: 8, cat: Movies/HD, desc: "TV"}
-    - {id: 6, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 16, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 3, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 4, cat: Movies/HD, desc: "BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "TV"}
-    - {id: 5, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 27, cat: Movies/HD, desc: "LORD Rips"}
+    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
+    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
+    - {id: 6, cat: Movies/UHD, desc: "UHD - WEB-DL"}
+    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
+    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
+    - {id: 3, cat: Movies/HD, desc: "HD"}
+    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
+    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
+    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
+    - {id: 5, cat: Movies/HD, desc: "HD - WEB-DL"}
+    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
    - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "BluRay"}
-    - {id: 10, cat: Movies/SD, desc: "DVD"}
-    - {id: 12, cat: Movies/SD, desc: "TV"}
-    - {id: 13, cat: Movies/SD, desc: "WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "WEBRip"}
+    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
+    - {id: 10, cat: Movies/SD, desc: "SD - DVD"}
+    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
+    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
+    - {id: 13, cat: Movies/SD, desc: "SD - WEB-DL"}
+    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
    - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV Program"}
-    - {id: 19, cat: TV, desc: "Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "Yerli Dizi"}
-    - {id: 20, cat: Movies/HD, desc: "VIP"}
+    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
+    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
+    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}

  modes:
    search: [q]
@@ -101,7 +102,6 @@ search:
      filters:
        - name: regexp
          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-      filters:
        - name: append
          args: " +03:00" # TRT
        - name: dateparse
@@ -123,4 +123,9 @@ search:
      case:
        img[src$="/x2.gif"]: 2
        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TS Special Edition v.7.5
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -9,7 +9,7 @@ followredirect: true
 links:
  # update poster placeholder link too
  - https://btdb.eu/
-  - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.onl/
 legacylinks:
  - https://btdb.to/
  - https://btdb.unblocked.app/
@@ -34,6 +34,8 @@ legacylinks:
  - https://btdb.unblockit.dev/
  - https://btdb.unblockit.ltd/
  - https://btdb.unblockit.link/
+  - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.club/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/btdigg.yml
+++ b/src/Jackett.Common/Definitions/btdigg.yml
@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
  - https://btdig.com/
+  - http://btdiggwzoyrwwbiv.onion.ly/

 caps:
  categories:
@@ -39,7 +40,7 @@ search:
  paths:
    - path: search
  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}test{{ end }}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
    # 0 relevance 2 age 3 size 4 files
    order: "{{ .Config.sort }}"

--- 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.cam/
+  - https://btsow.digital
 legacylinks:
  - https://btos.pw/
  - https://btio.pw/
@@ -23,6 +23,8 @@ legacylinks:
  - https://btsow.work/
  - https://btsow.store/
  - https://btsow.surf/
+  - https://btsow.com/
+  - https://btsow.cam/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/bwtorrents.yml
+++ b/src/Jackett.Common/Definitions/bwtorrents.yml
@@ -9,6 +9,8 @@ links:
  - https://bwtorrents.tv/
  - https://bwtorrents.fun/
  - https://bwtorrents.xyz/
+  - https://bwtorrents.us/
+  - https://bwtorrents.live/

 caps:
  categorymappings:
@@ -26,22 +28,23 @@ caps:
    - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"}
    - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"}
    - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"}
-    - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"}
-    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-Web Series"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
    - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"}
    - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"}
    - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"}
    - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"}
    - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
    - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
-    - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
+    - {id: 132, cat: Movies, desc: "Hollywood-1080p WEB-Rips"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
    - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
    - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
    - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"}
    - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
    - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"}
-    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
-    - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movie packs"}
    - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
    - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
    - {id: 141, cat: Movies, desc: "Kannada-Movies"}
@@ -50,10 +53,9 @@ caps:
    - {id: 144, cat: Movies, desc: "Marathi-Movies"}
    - {id: 145, cat: Movies, desc: "Bangla-Movies"}
    - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
-    - {id: 184, cat: Movies, desc: "Bollywood-South Hindi Dubbed"}
-    - {id: 183, cat: Movies, desc: "Hindi Dubbed Movies"}
+    - {id: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
    - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
-    - {id: 198, cat: Movies, desc: "TV-MTV"}
    - {id: 182, cat: Movies, desc: "Other Movies"}
    - {id: 146, cat: TV, desc: "TV-Colors"}
    - {id: 147, cat: TV, desc: "TV-TV"}
@@ -64,13 +66,17 @@ caps:
    - {id: 152, cat: TV, desc: "TV-Star Bharat"}
    - {id: 153, cat: TV, desc: "TV-Star Plus"}
    - {id: 154, cat: TV, desc: "TV-Zee TV"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
    - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
-    - {id: 156, cat: TV/Documentary, desc: "TV-Documentary"}
-    - {id: 157, cat: TV, desc: "TV-Hollywood"}
-    - {id: 158, cat: TV, desc: "TV-Others"}
-    - {id: 195, cat: TV, desc: "TV-Packs"}
-    - {id: 159, cat: TV, desc: "Religion &Spirituality "}
+    - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
+    - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 159, cat: Audio, desc: "Music-Religion & Spirituality"}
    - {id: 160, cat: Audio, desc: "Music-Classical"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
    - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
    - {id: 162, cat: Audio, desc: "Music-Ghazals"}
    - {id: 163, cat: Audio, desc: "Music-Hindi OSTs"}
@@ -82,11 +88,10 @@ caps:
    - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
    - {id: 170, cat: Audio, desc: "Music-Pop"}
    - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 172, cat: Audio, desc: "Music-Remix"}
-    - {id: 173, cat: Audio, desc: "Music-Tamil"}
    - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 173, cat: Audio, desc: "Music-Tamil"}
    - {id: 196, cat: Audio, desc: "Music-Packs"}
-    - {id: 175, cat: Books/EBook, desc: "EBooks"}
+    - {id: 175, cat: Books/EBook, desc: "Ebooks"}
    - {id: 176, cat: PC/Games, desc: "Games PC"}
    - {id: 177, cat: Console, desc: "Games Console"}
    - {id: 178, cat: TV/Anime, desc: "Anime"}
--- a/src/Jackett.Common/Definitions/byrutor.yml
+++ b/src/Jackett.Common/Definitions/byrutor.yml
@@ -262,10 +262,10 @@ download:
  attribute: href

 search:
-  # keywords (any age posts, article titles only search)
+  # keywords (article titles only search)
  # do=search&subaction=search&story=five+freddy&titleonly=3&searchdate=0&sortby=date&resorder=desc&catlist[]=1&catlist[]=2&catlist[]=3
-  # keywordless (1 day old posts or newer + article body search) query=game
-  # do=search&subaction=search&story=game&titleonly=0&searchdate=1&sortby=date&resorder=desc&catlist[]=0
+  # keywordless (article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=0&sortby=date&resorder=desc&catlist[]=0
  paths:
    - path: index.php
  inputs:
@@ -278,7 +278,7 @@ search:
    showposts: 1
    # 0 article, 1 comments, 2 static pages, 3 article titles
    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchdate: 0
    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
    sortby: date
    resorder: desc
@@ -317,8 +317,6 @@ search:
      text: 1
    leechers:
      text: 1
-    grabs:
-      selector: li:has(img[alt="Скачиваний"])
    size:
      selector: div.shor_subtitles span:nth-child(2)
      filters:
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/src/Jackett.Common/Definitions/cartoonchaos.yml
@@ -82,6 +82,12 @@ search:
  paths:
    # http://www.cartoonchaos.org/index.php?page=torrents&search=transformers&category=30;21;20;26;15;16;17&options=0&active=0
    - path: index.php
+  keywordsfilters:
+   # if searching for season packs switch S01 to season 1 #11775
+    - name: re_replace
+      args: ["(?i)(S0)(\\d{1,2})$", "season $2"]
+    - name: re_replace
+      args: ["(?i)(S)(\\d{1,3})$", "season $2"]
  inputs:
    page: torrents
    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
@@ -105,6 +111,10 @@ search:
          args: category
    title:
      selector: td a[href^="index.php?page=torrent-details"]
+      filters:
+        #  #11775
+        - name: re_replace
+          args: ["(?i)(season )", "S"]
    details:
      selector: td a[href^="index.php?page=torrent-details"]
      attribute: href
--- a/src/Jackett.Common/Definitions/cilipro.yml
+++ b/src/Jackett.Common/Definitions/cilipro.yml
@@ -6,20 +6,9 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - http://www.cilipro1.xyz/
-  - http://www.cilipro2.xyz/
-  - http://www.cilipro3.xyz/
-  - http://www.cilipro4.xyz/
-  - http://www.cilipro5.xyz/
-  - http://www.cilipro6.xyz/
-  - http://www.cilipro7.xyz/
-  - http://www.cilipro8.xyz/
-  - http://www.cilipro9.xyz/
-  - http://www.cilipro10.xyz/
  - http://www.cilinb1.xyz/
  - http://www.cilinb2.xyz/
  - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
  - http://www.cilinb5.xyz/
  - http://www.cilinb6.xyz/
  - http://www.cilinb7.xyz/
@@ -80,6 +69,17 @@ legacylinks:
  - http://www.lrsoso9.xyz/
  - http://www.lrsoso10.xyz/
  - http://www.cilijj.xyz/
+  - http://www.cilipro1.xyz/
+  - http://www.cilipro2.xyz/
+  - http://www.cilipro3.xyz/
+  - http://www.cilipro4.xyz/
+  - http://www.cilipro5.xyz/
+  - http://www.cilipro6.xyz/
+  - http://www.cilipro7.xyz/
+  - http://www.cilipro8.xyz/
+  - http://www.cilipro9.xyz/
+  - http://www.cilipro10.xyz/
+  - http://www.cilinb4.xyz/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -1,39 +1,13 @@
 ---
-# Update by LA5T based on the orignial 'cinematik.yml'
-# 29.07.2018 22:53 UTC+2
-#
 id: cinematik
 name: Cinematik
-description: "Tracker for non-hollywood movies."
+description: "A tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
 language: en-us
 type: private
 encoding: UTF-8
 links:
  - https://www.cinematik.net/

-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: incldead
-    type: select
-    label: Status
-    default: 1
-    options:
-      0: Active
-      1: "Active and Inactive"
-      2: Inactive
-  - name: srchdtls
-    type: checkbox
-    label: "Detailed search"
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "You can increase the number of search results in your profile.<br />Default is 15."
-
 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Comedy"}
@@ -59,9 +33,34 @@ caps:
    search: [q]
    movie-search: [q]

+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: incldead
+    type: select
+    label: Status
+    default: 1
+    options:
+      0: Active
+      1: "Active and Inactive"
+      2: Inactive
+  - name: srchdtls
+    type: checkbox
+    label: "Detailed search"
+  - name: info_results
+    type: info
+    label: "Search results"
+    default: "You can increase the number of search results in your profile.<br>Default is 15."
+
 login:
-  path: takelogin.php
-  method: post
+  method: form
+  path: login.php
+  submitpath: takelogin.php
+  form: form[action="takelogin.php"]
  inputs:
    username: "{{ .Config.username }}"
    password: "{{ .Config.password }}"
@@ -75,34 +74,36 @@ search:
    - path: browse.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
+    search: "{{ .Keywords }}"
    incldead: "{{ .Config.incldead }}"
    srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
+
  rows:
    selector: table[border="1"] tr:not(:first-child)
+
  fields:
    category:
      text: 1
    title:
      selector: td:nth-child(2) a
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
    download:
      selector: a[href^="details.php?id="]
      attribute: href
      filters:
        - name: replace
          args: ["details.php?id=", "download.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(7)
    grabs:
      selector: td:nth-child(8)
      filters:
        - name: regexp
          args: ([\d,]+)
-    files:
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
    seeders:
      selector: td:nth-child(9)
    leechers:
@@ -111,11 +112,12 @@ search:
      selector: td:nth-child(11) div.addedtor
    downloadvolumefactor:
      case:
-        "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": 0
-        "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": 0.25
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 0
+        img[title^="Golden Torrent"]: 0
+        img[title^="Silver Torrent"]: 0.25
+        img[title^="Platinum Torrent"]: 0
        "*": 1
    uploadvolumefactor:
      case:
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
+        img[title^="Platinum Torrent"]: 2
        "*": 1
+# Engine n/a
--- a/src/Jackett.Common/Definitions/coastalcrew.yml
+++ b/src/Jackett.Common/Definitions/coastalcrew.yml
@@ -24,9 +24,7 @@ caps:
    - {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"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Alle"}
    # App
    - {id: 12, cat: PC/0day, desc: "App - Win"}
    - {id: 11, cat: PC, desc: "App - Other"}
@@ -45,6 +43,7 @@ caps:
    # Sport
    - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
    # Sonstiges
+    - {id: 159, cat: Audio/Audiobook, desc: "Sonstiges - Hörbuch"}
    - {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"}
@@ -140,9 +139,7 @@ search:
        ":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"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Alle\"))": "15"
        # 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"
@@ -161,6 +158,7 @@ search:
        # 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(\"Hörbuch\"))": "159"
        ":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"
--- a/src/Jackett.Common/Definitions/comicat.yml
+++ b/src/Jackett.Common/Definitions/comicat.yml
@@ -0,0 +1,102 @@
+---
+id: comicat
+name: comicat
+description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://www.comicat.org/
+
+settings: []
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "动画(Anime)"}
+    - {id: 2, cat: Books/Comics, desc: "漫画(Manga)"}
+    - {id: 3, cat: Audio, desc: "音乐(Music)"}
+    - {id: 4, cat: TV/Anime, desc: "周边(Peripheral)"}
+    - {id: 5, cat: Other, desc: "其它(Other)"}
+    - {id: 6, cat: TV/Anime, desc: "Raw"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+search:
+  paths:
+    # https://www.comicat.org/ (latest)
+    # https://www.comicat.org/search.php?keyword=720p+2020 (search)
+    # sort_id: filters by a single category, multi cats is not supported so we cannot use it.
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}&page=2{{ else }}2.html{{ end }}"
+
+  rows:
+    selector: tr[class^="alt"]:has(a[href^="sort"])
+
+  fields:
+    category:
+      selector: a[href^="sort"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\d)-"
+    title:
+      selector: a[href^="show"]
+    details:
+      selector: a[href^="show"]
+      attribute: href
+    infohash:
+      selector: a[href^="show"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\w+).html"
+    size:
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(7) span
+    date:
+      selector: td:nth-child(1):contains("/")
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: dateparse
+          args: "2006/01/02 -07:00"
+    date:
+      selector: td:nth-child(1):contains("今天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["今天", ""]
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: timeparse
+          args: "15:04 -07:00"
+    date:
+      selector: td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "yesterday"]
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(1):contains("前天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "2 days"]
+        - name: timeago
+    seeders:
+      selector: td:nth-child(5) span
+    leechers:
+      selector: td:nth-child(6) span
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/src/Jackett.Common/Definitions/crazyspirits.yml
@@ -242,11 +242,23 @@ search:
        - name: regexp
          args: "src=(.*?)><"
    grabs:
-      selector: td:nth-last-child(4)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Completé : </b>(\\d+)<"
    seeders:
-      selector: td:nth-last-child(3)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=green>(\\d+)<"
    leechers:
-      selector: td:nth-last-child(2)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=red>(\\d+)<"
    size:
      selector: a[onmouseover][href^="torrents-details.php?id="]
      attribute: onmouseover
--- a/src/Jackett.Common/Definitions/danishbytes.yml
+++ b/src/Jackett.Common/Definitions/danishbytes.yml
@@ -12,9 +12,9 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 5, cat: PC/0day, desc: "Appz"}
-    - {id: 4, cat: PC/Games, desc: "Games"}
    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
    - {id: 8, cat: Books, desc: "Bookz"}

  modes:
@@ -98,11 +98,15 @@ search:

  fields:
    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
+      selector: i.torrent-icon
+      attribute: class
+      case:
+        i.fa-film: 1
+        i.fa-tv-retro: 2
+        i.fa-music: 3
+        i.fa-gamepad: 4
+        i.fa-compact-disc: 5
+        i.fa-book-open: 8
    title:
      selector: a.view-torrent
    download:
@@ -200,4 +204,4 @@ search:
    minimumseedtime:
      # 2 days (as seconds = 2 x 24 x 60 x 60)
      text: 172800
-# UNIT3D 3.1.0 DB-edition
+# UNIT3D 5.1.0 DBy-edition 0.75
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -136,9 +136,9 @@ search:
    - path: selection.php
  inputs:
    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}}"
+    search: "{{ .Keywords }}"
    # 0 name, 1 descr, 2 both
-    blah: "0"
+    blah: 0
    orderby: "{{ .Config.sort }}"
    sort: "{{ .Config.type }}"

--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/src/Jackett.Common/Definitions/datascene.yml
@@ -6,9 +6,9 @@ language: ro-ro
 type: private
 encoding: windows-1252
 links:
-  - https://datascene.net/
-legacylinks:
  - http://datascene.net/
+legacylinks:
+  - https://datascene.net/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -10,8 +10,9 @@ links:
  - https://www.demonoid.is/
  - https://www.dnoid.to/
  - https://www.dnoid.pw/
-  - https://demonoid.unblockit.buzz/
+  - https://demonoid.unblockit.onl/
  - https://demonoid.torrentbay.to/
+  - https://demonoid.nocensor.space/
 legacylinks:
  - https://demonoid.unblockit.pro/
  - https://demonoid.unblockit.one/
@@ -30,6 +31,8 @@ legacylinks:
  - https://demonoid.unblockit.dev/
  - https://demonoid.unblockit.ltd/
  - https://demonoid.unblockit.link/
+  - https://demonoid.unblockit.buzz/
+  - https://demonoid.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -24,6 +24,7 @@ caps:
    - {id: 89, cat: Movies/HD, desc: "BDRemux"}
    - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
    - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
+    - {id: 92, cat: Movies/UHD, desc: "Web-DL UHD"}
    - {id: 23, cat: TV/Sport, desc: "Deportes"}
    - {id: 20, cat: TV/HD, desc: "Series"}
    - {id: 31, cat: TV/HD, desc: "Series VOSE"}
--- a/src/Jackett.Common/Definitions/empornium.yml
+++ b/src/Jackett.Common/Definitions/empornium.yml
@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
  - https://www.empornium.me/

 caps:
--- a/src/Jackett.Common/Definitions/empornium2fa.yml
+++ b/src/Jackett.Common/Definitions/empornium2fa.yml
@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
  - https://www.empornium.me/

 caps:
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/src/Jackett.Common/Definitions/eniahd.yml
@@ -18,6 +18,23 @@ caps:
    - {id: 12, cat: Movies, desc: "Наше кино"}
    # TV
    - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
+    - {id: 52, cat: TV/HD, desc: "Блудный сын / Prodigal Son"}
+    - {id: 49, cat: TV/HD, desc: "Пенниуорт / Pennyworth"}
+    - {id: 62, cat: TV/HD, desc: "Черный список / The Blacklist"}
+    - {id: 64, cat: TV/HD, desc: "Игра престолов / Game of Thrones"}
+    - {id: 59, cat: TV/HD, desc: "Американская история ужасов / American Horror Story"}
+    - {id: 60, cat: TV/HD, desc: "Хороший доктор / The Good Doctor"}
+    - {id: 54, cat: TV/HD, desc: "Рэй Донован / Ray Donovan"}
+    - {id: 55, cat: TV/HD, desc: "Сверхъестественное / Supernatural"}
+    - {id: 56, cat: TV/HD, desc: "Сквозь снег / Snowpiercer"}
+    - {id: 57, cat: TV/HD, desc: "Теория большого взрыва / The Big Bang Theory"}
+    - {id: 58, cat: TV/HD, desc: "Миллиарды / Billions"}
+    - {id: 53, cat: TV/HD, desc: "Родина / Homeland"}
+    - {id: 51, cat: TV/HD, desc: "Новобранец / The Rookie"}
+    - {id: 50, cat: TV/HD, desc: "Это мы / This Is Us"}
+    - {id: 48, cat: TV/HD, desc: "Бэтвумен / Batwoman"}
+    - {id: 32, cat: TV/HD, desc: "Кости / Bones"}
    - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
    - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
    - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
@@ -32,6 +49,8 @@ caps:
    - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
    - {id: 21, cat: TV/Documentary, desc: "Документальные"}
    - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+    # Private Forums
+    - {id: 47, cat: TV/HD, desc: "Рассказ служанки / The Handmaid's Tale"}
    # Miscellaneous
    - {id: 8, cat: Other, desc: "Разное (раздачи)"}

--- a/src/Jackett.Common/Definitions/epizod.yml
+++ b/src/Jackett.Common/Definitions/epizod.yml
@@ -1,166 +0,0 @@
---
-id: epizod
-name: Epizod
-description: "Epizod is a FRENCH Public tracker for MOVIES / TV"
-language: fr-fr
-type: public
-encoding: UTF-8
-links:
-  - https://wwv.epizod.tv/
-legacylinks:
-  - https://www.epizod.tv/
-
-caps:
-  categorymappings:
-    - {id: series, cat: TV, desc: SÉRIES}
-    - {id: films, cat: Movies, desc: FILMS}
-    - {id: musique, cat: Audio, desc: MUSIQUE}
-    - {id: ebook, cat: Books, desc: EBOOK}
-    - {id: other, cat: Other, desc: OTHER}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
-
-download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
-
-search:
-  paths:
-    # https://www.epizod.tv/?s=
-    - path: /
-  inputs:
-    s: "{{ .Keywords }}"
-
-  headers:
-    # Windows User-Agent is required, Linux is blocked
-    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
-
-  rows:
-    selector: li[class^="ilovewp-post"]:not(:has(a[title="DMCA"]))
-
-  fields:
-    category1:
-      selector: a[href*="/category/"]
-      attribute: href
-      optional: true
-      filters:
-        - name: split
-          args: ["/", 4]
-    category2:
-      selector: li[class^="ilovewp-post"]
-      attribute: class
-      optional: true
-      filters:
-        - name: regexp
-          args: "category-(.+?) "
-    category3:
-      selector: img[src*="img"]
-      attribute: src
-      optional: true
-      filters:
-        - name: regexp
-          args: "img/(.+?)_"
-        - name: replace
-          args: ["ebooks", "ebook"]
-    category:
-      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
-    sizecat:
-      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
-    site_date:
-      selector: time > a
-      filters:
-        # year can be at the end of the title, so we get it and name it site_date
-        - name: regexp
-          args: "(19|20\\d{2})$"
-    title_phase1:
-      selector: time > a
-      attribute: title
-      filters:
-        # now we put the date at the right place according scene naming rules using .Result.site_date
-        - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result.site_date }} FRENCH"]
-        - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result.site_date }} MULTI"]
-        - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result.site_date }} TRUEFRENCH"]
-        - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result.site_date }} VOSTFR"]
-        - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result.site_date }} SUBFRENCH"]
-        # and we delete it at the end
-        - name: re_replace
-          args: ["(19|20\\d{2})$", ""]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: h2.title-post > a
-      attribute: href
-    download:
-      selector: h2.title-post > a
-      attribute: href
-    poster:
-      selector: img[data-lazy-src]
-      attribute: data-lazy-src
-    date:
-      selector: time
-      attribute: datetime
-      filters:
-        - name: replace
-          args: ["T", " "]
-        - name: dateparse
-          args: "2006-01-02 15:04:05-07:00"
-    size:
-      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine wordpress
--- a/src/Jackett.Common/Definitions/erzsebet.yml
+++ b/src/Jackett.Common/Definitions/erzsebet.yml
@@ -1,202 +0,0 @@
---
-id: erzsebet
-name: Erzsebet
-description: "Erzsebet is a RUSSIAN Semi-Private Torrent Tracker for 3X"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://erzsebet.org/
-
-caps:
-  categorymappings:
-    - {id: 9, cat: XXX, desc: "Feature, Vignettes, Classic / Фильмы с сюжетом и Классичес..."}
-    - {id: 11, cat: XXX, desc: "Gonzo & All Sex / Гонзо-фильмы и Фильмы без сюжета"}
-    - {id: 13, cat: XXX, desc: "All Girl & Solo / Лесбо-фильмы"}
-    - {id: 12, cat: XXX, desc: "Ethnic-Themed / Этнические фильмы"}
-    - {id: 176, cat: XXX, desc: "Mobile, Pocket РС & Phone / Фильмы для моби..."}
-    - {id: 157, cat: XXX, desc: "Full Length Movies Packs / Паки фильмов"}
-    - {id: 16, cat: XXX, desc: "Feature, Vignettes, Classic (HD) / Фильмы с сюжет..."}
-    - {id: 18, cat: XXX, desc: "Gonzo & All Sex, All Girl & Solo, Ethnic-Themed..."}
-    - {id: 180, cat: XXX, desc: "Full Length Movies (DVD) / Фильмы (DVD)"}
-    - {id: 246, cat: XXX, desc: "Full Length Movies (Blu-Ray) / Фильмы (Blu-Ray)"}
-    - {id: 48, cat: XXX, desc: "Clips (various) / Порно Разное"}
-    - {id: 32, cat: XXX, desc: "SiteRip's & Movie Scenes / Сайтрипы и сцены ..."}
-    - {id: 45, cat: XXX, desc: "SiteRip's & Movie Scenes (HD) / Сайтрипы и сцены..."}
-    - {id: 177, cat: XXX, desc: "3D & Virtual Reality Videos (VR) / Видео в 3D и..."}
-    - {id: 43, cat: XXX, desc: "Actresses Clips Packs / Паки по актрисам"}
-    - {id: 39, cat: XXX, desc: "SiteRip's Packs / Паки сайтрипов"}
-    - {id: 52, cat: XXX, desc: "Russian Clips (various) / Порно Разное с русскими актрисам..."}
-    - {id: 53, cat: XXX, desc: "Russian SiteRip's & Movie Scenes / Сайтрип..."}
-    - {id: 54, cat: XXX, desc: "Russian SiteRip's & Movie Scenes (HD) / Сайтрипы..."}
-    - {id: 56, cat: XXX, desc: "Russian Full Length Movies / Русские полнометражные фильмы"}
-    - {id: 50, cat: XXX, desc: "Russian Clips Packs / Паки русского и по русским актрисам"}
-    - {id: 59, cat: XXX, desc: "Amateur Picture / Любительское фото"}
-    - {id: 58, cat: XXX, desc: "Amateur Video & WebCams / Любительское видео"}
-    - {id: 128, cat: XXX, desc: "Amateur Packs / Паки любительского"}
-    - {id: 129, cat: XXX, desc: "Bukkake, Glory Hole, Cumshot Compilation, BlowGangBang ..."}
-    - {id: 130, cat: XXX, desc: "Squirting & Lesbian Bukkake / Лесбо и соло сквиртинг"}
-    - {id: 120, cat: XXX, desc: "Fisting, Dildo & Toys / Фистинг, фаллоимита..."}
-    - {id: 131, cat: XXX, desc: "LegalPorno.com / Сайтрипы студии Legal Porno "}
-    - {id: 64, cat: XXX, desc: "BDSM / БДСМ"}
-    - {id: 65, cat: XXX, desc: "Fetish / Фетиш"}
-    - {id: 66, cat: XXX, desc: "Peeing / Мочеиспускание"}
-    - {id: 67, cat: XXX, desc: "Pregnant / Беременные"}
-    - {id: 68, cat: XXX, desc: "Femdom & Strapon / Женское доминирование и страпон"}
-    - {id: 71, cat: XXX, desc: "Kaviar Movies / Копрофилия"}
-    - {id: 81, cat: XXX, desc: "Picture Gallery / Порнофотографии"}
-    - {id: 80, cat: XXX, desc: "Misc & Special Interest Picture / Тематичес..."}
-    - {id: 79, cat: XXX, desc: "Magazines, Comix & Artwork / Журналы, ком..."}
-    - {id: 78, cat: XXX, desc: "Picture Packs / Паки фотографий"}
-    - {id: 178, cat: XXX, desc: "Erotic Video Library / Эротические студии (видео)"}
-    - {id: 85, cat: XXX, desc: "Adult Games / Порноигры"}
-    - {id: 83, cat: XXX, desc: "Hentai, Manga & Cartoons  / Хентай, Манга и Мультфильм..."}
-    - {id: 89, cat: XXX, desc: "Japanese Porn / Японское порно"}
-    - {id: 188, cat: XXX, desc: "Erotic Movies, Documentary & Reality / Эротически..."}
-    - {id: 219, cat: XXX, desc: "Cinema / Зарубежный Кинематограф"}
-    - {id: 218, cat: XXX, desc: "Cinema Series / Зарубежные сериалы"}
-    - {id: 217, cat: XXX, desc: "Cinema (Russian) / Кинематограф СССР, России и бы..."}
-    - {id: 216, cat: XXX, desc: "Russian Series / Русские сериалы"}
-    - {id: 215, cat: XXX, desc: "Cartoons & Anime / Мультфильмы и Аниме"}
-    - {id: 214, cat: XXX, desc: "Music (Audio) / Музыка (Аудио)"}
-    - {id: 213, cat: XXX, desc: "Music (Video) / Музыка (Видео)"}
-    - {id: 212, cat: XXX, desc: "Games / Игры"}
-    - {id: 211, cat: XXX, desc: "Soft / Софт"}
-    - {id: 210, cat: XXX, desc: "Various / Разное"}
-    - {id: 205, cat: XXX, desc: "Shemale Transsexual / Транссексуалы"}
-    - {id: 204, cat: XXX, desc: "Bisexual / Бисексуалы"}
-    - {id: 206, cat: XXX, desc: "Gay Clips & Movie Scenes / Ролики, SiteRip'ы..."}
-    - {id: 208, cat: XXX, desc: "Full Length Gay Movies / Полнометражные гей-фильмы"}
-    - {id: 209, cat: XXX, desc: "Gay Magazines, Photo, Rest / Гей-журналы, фото, разное"}
-    - {id: 125, cat: XXX, desc: "Archive / Архив"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    autologin: 1
-  error:
-    - selector: table.error
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - 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 }}"
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    # title search
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
-
-  fields:
-    category:
-      selector: a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a.tLink
-    details:
-      selector: a.tLink
-      attribute: href
-    download:
-      selector: a[href^="./dl.php?id="]
-      attribute: href
-    magnet:
-      optional: true
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -9,8 +9,8 @@ followredirect: true
 links:
  - https://www.ettvcentral.com/
  - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.buzz/
-  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.onl/
+  - https://ettv.nocensor.space/
 legacylinks:
  - https://www.ettv.tv/
  - https://www.ettv.to/
@@ -38,6 +38,9 @@ legacylinks:
  - https://ettv.unblockit.dev/
  - https://ettv.unblockit.ltd/
  - https://ettv.unblockit.link/
+  - https://ettv.unblockit.buzz/
+  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/extratorrent-it.yml
+++ b/src/Jackett.Common/Definitions/extratorrent-it.yml
@@ -7,14 +7,17 @@ type: public
 encoding: UTF-8
 links:
  - https://extratorrents.it/
-  - https://extratorrent.unblockit.buzz/
-  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.nocensor.space/
 legacylinks:
  - https://extratorrent.ag/
  - https://extratorrent.unblockit.app/
  - https://extratorrent.unblockit.dev/
  - https://extratorrent.unblockit.ltd/
  - https://extratorrent.unblockit.link/
+  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.buzz/
+  - https://extratorrent.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/extremlymtorrents.yml
+++ b/src/Jackett.Common/Definitions/extremlymtorrents.yml
@@ -1,179 +0,0 @@
---
-id: extremlymtorrents
-name: ExtremlymTorrents
-description: "ExtremlymTorrents (XTR) is a Semi-Private tracker for MOVIES / TV / GENERAL"
-language: en-us
-type: semi-private
-encoding: UTF-8
-links:
-  - https://extremlymtorrents.ws/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: Movies/HD, desc: "720p HD"}
-    - {id: 15, cat: Movies/HD, desc: "1080p HD"}
-    - {id: 40, cat: Movies/UHD, desc: "4K UHD 2160p"}
-    - {id: 12, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 5, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 16, cat: Movies/3D, desc: "BluRay 3D"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 47, cat: XXX, desc: "Porn UHD 4K -[+18]- xXx"}
-    - {id: 11, cat: XXX, desc: "Porn -[+18]- xXx"}
-    - {id: 50, cat: XXX, desc: "xXx iMAGESET (+18)"}
-    - {id: 41, cat: TV, desc: "TVRip"}
-    - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"}
-    - {id: 9, cat: TV, desc: "Kidz | Cartoons"}
-    - {id: 8, cat: Books/EBook, desc: "Comics | EBook"}
-    - {id: 10, cat: TV, desc: "TV Episode | Season Complete"}
-    - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"}
-    - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"}
-    - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 17, cat: Console/PSP, desc: "PSP | Playstation "}
-    - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"}
-    - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3 "}
-    - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"}
-    - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"}
-    - {id: 21, cat: Movies, desc: "Pack"}
-    - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"}
-    - {id: 24, cat: Audio/Video, desc: "VideoClip"}
-    - {id: 26, cat: Console/Wii, desc: "Wii Games"}
-    - {id: 31, cat: TV/Documentary, desc: "DOC's"}
-    - {id: 36, cat: Movies, desc: "CAMRip | REC"}
-    - {id: 38, cat: Movies, desc: "TS: TeleSync | HD-TS"}
-    - {id: 48, cat: Audio/Video, desc: "4K | 2160p | Music Video"}
-    - {id: 28, cat: TV/Anime, desc: "Anime | Japanese"}
-    - {id: 43, cat: XXX, desc: "Hentai | Manga"}
-    - {id: 29, cat: PC/0day, desc: "Windows PC"}
-    - {id: 7, cat: PC/Mac, desc: "Mac"}
-    - {id: 23, cat: PC, desc: "Linux"}
-    - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"}
-    - {id: 45, cat: Audio, desc: "Vinyl Rip"}
-    - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"}
-    - {id: 1, cat: PC/Games, desc: "Games PC"}
-    - {id: 14, cat: Other, desc: "Wallpapers"}
-    - {id: 44, cat: Movies, desc: "Bollywood"}
-    - {id: 42, cat: Other/Misc, desc: "X EXTERN ONLY MAGNET"}
-    - {id: 39, cat: TV/Sport, desc: "Sport TV"}
-
-  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: 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: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: span.titlebar:contains("Access Denied")
-      message:
-        selector: td.text
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 all 1 English 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.xtrz > tbody > tr[class^="ttable_col"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    language:
-      selector: td:nth-last-child(5)
-    description:
-      optional: true
-      selector: img[src="/images/vip-icon.png"]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/images/vip-icon.png", " VIP ONLY"]
-    title:
-      selector: a[href^="file.php?id="] b
-      filters:
-        - name: append
-          args: " {{ .Result.language }}{{ .Result.description }}"
-    details:
-      selector: a[href^="file.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="file.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
-    leechers:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:nth-last-child(3)
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="/images/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a
--- a/src/Jackett.Common/Definitions/eztv.yml
+++ b/src/Jackett.Common/Definitions/eztv.yml
@@ -12,8 +12,8 @@ links:
  - https://eztv.tf/
  - https://eztv.yt/
  - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.buzz/
-  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.onl/
+  - https://eztv.nocensor.space/
 legacylinks:
  - https://eztv.ag/ # redirects to .re
  - https://eztv.it/ # redirects to .re
@@ -41,6 +41,9 @@ legacylinks:
  - https://eztv.unblockit.dev/
  - https://eztv.unblockit.ltd/
  - https://eztv.unblockit.link/
+  - https://eztv.unblockit.buzz/
+  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.club/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/femdomcult.yml
+++ b/src/Jackett.Common/Definitions/femdomcult.yml
@@ -30,6 +30,7 @@ caps:
    - {id: 65, cat: XXX, desc: "Scat"}
    - {id: 71, cat: XXX, desc: "Strapon"}
    - {id: 66, cat: XXX, desc: "Transdom"}
+    - {id: 77, cat: XXX, desc: "Unknown & Low Quality"}
    - {id: 75, cat: XXX, desc: "Virtual Reality"}

  modes:
--- a/src/Jackett.Common/Definitions/firebit.yml
+++ b/src/Jackett.Common/Definitions/firebit.yml
@@ -8,8 +8,6 @@ encoding: UTF-8
 links:
  - https://firebit.net/
  - https://firebit.info/
-  - https://firebit.pro/
-  - https://firebit.club/
 legacylinks:
  - https://firebit.name/
  - https://firebit.biz/
@@ -19,6 +17,8 @@ legacylinks:
  - http://firebit.pro/
  - http://firebit.club/
  - http://firebit.biz/
+  - https://firebit.pro/
+  - https://firebit.club/

 caps:
  categorymappings:
@@ -69,7 +69,7 @@ search:
    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q=abcd1234{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"

  rows:
-    selector: "{{ if .Keywords }}table.torrents tbody tr{{ else }}div[id^=\"post-id-\"]{{ end }}"
+    selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
    filters:
      - name: andmatch

--- a/src/Jackett.Common/Definitions/focusx.yml
+++ b/src/Jackett.Common/Definitions/focusx.yml
@@ -10,153 +10,158 @@ links:

 caps:
  categorymappings:
-    - {id: 111, cat: Movies, desc: "1922"}
-    - {id: 135, cat: Movies, desc: "Анон"}
-    - {id: 213, cat: Movies, desc: "Борат 2"}
-    - {id: 222, cat: Movies, desc: "Траффик"}
-    - {id: 206, cat: Movies, desc: "Брачная история"}
-    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
-    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
-    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
-    - {id: 65, cat: Movies, desc: "В твоих глазах"}
-    - {id: 74, cat: Movies, desc: "Варкрафт"}
-    - {id: 202, cat: Movies, desc: "Визит инспектора"}
-    - {id: 83, cat: Movies, desc: "Возмущение"}
-    - {id: 168, cat: Movies, desc: "Воспитательница"}
-    - {id: 46, cat: Movies, desc: "Высотка"}
-    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
-    - {id: 90, cat: Movies, desc: "Дангал"}
-    - {id: 189, cat: Movies, desc: "Дедвуд"}
-    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
-    - {id: 19, cat: Movies, desc: "Заброшенный"}
-    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
-    - {id: 64, cat: Movies, desc: "Зоотопия"}
-    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
-    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
-    - {id: 61, cat: Movies, desc: "Комета"}
-    - {id: 18, cat: Movies, desc: "Копенгаген"}
-    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
-    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
-    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 9, cat: TV, desc: "Иерихон"}
    - {id: 10, cat: Movies, desc: "Мёд в голове"}
-    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
-    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
-    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
-    - {id: 54, cat: Movies, desc: "Охотник: Война Зимы"}
+    - {id: 11, cat: TV, desc: "11-22-63"}
+    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
+    - {id: 13, cat: TV, desc: "Смерть в раю"}
+    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
+    - {id: 15, cat: TV, desc: "Чёрные паруса"}
+    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 17, cat: TV, desc: "Карточный домик"}
+    - {id: 18, cat: Movies, desc: "Копенгаген"}
+    - {id: 19, cat: Movies, desc: "Заброшенный"}
+    - {id: 37, cat: TV, desc: "Джек Айриш"}
+    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+    - {id: 39, cat: TV, desc: "Чужестранка"}
+    - {id: 40, cat: TV, desc: "Девушка по вызову"}
+    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+    - {id: 43, cat: TV, desc: "Игра престолов"}
+    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
    - {id: 45, cat: Movies, desc: "Падение Лондона"}
-    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
-    - {id: 57, cat: Movies, desc: "Портниха"}
-    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
-    - {id: 70, cat: Movies, desc: "Припаркованные"}
-    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 46, cat: Movies, desc: "Высотка"}
+    - {id: 47, cat: TV, desc: "Острые козырьки"}
+    - {id: 48, cat: TV, desc: "Странная парочка"}
+    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
    - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
-    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 51, cat: TV, desc: "Проповедник"}
+    - {id: 52, cat: TV, desc: "Изгой"}
+    - {id: 53, cat: TV, desc: "Рэй Донован"}
+    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
+    - {id: 56, cat: TV, desc: "Бесстыдники"}
+    - {id: 57, cat: Movies, desc: "Портниха"}
+    - {id: 58, cat: TV, desc: "Мистер Робот"}
+    - {id: 59, cat: TV, desc: "Валландер"}
+    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+    - {id: 61, cat: Movies, desc: "Комета"}
+    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 63, cat: TV, desc: "Куорри"}
+    - {id: 64, cat: Movies, desc: "Зоотопия"}
+    - {id: 65, cat: Movies, desc: "В твоих глазах"}
+    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+    - {id: 68, cat: TV, desc: "Бесстыжие"}
+    - {id: 69, cat: TV, desc: "Нарко"}
+    - {id: 70, cat: Movies, desc: "Припаркованные"}
+    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
+    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
+    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
+    - {id: 74, cat: Movies, desc: "Варкрафт"}
+    - {id: 75, cat: TV, desc: "Все схвачено"}
+    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+    - {id: 77, cat: TV, desc: "Граница"}
+    - {id: 79, cat: TV, desc: "Бош"}
+    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 81, cat: TV, desc: "Викинги"}
+    - {id: 82, cat: TV, desc: "Салем"}
+    - {id: 83, cat: Movies, desc: "Возмущение"}
    - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
    - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
-    - {id: 11, cat: TV, desc: "11-22-63"}
-    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
-    - {id: 119, cat: TV, desc: "Алиенист"}
-    - {id: 122, cat: TV, desc: "Американская история преступлений"}
-    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
-    - {id: 115, cat: TV, desc: "Безбожники"}
-    - {id: 141, cat: TV, desc: "Безопасность"}
-    - {id: 124, cat: TV, desc: "Бельвью"}
-    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
-    - {id: 56, cat: TV, desc: "Бесстыдники"}
-    - {id: 68, cat: TV, desc: "Бесстыжие"}
-    - {id: 79, cat: TV, desc: "Бош"}
-    - {id: 138, cat: TV, desc: "В пустыне смерти"}
-    - {id: 59, cat: TV, desc: "Валландер"}
-    - {id: 204, cat: TV, desc: "Ведьмак"}
-    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
-    - {id: 129, cat: TV, desc: "Взлет"}
-    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
-    - {id: 81, cat: TV, desc: "Викинги"}
-    - {id: 164, cat: TV, desc: "Возвращение домой"}
-    - {id: 75, cat: TV, desc: "Все схвачено"}
-    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
-    - {id: 144, cat: TV, desc: "Голиаф"}
-    - {id: 77, cat: TV, desc: "Граница"}
-    - {id: 167, cat: TV, desc: "Грязный Джон"}
-    - {id: 96, cat: TV, desc: "Двойка"}
-    - {id: 40, cat: TV, desc: "Девушка по вызову"}
-    - {id: 37, cat: TV, desc: "Джек Айриш"}
-    - {id: 156, cat: TV, desc: "Джек Райан"}
-    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
-    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
-    - {id: 139, cat: TV, desc: "Дождь"}
-    - {id: 184, cat: TV, desc: "Доктор Блейк"}
-    - {id: 197, cat: TV, desc: "Западное крыло"}
-    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
-    - {id: 43, cat: TV, desc: "Игра престолов"}
-    - {id: 9, cat: TV, desc: "Иерихон"}
-    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
-    - {id: 186, cat: TV, desc: "Изгнание"}
-    - {id: 52, cat: TV, desc: "Изгой"}
-    - {id: 162, cat: TV, desc: "Изнанка дела"}
-    - {id: 130, cat: TV, desc: "Инстинкт"}
-    - {id: 175, cat: TV, desc: "Каратель"}
-    - {id: 17, cat: TV, desc: "Карточный домик"}
-    - {id: 203, cat: TV, desc: "Книга Рабов"}
-    - {id: 190, cat: TV, desc: "Кобра Кай"}
-    - {id: 147, cat: TV, desc: "Королева Сахара"}
    - {id: 86, cat: TV, desc: "Кровавая Гонка"}
-    - {id: 187, cat: TV, desc: "Крупный Город"}
-    - {id: 63, cat: TV, desc: "Куорри"}
-    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
-    - {id: 176, cat: TV, desc: "Матрёшка"}
-    - {id: 165, cat: TV, desc: "Метод Комински"}
-    - {id: 89, cat: TV, desc: "Миднайт Техас"}
-    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
-    - {id: 182, cat: TV, desc: "Мистер Посредник"}
-    - {id: 58, cat: TV, desc: "Мистер Робот"}
-    - {id: 69, cat: TV, desc: "Нарко"}
-    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
-    - {id: 155, cat: TV, desc: "Наследники"}
-    - {id: 106, cat: TV, desc: "Одаренные"}
-    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
-    - {id: 120, cat: TV, desc: "Ординатор"}
-    - {id: 47, cat: TV, desc: "Острые козырьки"}
-    - {id: 118, cat: TV, desc: "Охотник за разумом"}
-    - {id: 173, cat: TV, desc: "Парфюм"}
-    - {id: 143, cat: TV, desc: "Подлый пит"}
-    - {id: 179, cat: TV, desc: "Половое Просвещение"}
-    - {id: 110, cat: TV, desc: "Порох"}
-    - {id: 51, cat: TV, desc: "Проповедник"}
-    - {id: 169, cat: TV, desc: "Романовы"}
-    - {id: 53, cat: TV, desc: "Рэй Донован"}
-    - {id: 82, cat: TV, desc: "Салем"}
-    - {id: 116, cat: TV, desc: "Секретные Материалы"}
-    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
    - {id: 87, cat: TV, desc: "Сеньор Авила"}
-    - {id: 100, cat: TV, desc: "Смертельное оружие"}
-    - {id: 172, cat: TV, desc: "Смертельный класс"}
-    - {id: 13, cat: TV, desc: "Смерть в раю"}
-    - {id: 181, cat: TV, desc: "Сорвиголова"}
-    - {id: 185, cat: TV, desc: "Стальная Звезда"}
-    - {id: 131, cat: TV, desc: "Стартап"}
-    - {id: 140, cat: TV, desc: "Страйк"}
-    - {id: 170, cat: TV, desc: "Страна приливов"}
-    - {id: 48, cat: TV, desc: "Странная парочка"}
    - {id: 88, cat: TV, desc: "Стрелок"}
-    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
-    - {id: 112, cat: TV, desc: "Субура"}
-    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
-    - {id: 133, cat: TV, desc: "Террор"}
-    - {id: 97, cat: TV, desc: "Тик-герой"}
-    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 89, cat: TV, desc: "Миднайт Техас"}
+    - {id: 90, cat: Movies, desc: "Дангал"}
    - {id: 91, cat: TV, desc: "Утиные Истории"}
-    - {id: 121, cat: TV, desc: "Уэйко"}
-    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 96, cat: TV, desc: "Двойка"}
+    - {id: 97, cat: TV, desc: "Тик-герой"}
+    - {id: 100, cat: TV, desc: "Смертельное оружие"}
+    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+    - {id: 102, cat: TV, desc: "Черный Список"}
+    - {id: 106, cat: TV, desc: "Одаренные"}
+    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
    - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
    - {id: 109, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 110, cat: TV, desc: "Порох"}
+    - {id: 111, cat: Movies, desc: "1922"}
+    - {id: 112, cat: TV, desc: "Субура"}
+    - {id: 115, cat: TV, desc: "Безбожники"}
+    - {id: 116, cat: TV, desc: "Секретные Материалы"}
+    - {id: 118, cat: TV, desc: "Охотник за разумом"}
+    - {id: 119, cat: TV, desc: "Алиенист"}
+    - {id: 120, cat: TV, desc: "Ординатор"}
+    - {id: 121, cat: TV, desc: "Уэйко"}
+    - {id: 122, cat: TV, desc: "Американская история преступлений"}
+    - {id: 124, cat: TV, desc: "Бельвью"}
+    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
+    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
+    - {id: 129, cat: TV, desc: "Взлет"}
+    - {id: 130, cat: TV, desc: "Инстинкт"}
+    - {id: 131, cat: TV, desc: "Стартап"}
+    - {id: 133, cat: TV, desc: "Террор"}
+    - {id: 135, cat: Movies, desc: "Анон"}
+    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
+    - {id: 138, cat: TV, desc: "В пустыне смерти"}
+    - {id: 139, cat: TV, desc: "Дождь"}
+    - {id: 140, cat: TV, desc: "Страйк"}
+    - {id: 141, cat: TV, desc: "Безопасность"}
+    - {id: 143, cat: TV, desc: "Подлый пит"}
+    - {id: 144, cat: TV, desc: "Голиаф"}
+    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
+    - {id: 147, cat: TV, desc: "Королева Сахара"}
+    - {id: 155, cat: TV, desc: "Наследники"}
+    - {id: 156, cat: TV, desc: "Джек Райан"}
+    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
    - {id: 161, cat: TV, desc: "Частные сыщики"}
-    - {id: 15, cat: TV, desc: "Чёрные паруса"}
-    - {id: 102, cat: TV, desc: "Черный Список"}
-    - {id: 39, cat: TV, desc: "Чужестранка"}
-    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 162, cat: TV, desc: "Изнанка дела"}
+    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
+    - {id: 164, cat: TV, desc: "Возвращение домой"}
+    - {id: 165, cat: TV, desc: "Метод Комински"}
    - {id: 166, cat: TV, desc: "Элита"}
+    - {id: 167, cat: TV, desc: "Грязный Джон"}
+    - {id: 168, cat: Movies, desc: "Воспитательница"}
+    - {id: 169, cat: TV, desc: "Романовы"}
+    - {id: 170, cat: TV, desc: "Страна приливов"}
+    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 172, cat: TV, desc: "Смертельный класс"}
+    - {id: 173, cat: TV, desc: "Парфюм"}
+    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 175, cat: TV, desc: "Каратель"}
+    - {id: 176, cat: TV, desc: "Матрёшка"}
+    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
+    - {id: 179, cat: TV, desc: "Половое Просвещение"}
+    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+    - {id: 181, cat: TV, desc: "Сорвиголова"}
+    - {id: 182, cat: TV, desc: "Мистер Посредник"}
+    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 184, cat: TV, desc: "Доктор Блейк"}
+    - {id: 185, cat: TV, desc: "Стальная Звезда"}
+    - {id: 186, cat: TV, desc: "Изгнание"}
+    - {id: 187, cat: TV, desc: "Крупный Город"}
+    - {id: 189, cat: Movies, desc: "Дедвуд"}
+    - {id: 190, cat: TV, desc: "Кобра Кай"}
+    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
+    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 197, cat: TV, desc: "Западное крыло"}
+    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
+    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
+    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
+    - {id: 202, cat: Movies, desc: "Визит инспектора"}
+    - {id: 203, cat: TV, desc: "Книга Рабов"}
+    - {id: 204, cat: TV, desc: "Ведьмак"}
+    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
+    - {id: 206, cat: Movies, desc: "Брачная история"}
+    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
+    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
+    - {id: 213, cat: Movies, desc: "Борат 2"}
+    - {id: 222, cat: Movies, desc: "Траффик"}
+    - {id: 223, cat: Movies, desc: "На колёсах"}
+    - {id: 224, cat: Movies, desc: "Чудо в камере №7"}
+    - {id: 227, cat: Movies, desc: "Сначала убили моего отца"}
+    - {id: 228, cat: Movies, desc: "Айла: Дочь войны"}
+    - {id: 229, cat: TV, desc: "Танцы с птицами"}
+    - {id: 230, cat: TV, desc: "Жизнь в цвете"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/fouducinema.yml
+++ b/src/Jackett.Common/Definitions/fouducinema.yml
@@ -11,29 +11,40 @@ links:
 caps:
  categorymappings:
    # when refreshing categories dont forget to update the category case block
-    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
-    - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
-    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
+    - {id: 116, cat: Books, desc: "livres cuisine"}
+    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
+    - {id: 123, cat: Books, desc: "livres roman"}
+    - {id: 113, cat: Books/EBook, desc: "livres Ebook"}
+    - {id: 110, cat: Audio/Audiobook, desc: "livres audio"}
+    - {id: 109, cat: Books/Comics, desc: "livres bd"}
+    - {id: 108, cat: Books/Comics, desc: "livres manga"}
+    - {id: 106, cat: Books, desc: "livres presse"}
+    - {id: 105, cat: Books/Mags, desc: "livres magazine"}
+    - {id: 126, cat: Books, desc: "livres "}
+    - {id: 96, cat: TV/Sport, desc: "sport sport"}
+    - {id: 97, cat: TV/Sport, desc: "sport divers"}
    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
+    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
    - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
+    - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
+    - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
+    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
    - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
    - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 67, cat: Movies/3D, desc: "Film 3D Bluray"}
    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Webrip - HDrip"}
    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
+    - {id: 102, cat: Movies/UHD, desc: "Film HDR"}
    - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
    - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
    - {id: 60, cat: TV/Other, desc: "Serie Divers"}
    - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
-    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 101, cat: TV/UHD, desc: "Serie HDR"}
    - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
    - {id: 30, cat: TV/HD, desc: "Serie 720P"}
    - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
@@ -44,6 +55,7 @@ caps:
    - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
    - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
    - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
+    - {id: 112, cat: TV/HD, desc: "Pack_Series HDTV"}
    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
    - {id: 13, cat: PC/0day, desc: "Apps Win"}
    - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
@@ -154,29 +166,40 @@ search:
      selector: div.kat_cat_pic
      filters:
      case:
-        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
-        ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
-        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
+        ":contains(\"livres\"):contains(\"cuisine\")": 116
+        ":contains(\"livres\"):contains(\"XXX\")": 125
+        ":contains(\"livres\"):contains(\"roman\")": 123
+        ":contains(\"livres\"):contains(\"Ebook\")": 113
+        ":contains(\"livres\"):contains(\"audio\")": 110
+        ":contains(\"livres\"):contains(\"bd\")": 109
+        ":contains(\"livres\"):contains(\"manga\")": 108
+        ":contains(\"livres\"):contains(\"presse\")": 106
+        ":contains(\"livres\"):contains(\"magazine\")": 105
+        ":contains(\"livres\"):contains(\"\")": 126
+        ":contains(\"sport\"):contains(\"sport\")": 96
+        ":contains(\"sport\"):contains(\"divers\")": 97
        ":contains(\"Animation\"):contains(\"Séries\")": 81
        ":contains(\"Animation\"):contains(\"Film\")": 79
+        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
        ":contains(\"Film\"):contains(\"DVDRip\")": 2
+        ":contains(\"Film\"):contains(\"Hdrip\")": 99
+        ":contains(\"Film\"):contains(\"Webrip\")": 98
+        ":contains(\"Film\"):contains(\"UHD\")": 86
        ":contains(\"Film\"):contains(\"REMUX\")": 87
        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
        ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"3D\")": 67
        ":contains(\"Film\"):contains(\"Divers\")": 59
        ":contains(\"Film\"):contains(\"720P\")": 19
        ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Webrip\")": 16
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"Full\")": 15
        ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"UHD\")": 86
+        ":contains(\"Film\"):contains(\"HDR\")": 102
        ":contains(\"Serie\"):contains(\"1080P\")": 46
        ":contains(\"Serie\"):contains(\"Bluray\")": 48
        ":contains(\"Serie\"):contains(\"Divers\")": 60
        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
-        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"HDR\")": 101
        ":contains(\"Serie\"):contains(\"DVDRip\")": 12
        ":contains(\"Serie\"):contains(\"720P\")": 30
        ":contains(\"Serie\"):contains(\"Web\")": 23
@@ -187,6 +210,7 @@ search:
        ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
        ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
        ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
+        ":contains(\"Pack_Series\"):contains(\"HDTV\")": 112
        ":contains(\"XxX\"):contains(\"Film\")": 10
        ":contains(\"Apps\"):contains(\"Win\")": 13
        ":contains(\"Apps\"):contains(\"Mac\")": 14
--- a/src/Jackett.Common/Definitions/funreleases.yml
+++ b/src/Jackett.Common/Definitions/funreleases.yml
@@ -1,215 +0,0 @@
---
-id: funreleases
-name: FunReleases
-description: "FunReleases is a Private GERMAN site for TV / MOVIES / GENERAL"
-language: de-de
-type: private
-encoding: UTF-8
-links:
-  - https://funreleases.me/
-
-caps:
-  categorymappings:
-    - {id: 10, cat: Audio/MP3, desc: "Audio Mp3"}
-    - {id: 11, cat: Audio/MP3, desc: "Audio Pack|MP3"}
-    - {id: 12, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 13, cat: Audio/Lossless, desc: "Audio Pack|Flac"}
-    - {id: 14, cat: Audio, desc: "Audio Hörspiel"}
-    - {id: 15, cat: Audio/Audiobook, desc: "Audio Audiobook"}
-    - {id: 16, cat: Audio/Video, desc: "Audio Videoclip"}
-    - {id: 17, cat: Audio/Other, desc: "Audio Sonstiges"}
-    - {id: 18, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 19, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 20, cat: Movies/DVD, desc: "Filme DVD-R"}
-    - {id: 21, cat: Movies/UHD, desc: "Filme HD|4K"}
-    - {id: 22, cat: Movies/HD, desc: "Filme HD|1080p"}
-    - {id: 23, cat: Movies/HD, desc: "Filme HD|720p"}
-    - {id: 24, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 25, cat: Movies/SD, desc: "Filme XviD"}
-    - {id: 26, cat: Movies, desc: "Filme Remux"}
-    - {id: 27, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 28, cat: Movies/Other, desc: "Filme Sonstiges"}
-    - {id: 29, cat: TV/HD, desc: "Serien HD"}
-    - {id: 30, cat: TV/HD, desc: "Serien Pack|HD"}
-    - {id: 31, cat: TV/SD, desc: "Serien SD"}
-    - {id: 32, cat: TV/SD, desc: "Serien Pack|SD"}
-    - {id: 33, cat: TV, desc: "Serien TV/Shows"}
-    - {id: 34, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 35, cat: TV/Other, desc: "Serien Sonstiges"}
-    - {id: 36, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 37, cat: TV/Documentary, desc: "Doku Pack|HD"}
-    - {id: 38, cat: TV/Documentary, desc: "Doku SD"}
-    - {id: 39, cat: TV/Documentary, desc: "Doku Pack|SD"}
-    - {id: 40, cat: TV/Documentary, desc: "Doku International"}
-    - {id: 41, cat: TV/Documentary, desc: "Doku Sonstiges"}
-    - {id: 42, cat: PC/Games, desc: "Games Windows"}
-    - {id: 43, cat: Console/PSP, desc: "Games Playstation"}
-    - {id: 44, cat: Console/XBox, desc: "Games XBox"}
-    - {id: 45, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 46, cat: PC/Games, desc: "Games Macintosh"}
-    - {id: 47, cat: Console/Other, desc: "Games Sonstiges"}
-    - {id: 48, cat: PC/0day, desc: "Software Windows"}
-    - {id: 49, cat: PC/Mac, desc: "Software Macintosh"}
-    - {id: 50, cat: PC/Mobile-Other, desc: "Software Handy-PDA"}
-    - {id: 51, cat: PC, desc: "Software Linux"}
-    - {id: 52, cat: PC, desc: "Software Sonstiges"}
-    - {id: 53, cat: Books/EBook, desc: "Ebook Buch"}
-    - {id: 54, cat: Books/Comics, desc: "Ebook Comic"}
-    - {id: 55, cat: Books/Mags, desc: "Ebook Magazin"}
-    - {id: 56, cat: Books, desc: "Ebook Zeitung"}
-    - {id: 57, cat: Books/Other, desc: "Ebook Sonstiges"}
-    - {id: 58, cat: TV/Sport, desc: "Sport Fußball"}
-    - {id: 59, cat: TV/Sport, desc: "Sport Formel 1"}
-    - {id: 60, cat: TV/Sport, desc: "Sport Wrestling"}
-    - {id: 61, cat: TV/Sport, desc: "Sport Sonstiges"}
-    - {id: 62, cat: XXX, desc: "XXX HD"}
-    - {id: 63, cat: XXX, desc: "XXX Pack|HD"}
-    - {id: 64, cat: XXX, desc: "XXX SD"}
-    - {id: 65, cat: XXX, desc: "XXX Pack|SD"}
-    - {id: 66, cat: XXX, desc: "XXX Bilder"}
-    - {id: 67, cat: XXX, desc: "XXX Sonstiges"}
-
-  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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - 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. The default is <i>15</i>.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: body[onLoad^="makeAlert('"]
-      message:
-        selector: body[onLoad^="makeAlert('"]
-        attribute: onLoad
-        filters:
-          - name: replace
-            args: ["makeAlert('Error' , '", ""]
-          - name: replace
-            args: ["');", ""]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  selector: a[href^="download.php?id="]
-  attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    page: torrents
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    # 0 name, 1 name&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze, 8 1xUL, 9 2x, 10 3x, 11 4x, 12 5x, 13 6x, 14 7x, 15 8x, 16 9x, 17 10x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-  # does not return imdb link in results, and while a few titles have an imdbid in descr the majority do not.
-
-  rows:
-    selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href^="index.php?page=torrent-details&id="]
-    details:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=downloadcheck&id="]
-      attribute: href
-    poster:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(9)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-last-child(8)
-    leechers:
-      selector: td:nth-last-child(7)
-    grabs:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="images/gold.gif"]: 0
-        img[src="images/silver.gif"]: 0.5
-        img[src="images/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/2x.gif"]: 2
-        img[src="images/3x.gif"]: 3
-        img[src="images/4x.gif"]: 4
-        img[src="images/5x.gif"]: 5
-        img[src="images/6x.gif"]: 6
-        img[src="images/7x.gif"]: 7
-        img[src="images/8x.gif"]: 8
-        img[src="images/9x.gif"]: 9
-        img[src="images/10x.gif"]: 10
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800 # rules say you must seed but not for how long
-# xbtitFM 3.0.00
--- a/src/Jackett.Common/Definitions/galeriens.yml
+++ b/src/Jackett.Common/Definitions/galeriens.yml
@@ -1,367 +0,0 @@
---
-id: galeriens
-name: Galeriens
-description: "Galeriens is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-fr
-type: private
-encoding: UTF-8
-links:
-  - https://galeriens.com/
-legacylinks:
-  - https://galeriens.eu/
-
-caps:
-  categorymappings:
-    - {id: 4, cat: Movies/UHD, desc: "Animations -  4K Remux"}
-    - {id: 1, cat: Movies/3D, desc: "Animations - 3D"}
-    - {id: 3, cat: Movies/UHD, desc: "Animations - 4K Light"}
-    - {id: 2, cat: Movies/UHD, desc: "Animations - 4K UHD"}
-    - {id: 5, cat: Movies/UHD, desc: "Animations - 4K UHD Bluray"}
-    - {id: 6, cat: Movies/BluRay, desc: "Animations - BDRip-BRRIP"}
-    - {id: 7, cat: Movies/BluRay, desc: "Animations - BluRay-R"}
-    - {id: 8, cat: Movies, desc: "Animations - Coffret Films"}
-    - {id: 9, cat: Movies/DVD, desc: "Animations - DVD-R"}
-    - {id: 10, cat: Movies/DVD, desc: "Animations - DVDRip"}
-    - {id: 11, cat: Movies/HD, desc: "Animations - HD 1080P"}
-    - {id: 12, cat: Movies/HD, desc: "Animations - HD 720P"}
-    - {id: 13, cat: Movies/HD, desc: "Animations - HDRiP"}
-    - {id: 16, cat: Movies/HD, desc: "Animations - HDTV"}
-    - {id: 14, cat: Movies/HD, desc: "Animations - HDTV 1080p"}
-    - {id: 15, cat: Movies/HD, desc: "Animations - HDTV 720p"}
-    - {id: 17, cat: Movies, desc: "Animations - Jap-Animation"}
-    - {id: 18, cat: Movies/HD, desc: "Animations - M-HD 1080p"}
-    - {id: 19, cat: Movies/HD, desc: "Animations - M-HD 720p"}
-    - {id: 20, cat: Movies, desc: "Animations - Remux"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "Animations - TVRip"}
-    - {id: 24, cat: Movies/WEB-DL, desc: "Animations - WEB-DL"}
-    - {id: 22, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 1080p"}
-    - {id: 23, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 720p"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "Animations - WEBRip"}
-    - {id: 26, cat: Movies/HD, desc: "Animations - X265"}
-    - {id: 49, cat: TV/Documentary, desc: "Documentaires - Doc-Spectacle"}
-    - {id: 48, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
-    - {id: 51, cat: TV/Documentary, desc: "Documentaires - Film"}
-    - {id: 50, cat: TV/Sport, desc: "Documentaires - Sport"}
-    - {id: 57, cat: Movies/3D, desc: "Films - 3D"}
-    - {id: 59, cat: Movies/UHD, desc: "Films - 4K Light"}
-    - {id: 60, cat: Movies/UHD, desc: "Films - 4K Remux"}
-    - {id: 61, cat: Movies/UHD, desc: "Films - 4K UHD"}
-    - {id: 58, cat: Movies/UHD, desc: "Films - 4K UHD Bluray"}
-    - {id: 62, cat: Movies/BluRay, desc: "Films - BDRip-BRRIP"}
-    - {id: 63, cat: Movies/BluRay, desc: "Films - BluRay-R"}
-    - {id: 64, cat: Movies, desc: "Films - Coffret Films"}
-    - {id: 65, cat: Movies/DVD, desc: "Films - DVD-R"}
-    - {id: 66, cat: Movies/DVD, desc: "Films - DVDRip"}
-    - {id: 67, cat: Movies/HD, desc: "Films - HD 1080P"}
-    - {id: 68, cat: Movies/HD, desc: "Films - HD 720P"}
-    - {id: 69, cat: Movies/HD, desc: "Films - HDRiP"}
-    - {id: 72, cat: Movies/HD, desc: "Films - HDTV"}
-    - {id: 70, cat: Movies/HD, desc: "Films - HDTV 1080p"}
-    - {id: 71, cat: Movies/HD, desc: "Films - HDTV 720p"}
-    - {id: 73, cat: Movies/HD, desc: "Films - M-HD 1080p"}
-    - {id: 74, cat: Movies/HD, desc: "Films - M-HD 720p"}
-    - {id: 75, cat: Movies, desc: "Films - Remux"}
-    - {id: 76, cat: Movies/WEB-DL, desc: "Films - TVRip"}
-    - {id: 77, cat: Movies/WEB-DL, desc: "Films - WEB-DL"}
-    - {id: 78, cat: Movies/WEB-DL, desc: "Films - WEB-DL 1080p"}
-    - {id: 79, cat: Movies/WEB-DL, desc: "Films - WEB-DL 720p"}
-    - {id: 80, cat: Movies/WEB-DL, desc: "Films - WEBRip"}
-    - {id: 81, cat: Movies/HD, desc: "Films - X265"}
-    - {id: 82, cat: Movies/3D, desc: "Films-VOSTFR - 3D"}
-    - {id: 84, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Light"}
-    - {id: 85, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Remux"}
-    - {id: 86, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD"}
-    - {id: 83, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD Bluray"}
-    - {id: 87, cat: Movies/BluRay, desc: "Films-VOSTFR - BDRip-BRRIP"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films-VOSTFR - BluRay-R"}
-    - {id: 89, cat: Movies, desc: "Films-VOSTFR - Coffret Films"}
-    - {id: 90, cat: Movies/DVD, desc: "Films-VOSTFR - DVD-R"}
-    - {id: 91, cat: Movies/DVD, desc: "Films-VOSTFR - DVDRip"}
-    - {id: 92, cat: Movies/HD, desc: "Films-VOSTFR - HD 1080P"}
-    - {id: 93, cat: Movies/HD, desc: "Films-VOSTFR - HD 720P"}
-    - {id: 94, cat: Movies/HD, desc: "Films-VOSTFR - HDRiP"}
-    - {id: 97, cat: Movies/HD, desc: "Films-VOSTFR - HDTV"}
-    - {id: 95, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 1080p"}
-    - {id: 96, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 720p"}
-    - {id: 98, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 720p"}
-    - {id: 100, cat: Movies, desc: "Films-VOSTFR - Remux"}
-    - {id: 101, cat: Movies/WEB-DL, desc: "Films-VOSTFR - TVRip"}
-    - {id: 102, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL"}
-    - {id: 103, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 1080p"}
-    - {id: 104, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 720p"}
-    - {id: 105, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEBRip"}
-    - {id: 106, cat: Movies/HD, desc: "Films-VOSTFR - X265"}
-    - {id: 107, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-    - {id: 108, cat: PC/Mobile-iOS, desc: "Jeux - IOS-OSX"}
-    - {id: 109, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 110, cat: Console/PS3, desc: "Jeux - PS3 - PS4"}
-    - {id: 111, cat: Console/PSP, desc: "Jeux - PSP-PSX"}
-    - {id: 112, cat: Console/Wii, desc: "Jeux - WII"}
-    - {id: 113, cat: Console/WiiU, desc: "Jeux - WII-U"}
-    - {id: 114, cat: Console/XBox, desc: "Jeux - XBOX"}
-    - {id: 52, cat: Books, desc: "Livres - BD"}
-    - {id: 56, cat: Audio/Audiobook, desc: "Livres - Livres Audio"}
-    - {id: 55, cat: Books/Comics, desc: "Livres - Mangas"}
-    - {id: 54, cat: Books/Mags, desc: "Livres - Press"}
-    - {id: 53, cat: Books/EBook, desc: "Livres - Romans"}
-    - {id: 115, cat: PC/Mobile-Android, desc: "Logiciels - ANDROID"}
-    - {id: 118, cat: PC/Mac, desc: "Logiciels - APPLE"}
-    - {id: 116, cat: PC/Mobile-iOS, desc: "Logiciels - IPHONE"}
-    - {id: 117, cat: PC, desc: "Logiciels - LINUX"}
-    - {id: 119, cat: PC/0day, desc: "Logiciels - WINDOWS"}
-    - {id: 120, cat: Audio/Lossless, desc: "Musiques - FLAC"}
-    - {id: 121, cat: Audio, desc: "Musiques - HQ"}
-    - {id: 122, cat: Audio/MP3, desc: "Musiques - MP3"}
-    - {id: 123, cat: Audio, desc: "Musiques - Spect/Concert"}
-    - {id: 27, cat: TV/HD, desc: "Series-Animee - BDRip-BRRIP"}
-    - {id: 28, cat: TV/HD, desc: "Series-Animee - BluRay-R"}
-    - {id: 29, cat: TV/SD, desc: "Series-Animee - DVD-R"}
-    - {id: 30, cat: TV/SD, desc: "Series-Animee - DVDRip"}
-    - {id: 32, cat: TV/HD, desc: "Series-Animee - HD 1080P"}
-    - {id: 31, cat: TV/HD, desc: "Series-Animee - HD 720P"}
-    - {id: 33, cat: TV/HD, desc: "Series-Animee - HDRiP"}
-    - {id: 34, cat: TV/HD, desc: "Series-Animee - HDTV"}
-    - {id: 35, cat: TV/HD, desc: "Series-Animee - HDTV 1080p"}
-    - {id: 36, cat: TV/HD, desc: "Series-Animee - HDTV 720p"}
-    - {id: 37, cat: TV/HD, desc: "Series-Animee - M-HD 1080p"}
-    - {id: 38, cat: TV/HD, desc: "Series-Animee - M-HD 720p"}
-    - {id: 47, cat: TV/Anime, desc: "Series-Animee - Pack Serie Animee"}
-    - {id: 39, cat: TV/Anime, desc: "Series-Animee - Remux"}
-    - {id: 46, cat: TV/Anime, desc: "Series-Animee - SERIE JAP-ANIM"}
-    - {id: 40, cat: TV/Anime, desc: "Series-Animee - TVRip"}
-    - {id: 41, cat: TV/Anime, desc: "Series-Animee - WEB-DL"}
-    - {id: 42, cat: TV/Anime, desc: "Series-Animee - WEB-DL 1080p"}
-    - {id: 43, cat: TV/Anime, desc: "Series-Animee - WEB-DL 720p"}
-    - {id: 44, cat: TV/Anime, desc: "Series-Animee - WEBRip"}
-    - {id: 45, cat: TV/HD, desc: "Series-Animee - X265"}
-    - {id: 124, cat: TV/HD, desc: "Series-FR - BDRip-BRRIP"}
-    - {id: 125, cat: TV/HD, desc: "Series-FR - BluRay-R"}
-    - {id: 126, cat: TV/SD, desc: "Series-FR - DVD-R"}
-    - {id: 127, cat: TV/SD, desc: "Series-FR - DVDRip"}
-    - {id: 128, cat: TV/HD, desc: "Series-FR - HD 1080P"}
-    - {id: 129, cat: TV/HD, desc: "Series-FR - HD 720P"}
-    - {id: 130, cat: TV/HD, desc: "Series-FR - HDRiP"}
-    - {id: 133, cat: TV/HD, desc: "Series-FR - HDTV"}
-    - {id: 131, cat: TV/HD, desc: "Series-FR - HDTV 1080p"}
-    - {id: 132, cat: TV/HD, desc: "Series-FR - HDTV 720p"}
-    - {id: 134, cat: TV/HD, desc: "Series-FR - M-HD 1080p"}
-    - {id: 135, cat: TV/HD, desc: "Series-FR - M-HD 720p"}
-    - {id: 136, cat: TV, desc: "Series-FR - Pack Serie"}
-    - {id: 137, cat: TV, desc: "Series-FR - Remux"}
-    - {id: 138, cat: TV/WEB-DL, desc: "Series-FR - TVRip"}
-    - {id: 141, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL"}
-    - {id: 139, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 1080p"}
-    - {id: 140, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 720p"}
-    - {id: 142, cat: TV/WEB-DL, desc: "Series-FR - WEBRip"}
-    - {id: 143, cat: TV/HD, desc: "Series-FR - X265"}
-    - {id: 144, cat: TV/HD, desc: "Series-VOSTFR - BDRip-BRRIP"}
-    - {id: 145, cat: TV/HD, desc: "Series-VOSTFR - BluRay-R"}
-    - {id: 146, cat: TV/SD, desc: "Series-VOSTFR - DVD-R"}
-    - {id: 147, cat: TV/SD, desc: "Series-VOSTFR - DVDRip"}
-    - {id: 148, cat: TV/HD, desc: "Series-VOSTFR - HD 1080P"}
-    - {id: 149, cat: TV/HD, desc: "Series-VOSTFR - HD 720P"}
-    - {id: 150, cat: TV/HD, desc: "Series-VOSTFR - HDRiP"}
-    - {id: 153, cat: TV/HD, desc: "Series-VOSTFR - HDTV"}
-    - {id: 151, cat: TV/HD, desc: "Series-VOSTFR - HDTV 1080p"}
-    - {id: 152, cat: TV/HD, desc: "Series-VOSTFR - HDTV 720p"}
-    - {id: 154, cat: TV/HD, desc: "Series-VOSTFR - M-HD 1080p"}
-    - {id: 155, cat: TV/HD, desc: "Series-VOSTFR - M-HD 720p"}
-    - {id: 156, cat: TV, desc: "Series-VOSTFR - Pack Serie"}
-    - {id: 157, cat: TV, desc: "Series-VOSTFR - Remux"}
-    - {id: 158, cat: TV/WEB-DL, desc: "Series-VOSTFR - TVRip"}
-    - {id: 161, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL"}
-    - {id: 159, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 1080p"}
-    - {id: 160, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 720p"}
-    - {id: 162, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEBRip"}
-    - {id: 163, cat: TV/HD, desc: "Series-VOSTFR - X265"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: torrentlanguage
-    type: select
-    label: Torrent Language
-    default: 0
-    options:
-      0: "Toutes Les Langues"
-      1: Allemand
-      2: Anglais(UK)
-      3: Anglais(US)
-      4: Arabe
-      5: Bengali
-      6: Cantonais
-      7: Coréen
-      8: Danois
-      9: Espagnol
-      10: Flamand
-      11: Français
-      12: Hébreu
-      13: Hindi
-      14: Italien
-      15: Japonais
-      16: Mandarin
-      17: Multi
-      24: "Multi Truefrench"
-      18: Perse
-      19: Portuguais
-      20: Québécois
-      21: Russe
-      22: Suédois
-      23: Ukrainien
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: TTV3/Bienvenue
-    selector: a[href$="/TTV3/Deconnexion"]
-
-download:
-  before:
-    # https://galeriens.com/TTV3/Torrents/11222/Remercier
-    # note http GET does not seem to work as the html suggests, so using same as LeChaudron which is also a TT3.00FRENCH engine.
-    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/Remercier"
-    method: post
-    inputs:
-      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selector: a[href*="/Telechargement/"]
-  attribute: href
-
-search:
-  paths:
-    # https://galeriens.eu/TTV3/Torrents/Recherche?recherche=&type=tout&endroit=nomtorrent&langue=0&tl=peuimporte
-    # categories for searching are unsupported
-    - path: TTV3/Torrents/Recherche
-  inputs:
-    recherche: "{{ .Keywords }}"
-    # searchtype: un (one word), tout (all words), exacte (exact expression)
-    type: tout
-    # searchin:  nomtorrent (name), desctorrent (descr)
-    endroit: nomtorrent
-    # language: 11 french, 17 multi
-    langue: "{{ .Config.torrentlanguage }}"
-    # freeleech: oui (yes), non (no), peuimporte (ignore)
-    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
-    # does not support imdbid search and does not return imdb link in results.
-
-  rows:
-    selector: table.sortable tbody tr
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title_phase1:
-      selector: a[onmouseover]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src= (.*?)><"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-child(2) a font[color="#F2F2F2"]
-      filters:
-        - name: replace
-          args: ["il y a ", ""]
-        - name: replace
-          args: [" Jours", " days"]
-        - name: replace
-          args: [" Jour", " day"]
-        - name: replace
-          args: [" heures", " hours"]
-        - name: replace
-          args: [" heure", " hour"]
-        - name: replace
-          args: [" Semaines", " weeks"]
-        - name: replace
-          args: [" Semaine", " week"]
-        - name: replace
-          args: [" mois", " month"]
-        - name: replace
-          args: [" ans", " years"]
-        - name: replace
-          args: [" an", " year"]
-        - name: append
-          args: " ago"
-    downloadvolumefactor:
-      case:
-        img[src$="/images/Torrents/TLibre.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/gamestorrents.yml
+++ b/src/Jackett.Common/Definitions/gamestorrents.yml
@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
  - https://www.gamestorrents.nu/
+  - https://gamestorrents.nocensor.space/
 legacylinks:
  - https://www.gamestorrents.com/
  - https://www.gamestorrents.tv/
--- a/src/Jackett.Common/Definitions/girotorrent.yml
+++ b/src/Jackett.Common/Definitions/girotorrent.yml
@@ -28,6 +28,7 @@ caps:
    - {id: 22, cat: Movies/SD, desc: "Movie BDRip"}
    - {id: 23, cat: Movies/SD, desc: "Movie DvdRip"}
    - {id: 95, cat: Movies/SD, desc: "Movie WEBRip"}
+    - {id: 98, cat: Movies/WEB-DL, desc: "Movie WEBDL"}
    - {id: 24, cat: Movies/DVD, desc: "Movie DVD-R 5"}
    - {id: 25, cat: Movies/DVD, desc: "Movie DVD-R 9"}
    - {id: 26, cat: Movies/HD, desc: "Movie Blu-Ray HD"}
--- a/src/Jackett.Common/Definitions/gktorrent.yml
+++ b/src/Jackett.Common/Definitions/gktorrent.yml
@@ -8,6 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
  - https://www.gktorrent.cc/
+  - https://gktorrent.nocensor.space/
 legacylinks:
  - https://www.gktorrent.com/
  - http://www.gktorrent.com/
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -9,8 +9,8 @@ followredirect: true
 links:
  - https://www.gtdb.to/
  - https://glodls.to/
-  - https://glotorrents.unblockit.buzz/
-  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.nocensor.space/
 legacylinks:
  - https://glodls.rocks/
  - https://glotorrents.unblockit.pro/
@@ -35,6 +35,9 @@ legacylinks:
  - https://glotorrents.unblockit.dev/
  - https://glotorrents.unblockit.ltd/
  - https://glotorrents.unblockit.link/
+  - https://glotorrents.unblockit.buzz/
+  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/gtorrent.yml
+++ b/src/Jackett.Common/Definitions/gtorrent.yml
@@ -15,6 +15,7 @@ caps:
    - {id: "igry", cat: Console, desc: "Игры (Games)"}
    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/gtorrentpro.yml
+++ b/src/Jackett.Common/Definitions/gtorrentpro.yml
@@ -15,6 +15,7 @@ caps:
    - {id: "igry", cat: Console, desc: "Игры (Games)"}
    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -162,6 +162,8 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumratio:
+      text: 0.8
    description:
      selector: td:nth-child(2)
      remove: a, img
--- a/src/Jackett.Common/Definitions/hdcztorrent.yml
+++ b/src/Jackett.Common/Definitions/hdcztorrent.yml
@@ -0,0 +1,188 @@
+---
+id: hdcztorrent
+name: HD-CzTorrent
+description: "HD-CzTorrent is a CZECH semi private site for TV / MOVIES / GENERAL"
+language: cs-cz
+type: semi-private
+encoding: UTF-8
+links:
+  - http://www.hd-cztorrent.cz/
+
+caps:
+  categorymappings:
+    # Film
+    - {id: 37, cat: Movies/DVD, desc: "DVD"}
+    - {id: 92, cat: TV, desc: "TV Serial ENG"}
+    - {id: 39, cat: Audio/Video, desc: "Hudba Video"}
+    - {id: 41, cat: Movies/SD, desc: "DivX / AVI"}
+    - {id: 90, cat: Movies/SD, desc: "DivX / AVI Titulky"}
+    - {id: 43, cat: Movies/Other, desc: "FILM dokument"}
+    - {id: 44, cat: Movies/Other, desc: "FILM sport"}
+    - {id: 45, cat: TV, desc: "SERIALY CZ"}
+    - {id: 47, cat: Movies, desc: "Animované"}
+    - {id: 91, cat: TV, desc: "Serial titulky"}
+    - {id: 50, cat: Movies/BluRay, desc: "FILMY Blu-ray"}
+    - {id: 109, cat: Movies/BluRay, desc: "BLURAY orig JAZYK"}
+    - {id: 52, cat: Movies/HD, desc: "HD 1080 "}
+    - {id: 53, cat: Movies/HD, desc: "HD 720"}
+    - {id: 55, cat: Movies/3D, desc: "3D Filmy"}
+    - {id: 110, cat: Movies/3D, desc: "3D ORIGINÁL"}
+    - {id: 111, cat: Movies, desc: "FILMY CZ TVORBA"}
+    - {id: 98, cat: Movies/UHD, desc: "ORIGINAL JAZYK 4K"}
+    - {id: 77, cat: Movies/UHD, desc: "ULTRA HD  4K"}
+    - {id: 89, cat: Movies/HD, desc: "HD720 titulky "}
+    - {id: 93, cat: Movies/HD, desc: "HD 1080 titulky"}
+    - {id: 107, cat: Movies, desc: "CAMERA RIP "}
+    - {id: 94, cat: Movies, desc: "h 265"}
+    - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
+    - {id: 95, cat: Movies/Other, desc: "FILM RETRO"}
+    # HUDBA
+    - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
+    - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}
+    - {id: 96, cat: Audio/Other, desc: "RETRO HUDBA"}
+    # ostatni
+    - {id: 64, cat: Books, desc: "E-books, PDF fotky"}
+    - {id: 65, cat: Audio/Audiobook, desc: "Mluvene slovo"}
+    - {id: 113, cat: Books/Other, desc: "obrazky fotky"}
+    # PORNO
+    - {id: 11, cat: XXX, desc: "XXX 18+KLASIKA"}
+    - {id: 99, cat: XXX, desc: "XXX GAY"}
+    - {id: 100, cat: XXX, desc: "XXX ASIAN"}
+    - {id: 101, cat: XXX, desc: "XXX 3D"}
+    - {id: 106, cat: XXX/ImageSet, desc: "XXX-OBRÁZKY"}
+    - {id: 108, cat: XXX, desc: "PORNO BDSM"}
+    # HRY
+    - {id: 73, cat: PC/Games, desc: "Hry, Games"}
+    - {id: 97, cat: Console/PS4, desc: "HRY PS4"}
+    # APLIKACE
+    - {id: 60, cat: PC/Mobile-Other, desc: "Mobil PDA"}
+    - {id: 62, cat: PC, desc: "Aplikace All"}
+
+  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: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+  - name: info
+    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:
+  method: post
+  path: index.php?page=login
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista span[style="color:#FF0000;"]
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+
+search:
+  paths:
+    # http://www.hd-cztorrent.cz/index.php?page=torrents&search=the+avengers&category=0&uploader=0&options=0&active=0&gold=0&order=3&by=2
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    uploader: 0
+    # 0 filename, 1 file & desc, 2 description
+    options: 0
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver & gold
+    gold: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: td#mcol table.lista > tbody > tr:has(a[href*=bookmark])
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td:nth-child(2) > a
+    details:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) "
+    date:
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02/01/2006 -07:00"
+    size:
+      selector: td:nth-child(11)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src$="freeleech.gif"]: 0
+        img[src$="gold.gif"]: 0
+        img[src$="silver.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="2x.gif"]: 2
+        img[src$="3x.gif"]: 3
+        img[src$="4x.gif"]: 4
+        img[src$="5x.gif"]: 5
+        img[src$="6x.gif"]: 6
+        img[src$="7x.gif"]: 7
+        img[src$="8x.gif"]: 8
+        img[src$="9x.gif"]: 9
+        img[src$="10x.gif"]: 10
+        "*": 1
+    minimumratio:
+      text: 0.3
+# xbtit dt fm v7.1 customized
--- a/src/Jackett.Common/Definitions/hdhouse.yml
+++ b/src/Jackett.Common/Definitions/hdhouse.yml
@@ -8,10 +8,10 @@ encoding: windows-1251
 links:
  - https://hdhouse.club/
  - https://hdreactor.club/
-  - https://hdreactor.su/
 legacylinks:
  - https://hdreactor.guru/
  - https://hdreactor.net/
+  - https://hdreactor.su/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/hdspain.yml
+++ b/src/Jackett.Common/Definitions/hdspain.yml
@@ -78,7 +78,18 @@ search:
        - name: append
          args: "]"
    title:
-      selector: td.titulo a[id]
+      selector: td.titulo a[id]:contains("VOSE")
+      optional: true
+      filters:
+        - name: prepend
+          args: "{{ .Result.extras }} "
+        - name: append
+          args: " English"
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title:
+      selector: td.titulo a[id]:not(:contains("VOSE"))
+      optional: true
      filters:
        - name: prepend
          args: "{{ .Result.extras }} "
--- a/src/Jackett.Common/Definitions/hdtime.yml
+++ b/src/Jackett.Common/Definitions/hdtime.yml
@@ -162,6 +162,8 @@ search:
        img.pro_free2up: 2
        img.pro_2up: 2
        "*": 1
+    minimumratio:
+      text: 0.8
    description:
      selector: td:nth-child(2)
      remove: a, img
--- a/src/Jackett.Common/Definitions/hdturk.yml
+++ b/src/Jackett.Common/Definitions/hdturk.yml
@@ -6,9 +6,10 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - https://hdturk.de/
+  - https://hdturk.club/
 legacylinks:
  - http://hdturk.de/
+  - https://hdturk.de/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/hellastz.yml
+++ b/src/Jackett.Common/Definitions/hellastz.yml
@@ -79,7 +79,7 @@ login:
    uid: "{{ .Config.username }}"
    pwd: "{{ .Config.password }}"
  error:
-    - selector: form[action="index.php?page=login&returnto=index.php"] table tr td span
+    - selector: tr td span[style="color:#FF0000;"]
  test:
    path: index.php
    selector: a[href="logout.php"]
@@ -173,4 +173,4 @@ search:
    minimumseedtime:
      # 3 days (as seconds = 3 x 24 x 60 x 60)
      text: 259200
-#  xbtitFM v3.0.00
+#  xbtitFM v3.1.00
--- a/src/Jackett.Common/Definitions/hqsource.yml
+++ b/src/Jackett.Common/Definitions/hqsource.yml
@@ -114,12 +114,14 @@ search:
    size:
      selector: td:nth-child(5)
    date:
-      selector: tr, br
+      selector: td:nth-child(2)
      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-0215:04:05 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
    seeders:
      selector: td:nth-child(7)
    leechers:
--- a/src/Jackett.Common/Definitions/huntorrent.yml
+++ b/src/Jackett.Common/Definitions/huntorrent.yml
@@ -0,0 +1,166 @@
+---
+id: huntorrent
+name: HunTorrent
+description: "HunTorrent is a Hungarian Semi-Private site for MOVIES / TV / GENERAL"
+language: hu-hu
+type: semi-private
+encoding: UTF-8
+links:
+  - https://huntorrent.net/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: Movies/SD, desc: "Cam/ENG"}
+    - {id: 27, cat: Movies/SD, desc: "Cam/HUN"}
+    - {id: 4, cat: Movies/DVD, desc: "DVDR/ENG"}
+    - {id: 3, cat: Movies/DVD, desc: "DVDR/HUN"}
+    - {id: 6, cat: Movies/HD, desc: "HD/ENG"}
+    - {id: 5, cat: Movies/HD, desc: "HD/HUN"}
+    - {id: 29, cat: Movies, desc: "Mese/ENG"}
+    - {id: 30, cat: Movies, desc: "Mese/HUN"}
+    - {id: 8, cat: TV/SD, desc: "Sorozat/ENG"}
+    - {id: 31, cat: TV/HD, desc: "Sorozat/HD/ENG"}
+    - {id: 9, cat: TV/HD, desc: "Sorozat/HD/HUN"}
+    - {id: 7, cat: TV/SD, desc: "Sorozat/HUN"}
+    - {id: 2, cat: Movies/SD, desc: "XviD/ENG"}
+    - {id: 1, cat: Movies/SD, desc: "XviD/HUN"}
+    - {id: 25, cat: Other, desc: "Kép"}
+    - {id: 24, cat: Books, desc: "eBook/ENG"}
+    - {id: 23, cat: Books, desc: "eBook/HUN"}
+    - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 17, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 18, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 19, cat: Console, desc: "Konzol"}
+    - {id: 26, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 20, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 21, cat: PC/0day, desc: "Program/RIP"}
+    - {id: 13, cat: Audio/Video, desc: "Klip/ENG"}
+    - {id: 12, cat: Audio/Video, desc: "Klip/HUN"}
+    - {id: 11, cat: Audio/MP3, desc: "MP3/ENG"}
+    - {id: 10, cat: Audio/MP3, desc: "MP3/HUN"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: name
+      4: created
+      7: seeders
+      5: size
+  - 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, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    login: yes
+  # error: using some kind of JS popup that can not be trapped :-(
+  test:
+    path: browse.php
+    selector: a[href^="logout.php?k="]
+
+search:
+  paths:
+    # https://huntorrent.net/browse.php?time=1616615308&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    viewMode: ""
+    xyz: yes
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
+    korhatar: 0
+    # 0 active, 1 all, 2 dead, 3 my uploads, 4  my bookmarks
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # no freeleech atm
+
+  rows:
+    selector: table[align="center"][cellpadding="5"] > tbody > tr[id^="torrent-main-"]
+
+  fields:
+    id:
+      selector: a.download-link
+      attribute: data-id
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="#details_tr_"]
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Név: ", ""]
+    details:
+      text: "details.php?id={{ .Result.id }}"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    description:
+      selector: td:nth-child(2) div:nth-child(2)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    poster:
+      selector: a[href^="torrents_data/posters/"]
+      attribute: href
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(5) b
+    grabs:
+      selector: td:nth-last-child(4)
+      filters:
+        - name: replace
+          args: ["x", ""]
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 2
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 32 hours (as seconds = 32 x 60 x 60)
+      text: 115200
+# engine n/a
--- a/src/Jackett.Common/Definitions/idope.yml
+++ b/src/Jackett.Common/Definitions/idope.yml
@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
  - https://idope.se/
-  - https://idope.unblocked.monster/
 legacylinks:
  - https://idope.black-mirror.xyz/
  - https://idope.unblocked.casa/
@@ -18,6 +17,7 @@ legacylinks:
  - https://idope.proxyportal.pw/
  - https://idope.uk-unblock.pro/
  - https://idope.unblocked.rest/
+  - https://idope.unblocked.monster/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/ilcorsaroblu.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaroblu.yml
@@ -6,11 +6,12 @@ language: it-it
 type: semi-private
 encoding: UTF-8
 links:
-  - https://ilcorsaroblu.org/
+  - https://ilcorsaroblu.online/
 legacylinks:
  - http://ilcorsaroblu.org/
  - https://www.ilcorsaroblu.info/
  - https://www.ilcorsaroblu.org/
+  - https://ilcorsaroblu.org/

 caps:
  categorymappings:
@@ -184,6 +185,23 @@ search:
          args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
        - name: re_replace # rimozioni varie
          args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
    details:
      selector: td:nth-child(2) > a
      attribute: href
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -11,6 +11,7 @@ links:
  - https://ilcorsaronero.fun/
  - https://ilcorsaronero.pro/
  - https://ilcorsaronero.torrentbay.to/
+  - https://ilcorsaronero.nocensor.space/
 legacylinks:
  - https://ilcorsaronero.live/
  - https://ilcorsaronero.vip/
@@ -46,7 +47,7 @@ caps:

  modes:
    search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
    movie-search: [q]
    music-search: [q]
    book-search: [q]
@@ -62,10 +63,11 @@ search:
    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=1{{ else }}/browse/1{{ end }}"
    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=2{{ else }}/browse/2{{ end }}"
  keywordsfilters:
-    - name: re_replace # S01 to 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
-    - name: re_replace # S01E01 to 1 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
+    # remove searching by season and episode due to inconsistent naming #11471
+    - name: re_replace # remove S01
+      args: ["(?i)(\\s*s\\d+)", ""]
+    - name: re_replace # remove E01
+      args: ["(?i)(\\s*e\\d+)", ""]

  rows:
    selector: "tr.odd,tr.odd2"
@@ -85,11 +87,8 @@ search:
      filters:
        - name: split
          args: ["/", -1]
-        - name: diacritics
-          args: replace
-        - name: urldecode
-        - name: re_replace # replace special characters with " " (space)
-          args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
+        - name: replace # replace underscore with " " (space)
+          args: ["_", " "]
        - name: re_replace # replace multiple spaces
          args: ["[ ]{2,}", " "]
        # normalize to SXXEYY format
@@ -109,6 +108,23 @@ search:
          args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
        - name: re_replace # rimozioni varie
          args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
    description:
      selector: td:nth-child(1) a
      attribute: href
--- a/src/Jackett.Common/Definitions/jptv.yml
+++ b/src/Jackett.Common/Definitions/jptv.yml
@@ -117,6 +117,8 @@ search:
          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", ""]
+        - 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:
--- a/src/Jackett.Common/Definitions/lepornoinfo.yml
+++ b/src/Jackett.Common/Definitions/lepornoinfo.yml
@@ -27,7 +27,8 @@ caps:
    - {id: 15, cat: XXX, desc: "Pregnant"}
    - {id: 16, cat: XXX, desc: "Fetish"}
    - {id: 9, cat: XXX, desc: "Gay Forum"}
-    - {id: 18, cat: XXX, desc: "Incest and Taboo"}
+    - {id: 18, cat: XXX, desc: "Incest & Taboo"}
+    - {id: 19, cat: XXX, desc: "Femdom & Strapon"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/lesaloon.yml
+++ b/src/Jackett.Common/Definitions/lesaloon.yml
@@ -122,15 +122,11 @@ login:
  method: form
  form: form[action^="login"]
  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    rememberme: ""
-  captcha:
-    type: image
-    selector: img[src^="access_code/"]
-    input: private_key
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    loginButton: X
  error:
-    - selector: tr td span[style="color:#FF0000;"]
+    - selector: "p[style=\"color: #B73C38\"]"
  test:
    path: index.php
    selector: a[href="logout.php"]
--- a/src/Jackett.Common/Definitions/limetorrents.yml
+++ b/src/Jackett.Common/Definitions/limetorrents.yml
@@ -12,8 +12,9 @@ links:
  - https://www.limetorrents.co/
  - https://limetor.com/
  - https://www.limetor.pro/
-  - https://limetorrents.unblockit.buzz/
+  - https://limetorrents.unblockit.onl/
  - https://limetorrents.unblockninja.com/
+  - https://limetorrents.nocensor.space/
 legacylinks:
  - https://www.limetorrents.io/
  - https://www.limetorrents.cc/
@@ -39,6 +40,8 @@ legacylinks:
  - https://limetorrents.unblockit.dev/
  - https://limetorrents.unblockit.ltd/
  - https://limetorrents.unblockit.link/
+  - https://limetorrents.unblockit.buzz/
+  - https://limetorrents.unblockit.club/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/magicheaven.yml
+++ b/src/Jackett.Common/Definitions/magicheaven.yml
@@ -0,0 +1,203 @@
+---
+id: magicheaven
+name: magic-heaven
+description: "magic-heaven is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://magic-heaven.info/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC, desc: "APPS"}
+    - {id: 108, cat: Other, desc: "APPS Wallpapers"}
+    - {id: 8, cat: Movies/BluRay, desc: "BLU-RAY"}
+    - {id: 172, cat: Movies/BluRay, desc: "BLU-RAY 1080p"}
+    - {id: 176, cat: Movies/BluRay, desc: "BLU-RAY 720p"}
+    - {id: 156, cat: Movies/BluRay, desc: "BLU-RAY H264"}
+    - {id: 153, cat: Movies/BluRay, desc: "BLU-RAY X264"}
+    - {id: 36, cat: Movies/SD, desc: "CAMS"}
+    - {id: 161, cat: Movies/Other, desc: "Christmas Movies"}
+    - {id: 164, cat: Movies/Other, desc: "Christmas Music"}
+    - {id: 160, cat: Movies/Other, desc: "Classic Movies"}
+    - {id: 169, cat: Console, desc: "Console Games"}
+    - {id: 175, cat: Console/XBox, desc: "Console Games XBOX"}
+    - {id: 82, cat: Audio/Other, desc: "DJ MUSIC"}
+    - {id: 84, cat: Audio/Other, desc: "DJ MUSIC DMC"}
+    - {id: 102, cat: Audio/Other, desc: "DJ MUSIC Full Tilt Remix"}
+    - {id: 92, cat: Audio/Other, desc: "DJ MUSIC Funkymix"}
+    - {id: 83, cat: Audio/Other, desc: "DJ MUSIC MASTERMIX"}
+    - {id: 93, cat: Audio/Other, desc: "DJ MUSIC Ultimix"}
+    - {id: 90, cat: Audio/Other, desc: " DJ MUSIC X-mix"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD-R"}
+    - {id: 11, cat: Books/EBook, desc: "E BOOKS"}
+    - {id: 114, cat: Audio/Audiobook, desc: "E BOOKS Audio Books"}
+    - {id: 86, cat: Books/Mags, desc: "E BOOKS Magazines"}
+    - {id: 167, cat: Audio/Other, desc: "KARAOKE"}
+    - {id: 14, cat: Movies/Other, desc: "MKV's"}
+    - {id: 13, cat: Audio/MP3, desc: "MP3 RELEASES"}
+    - {id: 17, cat: Movies/Other, desc: "MP4"}
+    - {id: 18, cat: Movies/Other, desc: "MULTI'S"}
+    - {id: 98, cat: Movies/Other, desc: "MULTI'S Movie Box Sets"}
+    - {id: 20, cat: Audio/MP3, desc: "MUSIC - MP3"}
+    - {id: 170, cat: Audio, desc: "MUSIC Artist Albums"}
+    - {id: 150, cat: Audio, desc: "MUSIC Collections"}
+    - {id: 96, cat: Audio, desc: "MUSIC Discographys"}
+    - {id: 97, cat: Audio/Lossless, desc: "MUSIC Flac"}
+    - {id: 171, cat: Audio/Video, desc: "Music-Videos"}
+    - {id: 22, cat: PC/Games, desc: "PC GAMES"}
+    - {id: 81, cat: Movies, desc: "RatioBoosters"}
+    - {id: 26, cat: TV/Sport, desc: "SPORT"}
+    - {id: 7, cat: Audio, desc: "Top 40 Albums/Singles"}
+    - {id: 9, cat: TV, desc: "TV EPISODES"}
+    - {id: 38, cat: TV, desc: "TV SERIES"}
+    - {id: 30, cat: Other, desc: "VIP"}
+    - {id: 158, cat: Other, desc: "VIP GOLD"}
+    - {id: 173, cat: Movies/WEB-DL, desc: "Web-dl"}
+    - {id: 34, cat: Movies/SD, desc: "Xvid / HDrip"}
+
+  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: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: table:has(a[href*="login.php?error=1"])
+      message:
+        text: "ERROR: Incorrect username!"
+    - selector: table:has(a[href*="login.php?error=4"])
+      message:
+        text: "ERROR: Incorrect password!"
+    - selector: table:has(a[href*="login.php?error="])
+      message:
+        text: "ERROR: Something went wrong during login!"
+  test:
+    path: index.php
+    selector: a[href*="/logout.php?logouthash="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selector: a[href*="/download.php?id="]
+  attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    do: search
+    # does not support multi categories so defaulting to ALL
+    category: 0
+    # yes incldead, no activeonly
+    include_dead_torrents: yes
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_name
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results, does not support imdbid searches
+  keywordsfilters:
+    - name: re_replace # replace special characters with "%" (wildcard)
+      args: ["[^a-zA-Z0-9]+", "%"]
+
+  rows:
+    selector: "table#sortabletable tbody tr:has(a[href*=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      # is often abbreviated
+      selector: a[href*="details.php?id="]
+    title:
+      # usually longer than details title
+      selector: div[id^="port-content-"] div
+      optional: true
+    details:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    poster:
+      selector: div[id^="port-content-"] img
+      attribute: src
+    date:
+      selector: td:nth-child(2) > div:last-child
+      filters:
+        - name: regexp
+          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    download:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# TS Special Edition v.7.5
--- a/src/Jackett.Common/Definitions/magnet4you.yml
+++ b/src/Jackett.Common/Definitions/magnet4you.yml
@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
  - https://magnet4you.me/
-  - https://magnet4you.unblocked.monster/
+  - https://magnet4you.nocensor.space/
 legacylinks:
  - http://magnet4you.me/
  - https://magnet4you.black-mirror.xyz/
@@ -19,6 +19,7 @@ legacylinks:
  - https://magnet4you.proxyportal.pw/
  - https://magnet4you.uk-unblock.pro/
  - https://magnet4you.unblocked.rest/
+  - https://magnet4you.unblocked.monster/

 caps:
  categories:
--- a/src/Jackett.Common/Definitions/marinetracker.yml
+++ b/src/Jackett.Common/Definitions/marinetracker.yml
@@ -11,6 +11,13 @@ links:
 caps:
  categorymappings:
    - {id: 5, cat: Books, desc: "Shipbuilding & Shiprepairing"}
+    - {id: 314, cat: Books, desc: "Shipbuilding & Shiprepairing-Ship supply (chemicals, paints, oils)"}
+    - {id: 313, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding materials"}
+    - {id: 312, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding Management"}
+    - {id: 311, cat: Books, desc: "Shipbuilding & Shiprepairing-Mathematical Modeling"}
+    - {id: 310, cat: Books, desc: "Shipbuilding & Shiprepairing-Hydrodynamics"}
+    - {id: 309, cat: Books, desc: "Shipbuilding & Shiprepairing-Naval Architecture & Marine Engineering"}
+    - {id: 308, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding Standard @ Register"}
    - {id: 196, cat: Books, desc: "Shipbuilding & Shiprepairing-Welding"}
    - {id: 195, cat: Books, desc: "Shipbuilding & Shiprepairing-Turnary"}
    - {id: 226, cat: Books, desc: "Mobile Apps for Seafarers"}
@@ -21,8 +28,9 @@ caps:
    - {id: 14, cat: PC, desc: "Maritime Software-Maritime Simulators"}
    - {id: 12, cat: PC, desc: "Maritime Software-Answers to tests"}
    - {id: 20, cat: PC, desc: "Maritime Software-Calculation soft"}
-    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
    - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
+    - {id: 317, cat: PC, desc: "Maritime Software-Shareware (demo, trial)"}
+    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
    - {id: 21, cat: Books, desc: "Deckofficer's Library"}
    - {id: 283, cat: Books, desc: "Deckofficer's Library-Radar at sea"}
    - {id: 114, cat: Books, desc: "Deckofficer's Library-Watch keeping"}
@@ -38,6 +46,13 @@ caps:
    - {id: 116, cat: Books, desc: "Deckofficer's Library-Global Maritime Distress and Safety System (GMDSS)"}
    - {id: 192, cat: Books, desc: "Deckofficer's Library-Navigation in the ice"}
    - {id: 42, cat: Books, desc: "Safety of Navigation"}
+    - {id: 307, cat: Books, desc: "Safety of Navigation-Life Safety at Sea"}
+    - {id: 306, cat: Books, desc: "Safety of Navigation-Casualties and Incidents"}
+    - {id: 305, cat: Books, desc: "Safety of Navigation-Safety Digest, Lessons from Marine Accident Reports"}
+    - {id: 304, cat: Books, desc: "Safety of Navigation-Fire fighting at sea"}
+    - {id: 303, cat: Books, desc: "Safety of Navigation-Anti-Piracy Security"}
+    - {id: 302, cat: Books, desc: "Safety of Navigation-Emergency and life-saving equipment"}
+    - {id: 301, cat: Books, desc: "Safety of Navigation-Cybersecurity"}
    - {id: 8, cat: Movies, desc: "Video for Seamen"}
    - {id: 234, cat: Movies, desc: "Video for Seamen-Video for Deck Officers"}
    - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
@@ -83,6 +98,7 @@ caps:
    - {id: 38, cat: Books, desc: "Uncategorized"}
    - {id: 190, cat: Books, desc: "Catalogs"}
    - {id: 113, cat: Books, desc: "Medicine"}
+    - {id: 299, cat: Books, desc: "Sailing Kitchen"}
    - {id: 39, cat: Books, desc: "Purpose-built ships"}
    - {id: 51, cat: Books, desc: "Purpose-built ships-Oil & Chemical Tankers"}
    - {id: 52, cat: Books, desc: "Purpose-built ships-Dry cargo vessels"}
--- a/src/Jackett.Common/Definitions/montorrent.yml
+++ b/src/Jackett.Common/Definitions/montorrent.yml
@@ -13,30 +13,30 @@ caps:
  categorymappings:
    - {id: "vo", cat: Movies, desc: "Films VO"}
    - {id: "vostfr", cat: Movies, desc: "Films VOSTFR"}
-    - {id: "dvdrip", cat: Movies, desc: "Films DVDRIP"}
-    - {id: "bdrip", cat: Movies, desc: "Films BDRIP"}
-    - {id: "webrip", cat: Movies, desc: "Films WEBRIP"}
-    - {id: "hdrip", cat: Movies, desc: "Films HDRIP"}
-    - {id: "dvdscreener", cat: Movies, desc: "Films DVD Screener"}
+    - {id: "dvdrip", cat: Movies/SD, desc: "Films DVDRip"}
+    - {id: "brrip", cat: Movies/SD, desc: "Films BRRip"}
+    - {id: "bdrip", cat: Movies/SD, desc: "Films BDRip"}
+    - {id: "webrip", cat: Movies/WEB-DL, desc: "Films WEBRip"}
+    - {id: "hdrip", cat: Movies/SD, desc: "Films HDRip"}
+    - {id: "dvdscreener", cat: Movies, desc: "Films DVDScreener"}
    - {id: "screener", cat: Movies, desc: "Films Screener"}
-    - {id: "hd2160p", cat: Movies, desc: "Films 2160p"}
-    - {id: "hd1080p", cat: Movies, desc: "Films 1080p"}
-    - {id: "hd720p", cat: Movies, desc: "Films 720p"}
-    - {id: "hd2160p-hdlight", cat: Movies, desc: "Films 2160p HD Light"}
-    - {id: "hd1080p-hdlight", cat: Movies, desc: "Films 1080p HD Light"}
-    - {id: "hd720p-hdlight", cat: Movies, desc: "Films 720p HD Light"}
-    - {id: "hd3d", cat: Movies, desc: "Films 3D"}
-    - {id: "serie-vostfr", cat: TV, desc: "Emission TV VOSTFR"}
-    - {id: "serie-vf", cat: TV, desc: "Emission TV VF"}
-    - {id: "pack-vf", cat: TV, desc: "Emission TV Pack VF"}
-    - {id: "pack-vostfr", cat: TV, desc: "Emission TV Pack VOSTFR"}
-    - {id: "pack-vo", cat: TV, desc: "Emission TV VO"}
-    - {id: "albums", cat: Audio, desc: "Audio"}
-    - {id: "jeux", cat: PC/Games, desc: "Jeu vidéo"}
-    - {id: "jeux-pc", cat: PC/Games, desc: "Jeu vidéo PC"}
-    - {id: "jeux-console", cat: PC/Games, desc: "Jeu vidéo Consoles"}
-    - {id: "logiciels", cat: PC, desc: "Application"}
-    - {id: "ebooks", cat: Books, desc: "eBook"}
+    - {id: "hd2160p", cat: Movies/UHD, desc: "Films 2160p"}
+    - {id: "hd1080p", cat: Movies/HD, desc: "Films 1080p"}
+    - {id: "hd720p", cat: Movies/HD, desc: "Films 720p"}
+    - {id: "hd2160p-hdlight", cat: Movies/UHD, desc: "Films 2160p HDLight"}
+    - {id: "hd1080p-hdlight", cat: Movies/HD, desc: "Films 1080p HDLight"}
+    - {id: "hd720p-hdlight", cat: Movies/HD, desc: "Films 720p HDLight"}
+    - {id: "hd3d", cat: Movies/3D, desc: "Films 3D"}
+    - {id: "serie-vostfr", cat: TV, desc: "TV VOSTFR"}
+    - {id: "serie-vf", cat: TV, desc: "TV VF"}
+    - {id: "pack-vf", cat: TV, desc: "TV Pack VF"}
+    - {id: "pack-vostfr", cat: TV, desc: "TV Pack VOSTFR"}
+    - {id: "pack-vo", cat: TV, desc: "TV Pack VO"}
+    - {id: "albums", cat: Audio, desc: "Albums"}
+    - {id: "jeux-pc", cat: PC/Games, desc: "Jeux PC"}
+    - {id: "jeux-console", cat: Console, desc: "Jeux Consoles"}
+    - {id: "logiciels", cat: PC/0day, desc: "Logiciels"}
+    - {id: "ebooks", cat: Books/EBook, desc: "eBooks"}

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

 search:
  paths:
@@ -168,6 +172,8 @@ search:
      attribute: href
    size:
      selector: div.t-taille
+    date:
+      text: now
    seeders:
      text: 0
    seeders:
--- a/src/Jackett.Common/Definitions/movietorrent.yml
+++ b/src/Jackett.Common/Definitions/movietorrent.yml
@@ -12,11 +12,39 @@ caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Bollywood"}
    - {id: 2, cat: Movies/HD, desc: "1080p"}
-    - {id: 35, cat: Movies, desc: "Punjabi"}
+    - {id: 3, cat: Movies/HD, desc: "2016"}
+    - {id: 4, cat: Movies/HD, desc: "2017"}
+    - {id: 6, cat: Movies/HD, desc: "2018"}
+    - {id: 7, cat: Movies/HD, desc: "720p"}
+    - {id: 8, cat: Movies/HD, desc: "480p"}
+    - {id: 9, cat: Movies/HD, desc: "Action"}
+    - {id: 10, cat: Movies, desc: "Adventure"}
+    - {id: 11, cat: Movies, desc: "Animation"}
+    - {id: 14, cat: Movies, desc: "Comedy"}
+    - {id: 15, cat: Movies, desc: "Crime"}
+    - {id: 18, cat: Movies, desc: "Drama"}
    - {id: 19, cat: Movies, desc: "Dubbed"}
-    - {id: 47, cat: Movies, desc: "Tamil Telugu"}
-    - {id: 32, cat: Movies, desc: "Pakistani"}
+    - {id: 23, cat: Movies, desc: "Hindi"}
    - {id: 26, cat: Movies, desc: "Hollywood"}
+    - {id: 27, cat: Movies, desc: "Horror"}
+    - {id: 32, cat: Movies, desc: "Pakistani"}
+    - {id: 35, cat: Movies, desc: "Punjabi"}
+    - {id: 36, cat: Movies, desc: "Religious"}
+    - {id: 38, cat: Movies, desc: "Romance"}
+    - {id: 42, cat: Movies, desc: "Sport"}
+    - {id: 44, cat: Movies, desc: "Superhero"}
+    - {id: 47, cat: Movies, desc: "Tamil Telugu"}
+    - {id: 48, cat: Movies, desc: "Thriller"}
+    - {id: 49, cat: Movies, desc: "Trending"}
+    - {id: 53, cat: Movies/WEB-DL, desc: "Web Series"}
+    - {id: 59, cat: Movies, desc: "2019"}
+    - {id: 5143, cat: Movies, desc: "2012"}
+    - {id: 5247, cat: Movies, desc: "2015"}
+    - {id: 8758, cat: Movies, desc: "2020"}
+    - {id: 8808, cat: Movies, desc: "2013"}
+    - {id: 8809, cat: Movies, desc: "2014"}
+    - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
+    - {id: 10293, cat: Movies, desc: "2021"}

  modes:
    search: [q]
--- a/src/Jackett.Common/Definitions/mvgroupforum.yml
+++ b/src/Jackett.Common/Definitions/mvgroupforum.yml
@@ -96,7 +96,7 @@ settings:
    default: false
  - name: dropbbc
    type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
    default: false
  - name: stripS01E01
    type: checkbox
@@ -165,7 +165,35 @@ search:
      selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
      filters:
        - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
        - name: append
          args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
    details:
--- a/src/Jackett.Common/Definitions/mvgroupmain.yml
+++ b/src/Jackett.Common/Definitions/mvgroupmain.yml
@@ -96,7 +96,7 @@ settings:
    default: false
  - name: dropbbc
    type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
    default: false
  - name: stripS01E01
    type: checkbox
@@ -165,7 +165,35 @@ search:
      selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
      filters:
        - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
        - name: append
          args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
    details:
--- a/src/Jackett.Common/Definitions/newretro.yml
+++ b/src/Jackett.Common/Definitions/newretro.yml
@@ -17,6 +17,7 @@ caps:
    - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
    - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
    - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies, desc: "Filme - SD/HD/UHD"}
    - {id: 105, cat: Movies, desc: "Filme - x264"}
    - {id: 106, cat: Movies, desc: "Filme - XviD / DivX"}
    - {id: 69, cat: XXX, desc: " XXX"}
--- a/src/Jackett.Common/Definitions/nitro.yml
+++ b/src/Jackett.Common/Definitions/nitro.yml
@@ -23,7 +23,6 @@ caps:
    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/PDA"}
    - {id: 10, cat: Other, desc: "Inne"}
    - {id: 11, cat: XXX, desc: "XXX"}
-    - {id: 144, cat: Other, desc: "Nieposortowane"}

  modes:
    search: [q]
@@ -75,11 +74,20 @@ search:

  fields:
    category:
-      selector: a[href^="/tags.php?tags="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: tags
+      selector: span.tag_list
+      case:
+        "a:contains(\"Seriale\")": 1
+        "a:contains(\"Filmy\")": 2
+        "a:contains(\"Muzyka\")": 3
+        "a:contains(\"Gry\")": 4
+        "a:contains(\"Anime\")": 5
+        "a:contains(\"Programy\")": 6
+        "a:contains(\"Książki\")": 7
+        "a:contains(\"Booki\")": 8
+        "a:contains(\"PDA\")": 9
+        "a:contains(\"Inne\")": 10
+        "a:contains(\"Nieposortowane\")": 10
+        "a:contains(\"XXX\")": 11
    title:
      selector: a[href^="/torrent/"]
    details:
--- a/src/Jackett.Common/Definitions/nordicplus.yml
+++ b/src/Jackett.Common/Definitions/nordicplus.yml
@@ -1,27 +1,27 @@
 ---
-id: dxdhd
-name: DXDHD
-description: "DXDHD is a Private General Tracker"
-language: en-us
+id: nordicplus
+name: Nordic+
+description: "Nordic+ is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
 type: private
 encoding: UTF-8
 links:
-  - https://dxdhd.com/
+  - https://nordicplus.org/

 caps:
  categorymappings:
    - {id: 1, cat: Movies, desc: "Movies"}
    - {id: 2, cat: TV, desc: "TV"}
    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
-    - {id: 5, cat: PC/0day, desc: "Apps"}
-    - {id: 6, cat: Books/EBook, desc: "eBooks"}
-    - {id: 7, cat: PC/Games, desc: "Games"}
-    - {id: 8, cat: TV/Sport, desc: "Sports"}
-    - {id: 9, cat: Other, desc: "Others"}
-    - {id: 10, cat: XXX, desc: "XXX"}
-    - {id: 11, cat: Books/Comics, desc: "Comics"}
-    - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
+    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 5, cat: PC, desc: "Apps"}
+    - {id: 6, cat: Books, desc: "Books"}
+    - {id: 11, cat: Movies/Other, desc: "Movies Boxset"}
+    - {id: 12, cat: Movies/Foreign, desc: "Movies Non Nordic"}
+    - {id: 13, cat: TV/Anime, desc: "Movies Kids"}
+    - {id: 14, cat: TV/Other, desc: "TV Boxset"}
+    - {id: 15, cat: TV/Foreign, desc: "TV Non Nordic"}
+    - {id: 16, cat: TV/Anime, desc: "TV Kids"}

  modes:
    search: [q]
@@ -37,6 +37,10 @@ settings:
  - name: password
    type: password
    label: Password
+  - name: usemagnet
+    type: checkbox
+    label: "Use Magnet Download Link"
+    default: false
  - name: freeleech
    type: checkbox
    label: Search freeleech only
@@ -44,7 +48,7 @@ settings:
  - name: sort
    type: select
    label: Sort requested from site
-    default: "created_at"
+    default: created_at
    options:
      created_at: created
      seeders: seeders
@@ -83,6 +87,7 @@ search:
    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
    description: ""
+    keywords: ""
    uploader: ""
    imdb: "{{ .Query.IMDBIDShort }}"
    tvdb: "{{ .Query.TVDBID }}"
@@ -109,23 +114,26 @@ search:
        - name: regexp
          args: "/categories/(\\d+)"
    title:
-      selector: a.view-torrent
-    download:
+      selector: a[href*="/torrents/"]
+    details:
+      selector: a[href*="/torrents/"]
+      attribute: href
+    download1:
      selector: a[href*="/download/"]
      attribute: href
-    details:
-      selector: a.view-torrent
+    download2:
+      selector: a[href^="magnet:?"]
      attribute: href
+    download:
+      text: "{{ if .Config.usemagnet }}{{ .Result.download2 }}{{ else }}{{ .Result.download1 }}{{ end }}"
    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://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["&w=60&h=90", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["/img/NoPoster.png", ""]
    size:
      selector: td:nth-last-child(4)
    seeders:
@@ -199,8 +207,5 @@ search:
        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
        "*": 1
    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 2.3.0
+      text: 0.4
+# UNIT3D 5.2.0
--- a/src/Jackett.Common/Definitions/nyaa-pantsu.yml
+++ b/src/Jackett.Common/Definitions/nyaa-pantsu.yml
@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
  - https://nyaa.net/
+  - https://nyaapantsu.nocensor.space/
 legacylinks:
  - https://nyaa.pantsu.cat/
  - https://nyaa.pt/
--- a/src/Jackett.Common/Definitions/oasis.yml
+++ b/src/Jackett.Common/Definitions/oasis.yml
@@ -0,0 +1,302 @@
+---
+id: oasis
+name: Oasis
+description: "Oasis is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-fr
+type: private
+encoding: UTF-8
+links:
+  - https://oasis-fun.club/
+
+caps:
+  categorymappings:
+    - {id: 2, cat: Movies, desc: "Animations - 4K"}
+    - {id: 3, cat: Movies, desc: "Animations - 4K Light"}
+    - {id: 4, cat: Movies, desc: "Animations - BDRIP"}
+    - {id: 6, cat: Movies, desc: "Animations - BluRay-R"}
+    - {id: 5, cat: Movies, desc: "Animations - BRRIP"}
+    - {id: 8, cat: Movies, desc: "Animations - DVD-R"}
+    - {id: 9, cat: Movies, desc: "Animations - DVDRIP"}
+    - {id: 11, cat: Movies, desc: "Animations - HD 1080P"}
+    - {id: 12, cat: Movies, desc: "Animations - HD 720p"}
+    - {id: 13, cat: Movies, desc: "Animations - HDRIP"}
+    - {id: 165, cat: Movies, desc: "Animations - JAP"}
+    - {id: 14, cat: Movies, desc: "Animations - REMUX"}
+    - {id: 15, cat: Movies, desc: "Animations - TVRIP"}
+    - {id: 17, cat: Movies, desc: "Animations - WEB-DL"}
+    - {id: 16, cat: Movies, desc: "Animations - WEBRIP"}
+    - {id: 167, cat: Audio/Audiobook, desc: "Ebook - AUDIO"}
+    - {id: 73, cat: Books/EBook, desc: "Ebook - BD"}
+    - {id: 74, cat: Books/EBook, desc: "Ebook - ENFANTS"}
+    - {id: 168, cat: Books/Mags, desc: "Ebook - MAGAZINE"}
+    - {id: 75, cat: Books/Comics, desc: "Ebook - MANGAS"}
+    - {id: 76, cat: Books, desc: "Ebook - ROMANS"}
+    - {id: 20, cat: Movies, desc: "Film -  DOC.DECOUVERTES"}
+    - {id: 25, cat: Movies/3D, desc: "Film - 3D"}
+    - {id: 26, cat: Movies/UHD, desc: "Film - 4K"}
+    - {id: 27, cat: Movies/UHD, desc: "Film - 4K Light"}
+    - {id: 169, cat: Movies, desc: "Film - AV1"}
+    - {id: 28, cat: Movies/BluRay, desc: "Film - BDRIP"}
+    - {id: 30, cat: Movies/BluRay, desc: "Film - BluRay-R"}
+    - {id: 29, cat: Movies/BluRay, desc: "Film - BRRIP"}
+    - {id: 31, cat: Movies, desc: "Film - Coffret"}
+    - {id: 18, cat: Movies, desc: "Film - DOC.ANIMAUX"}
+    - {id: 19, cat: Movies, desc: "Film - DOC.ANTIQUE"}
+    - {id: 21, cat: Movies, desc: "Film - DOC.DIVERS"}
+    - {id: 22, cat: Movies, desc: "Film - DOC.HISTOIRE"}
+    - {id: 198, cat: Movies, desc: "Film - DOC.SPECTACLE"}
+    - {id: 23, cat: Movies, desc: "Film - DOC.SPORT"}
+    - {id: 24, cat: Movies, desc: "Film - DOC.UNIVERS"}
+    - {id: 32, cat: Movies/DVD, desc: "Film - DVD-R"}
+    - {id: 33, cat: Movies/DVD, desc: "Film - DVDRIP"}
+    - {id: 164, cat: Movies, desc: "Film - EMISSION.TV"}
+    - {id: 35, cat: Movies/HD, desc: "Film - HD 1080P"}
+    - {id: 36, cat: Movies/HD, desc: "Film - HD 720p"}
+    - {id: 37, cat: Movies/HD, desc: "Film - HDRIP"}
+    - {id: 171, cat: Movies/HD, desc: "Film - HDTV 1080P"}
+    - {id: 170, cat: Movies/HD, desc: "Film - HDTV 720P"}
+    - {id: 172, cat: Movies/HD, desc: "Film - M-HD"}
+    - {id: 38, cat: Movies, desc: "Film - REMUX"}
+    - {id: 39, cat: Movies, desc: "Film - TVRIP"}
+    - {id: 184, cat: Movies, desc: "Film - VOSTFR bdrip"}
+    - {id: 203, cat: Movies, desc: "Film - VOSTFR-bluray"}
+    - {id: 185, cat: Movies, desc: "Film - VOSTFR.DVDrip"}
+    - {id: 202, cat: Movies, desc: "Film - VOSTFR.WEB-DL"}
+    - {id: 186, cat: Movies, desc: "Film - VOSTFR.WEBrip"}
+    - {id: 41, cat: Movies/WEB-DL, desc: "Film - WEB-DL"}
+    - {id: 200, cat: Movies/WEB-DL, desc: "Film - Webrip"}
+    - {id: 59, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
+    - {id: 60, cat: PC/Mobile-Android, desc: "Jeux - ANDROID"}
+    - {id: 61, cat: PC/Mobile-iOS, desc: "Jeux - IOS-X"}
+    - {id: 62, cat: PC/Games, desc: "Jeux - PC"}
+    - {id: 63, cat: Console/PS4, desc: "Jeux - PS3-4"}
+    - {id: 64, cat: Console/PSP, desc: "Jeux - PSP-X"}
+    - {id: 66, cat: Console/Wii, desc: "Jeux - WII"}
+    - {id: 65, cat: Console/WiiU, desc: "Jeux - WII-U"}
+    - {id: 67, cat: Console/XBox, desc: "Jeux - XBOX"}
+    - {id: 68, cat: PC/Mobile-Android, desc: "Logiciel - ANDROID"}
+    - {id: 69, cat: PC/Mobile-iOS, desc: "Logiciel - APPLE"}
+    - {id: 70, cat: PC/Mobile-iOS, desc: "Logiciel - IPHONE"}
+    - {id: 71, cat: PC, desc: "Logiciel - LINUX"}
+    - {id: 72, cat: PC/0day, desc: "Logiciel - WINDOWS"}
+    - {id: 173, cat: TV/UHD, desc: "Serie - 4K"}
+    - {id: 174, cat: TV/UHD, desc: "Serie - 4k-lLIGHT"}
+    - {id: 85, cat: TV, desc: "Serie - Coffret"}
+    - {id: 7, cat: TV, desc: "Serie - Coffret-Anime"}
+    - {id: 194, cat: TV/Documentary, desc: "Serie - DOCU.DIVERS"}
+    - {id: 195, cat: TV/Documentary, desc: "Serie - DOCU.EMISTV"}
+    - {id: 86, cat: TV/SD, desc: "Serie - DVD-R"}
+    - {id: 87, cat: TV/SD, desc: "Serie  - DVDRIP"}
+    - {id: 197, cat: TV, desc: "Serie - EPISODE"}
+    - {id: 88, cat: TV/HD, desc: "Serie  - HD 1080P"}
+    - {id: 89, cat: TV/HD, desc: "Serie - HD 720p"}
+    - {id: 90, cat: TV/HD, desc: "Serie - HDRIP"}
+    - {id: 176, cat: TV/HD, desc: "Serie - HDTV 1080"}
+    - {id: 175, cat: TV/HD, desc: "Serie - HDTV 720"}
+    - {id: 182, cat: TV/Anime, desc: "Serie - JAP-ANIM"}
+    - {id: 177, cat: TV/HD, desc: "Serie - M-HD"}
+    - {id: 91, cat: TV, desc: "Serie - REMUX"}
+    - {id: 166, cat: TV, desc: "Serie - SERIE  Docu"}
+    - {id: 92, cat: TV, desc: "Serie - TVRIP"}
+    - {id: 188, cat: TV, desc: "Serie - VOSTFR.BDrip"}
+    - {id: 180, cat: TV, desc: "Serie - VOSTFR.COFFRET"}
+    - {id: 189, cat: TV, desc: "Serie - VOSTFR.DVDrip"}
+    - {id: 190, cat: TV, desc: "Serie - VOSTFR.HDRIP"}
+    - {id: 192, cat: TV, desc: "Serie - VOSTFR.WEB-DL"}
+    - {id: 191, cat: TV, desc: "Serie - VOSTFR.WEBrip"}
+    - {id: 179, cat: TV/WEB-DL, desc: "Serie - WEB-DL 1080"}
+    - {id: 178, cat: TV/WEB-DL, desc: "Serie - WEB-DL 720"}
+    - {id: 199, cat: TV/WEB-DL, desc: "Serie - WebDL"}
+    - {id: 93, cat: TV/WEB-DL, desc: "Serie - WEBRIP"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+  - name: torrentlanguage
+    type: select
+    label: Torrent Language
+    default: 0
+    options:
+      0: "Toutes Les Langues"
+      1: Allemand
+      2: Anglais(UK)
+      3: Anglais(US)
+      4: Arabe
+      5: Bengali
+      6: Cantonais
+      7: Coréen
+      8: Danois
+      9: Espagnol
+      10: Flamand
+      11: Français
+      12: Hébreu
+      13: Hindi
+      14: Italien
+      15: Japonais
+      16: Mandarin
+      25: Muet
+      17: Multi
+      26: Musical
+      18: Perse
+      19: Portuguais
+      20: Québécois
+      21: Russe
+      22: Suédois
+      23: Ukrainien
+      24: "VOSTFR"
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: TTV3/Bienvenue
+    selector: a[href$="/TTV3/Deconnexion"]
+
+download:
+  before:
+    # https://galeriens.com/TTV3/Torrents/11222/Remercier
+    # note http GET does not seem to work as the html suggests, so using same as LeChaudron which is also a TT3.00FRENCH engine.
+    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/Remercier"
+    method: post
+    inputs:
+      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
+  selector: a[href*="/Telechargement/"]
+  attribute: href
+
+search:
+  paths:
+    # https://oasis-fun.club/TTV3/Torrents/Recherche?recherche=&type=tout&endroit=nomtorrent&langue=0&tl=peuimporte
+    # categories for searching are unsupported
+    - path: TTV3/Torrents/Recherche
+  inputs:
+    recherche: "{{ .Keywords }}"
+    # searchtype: un (one word), tout (all words), exacte (exact expression)
+    type: tout
+    # searchin:  nomtorrent (name), desctorrent (descr)
+    endroit: nomtorrent
+    # language: 11 french, 17 multi
+    langue: "{{ .Config.torrentlanguage }}"
+    # freeleech: oui (yes), non (no), peuimporte (ignore)
+    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
+    # does not support imdbid search and does not return imdb link in results.
+
+  rows:
+    selector: table.sortable tbody tr
+  fields:
+    category:
+      selector: a[href*="/SousCategories/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: (\d+)$
+    title_phase1:
+      selector: a[onmouseover]
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a[onmouseover]
+      attribute: href
+    download:
+      selector: a[onmouseover]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src= (.*?)><"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    date:
+      selector: td:nth-child(2) a font[color="#F2F2F2"]
+      filters:
+        - name: replace
+          args: ["il y a ", ""]
+        - name: replace
+          args: [" Jours", " days"]
+        - name: replace
+          args: [" Jour", " day"]
+        - name: replace
+          args: [" heures", " hours"]
+        - name: replace
+          args: [" heure", " hour"]
+        - name: replace
+          args: [" Semaines", " weeks"]
+        - name: replace
+          args: [" Semaine", " week"]
+        - name: replace
+          args: [" mois", " month"]
+        - name: replace
+          args: [" ans", " years"]
+        - name: replace
+          args: [" an", " year"]
+        - name: append
+          args: " ago"
+    downloadvolumefactor:
+      case:
+        img[src$="/images/Torrents/TLibre.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/oncesearch.yml
+++ b/src/Jackett.Common/Definitions/oncesearch.yml
@@ -95,17 +95,22 @@ search:

  rows:
    selector: table.table-striped > tbody > tr
+    filters:
+      - name: andmatch

  fields:
+    category:
+      text: XXX
+    category|noappend:
+      optional: true
+      selector: p > a:last-of-type
    title:
      selector: span
-    category:
-      selector: p > a:last-of-type
    details:
      selector: a[href^="/details/"]
      attribute: href
    download:
-      selector: a[href$=".torrent"]
+      selector: a[href^="/file/"][title="Download Torrent"]
      attribute: href
      optional: true
    magnet:
--- a/src/Jackett.Common/Definitions/opencd.yml
+++ b/src/Jackett.Common/Definitions/opencd.yml
@@ -0,0 +1,195 @@
+---
+id: opencd
+name: OpenCD
+description: "OpenCD is a CHINESE Private Torrent Tracker for MUSIC"
+language: zh-cn
+type: private
+encoding: UTF-8
+links:
+  - https://open.cd/
+
+caps:
+  categorymappings:
+    - {id: 2, cat: Audio, desc: "华语流行(Pop)"}
+    - {id: 3, cat: Audio, desc: "古典音乐(Classical)"}
+    - {id: 11, cat: Audio, desc: "民族音乐(Instrumental)"}
+    - {id: 4, cat: Audio, desc: "原声配乐(OST)"}
+    - {id: 5, cat: Audio, desc: "泛摇滚乐(Rock)"}
+    - {id: 8, cat: Audio, desc: "爵士乡村(Jazz)"}
+    - {id: 12, cat: Audio, desc: "新世纪(NewAge)"}
+    - {id: 13, cat: Audio, desc: "舞曲(Dance)"}
+    - {id: 14, cat: Audio, desc: "电子(Electronic)"}
+    - {id: 15, cat: Audio, desc: "民谣(Folk)"}
+    - {id: 16, cat: Audio, desc: "独立(Indie)"}
+    - {id: 17, cat: Audio, desc: "嘻哈(Hip Hop)"}
+    - {id: 18, cat: Audio, desc: "音乐剧(Musical)"}
+    - {id: 9, cat: Audio, desc: "其它类型(Others)"}
+
+  modes:
+    search: [q]
+    music-search: [q, artist]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - 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. Default is 50.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: 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: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失敗"))
+    - selector: td.embedded:has(h2:contains("failed!"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://open.cd/torrents.php?source11=1&source18=1&incldead=0&spstate=0&search=&search_area=0&search_mode=0
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}source{{.}}=1&{{end}}"
+    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl, 5 traklist, 6 artistname
+    search_area: "{{ if .Query.Artist }}6{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: td:nth-child(1)
+      attribute: title
+      case:
+        td[title="华语流行"]: 2
+        td[title="古典音乐"]: 3
+        td[title="民族音乐"]: 11
+        td[title="原声配乐"]: 4
+        td[title="泛摇滚乐"]: 5
+        td[title="爵士乡村"]: 8
+        td[title="新世纪"]: 12
+        td[title="舞曲"]: 13
+        td[title="电子"]: 14
+        td[title="民谣"]: 15
+        td[title="独立"]: 16
+        td[title="嘻哈"]: 17
+        td[title="音乐剧"]: 18
+        td[title="其它类型"]: 9
+    title:
+      selector: a[href^="plugin_details.php?id="]
+    title:
+      optional: true
+      selector: a[title][href^="plugin_details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="plugin_details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[id^="attach"]
+      attribute: src
+      filters:
+        - name: prepend
+          args: "https://images.weserv.nl/?url={{ .Config.sitelink }}" # for display on dashboard
+        - name: append
+          args: "&w=180&h=270" # for display on dashboard
+    date:
+      # time type: time elapsed (default)
+      selector: td:nth-child(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      # time added
+      selector: td:nth-child(6):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    grabs:
+      selector: td:nth-child(10)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(3)
+      remove: a, img
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 36 hours (as seconds = 36 x 60 x 60)
+      text: 129600
+# NexusPHP Standard v1.5 Beta 4 (customised)
--- a/src/Jackett.Common/Definitions/oxtorrent.yml
+++ b/src/Jackett.Common/Definitions/oxtorrent.yml
@@ -7,9 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.tv/
+  - https://www.oxtorrent.ph/
  - https://www.oxtorrent.co/
-  - https://oxtorrent.unblocked.monster/
+  - https://oxtorrent.nocensor.space/
 legacylinks:
  - https://wwv.oxtorrent.com/
  - https://www.smartorrent.tv/
@@ -28,6 +28,8 @@ legacylinks:
  - https://www.oxtorrent.bz/
  - https://www.oxtorrent.ws/
  - https://wvw.oxtorrent.ws/
+  - https://oxtorrent.unblocked.monster/
+  - https://www.oxtorrent.tv/

 caps:
  categorymappings:
--- a/src/Jackett.Common/Definitions/pier720.yml
+++ b/src/Jackett.Common/Definitions/pier720.yml
@@ -42,7 +42,7 @@ caps:
    - {id: 46, cat: TV/Sport, desc: "Hockey"}
    - {id: 48, cat: TV/Sport, desc: "Hockey - NHL"}
    - {id: 88, cat: TV/Sport, desc: "Hockey - NHL Playoffs"}
-    - {id: 102, cat: TV/Sport, desc: "Hockey - NHL Playoffs 2018-2019"}
+    - {id: 102, cat: TV/Sport, desc: "Hockey - NHL Playoffs 2018-2020"}
    - {id: 93, cat: TV/Sport, desc: "Hockey - NHL Playoffs - 2017"}
    - {id: 80, cat: TV/Sport, desc: "Hockey - NHL Playoffs - 2016"}
    - {id: 65, cat: TV/Sport, desc: "Hockey - Stanley Cup Finals"}
@@ -53,6 +53,7 @@ caps:
    - {id: 50, cat: TV/Sport, desc: "Hockey - Other"}
    - {id: 55, cat: TV/Sport, desc: "Baseball"}
    - {id: 71, cat: TV/Sport, desc: "Baseball - MLB"}
+    - {id: 107, cat: TV/Sport, desc: "Baseball - MLB World Series"}
    - {id: 72, cat: TV/Sport, desc: "Baseball - Other"}
    - {id: 85, cat: TV/Sport, desc: "Baseball - Reviews, highlights, documentaries"}
    - {id: 45, cat: TV/Sport, desc: "Other sports"}
@@ -63,6 +64,7 @@ caps:
    - {id: 75, cat: TV/Sport, desc: "Other sports - Tennis"}
    - {id: 74, cat: TV/Sport, desc: "Other sports - Fighting"}
    - {id: 94, cat: TV/Sport, desc: "Other sports - Misc"}
+    - {id: 73, cat: TV/Sport, desc: "Other sports - Auto, moto racing"}
    - {id: 100, cat: TV/Sport, desc: "Soccer"}
    - {id: 98, cat: TV/Sport, desc: "Soccer - FIFA World Cup"}
    - {id: 56, cat: TV/Sport, desc: "Sports on tv"}
--- a/Show More
+++ b/Show More